Changeset 1960

Timestamp:

07/16/07 11:23:40 (18 months ago)

Author:

jhuntwork

Message:

Minimal CD will contain no source packages

Location:

branches/minimal

Files:

• Makefile (modified) (8 diffs)
• packages/LFS-BOOK/Makefile (modified) (2 diffs)
• packages/jhalfs/configuration (modified) (1 diff)

branches/minimal/Makefile

@@ -56 +56 @@
 export ROOT := /lfs-livecd
 export SRC := /sources
-export LFSSRC := /lfs-sources
 export PKG := packages
 
@@ -116 +115 @@
         mount -o loop root.ext2 $(MP)
         mkdir -p $(MKTREE) $(MP)$(SRC) $(MP)$(WD)
-        mkdir -p $(MP)/boot $(MP)$(LFSSRC) $(MPBASE)/iso$(LFSSRC)
+        mkdir -p $(MP)/boot
         mkdir -p $(MP)/drivers $(MPBASE)/iso/drivers
         mount --bind $(MPBASE)$(ROOT) $(MP)$(ROOT)
@@ -122 +121 @@
         mount --bind $(MPBASE)$(SRC) $(MP)$(SRC)
         mount --bind $(MPBASE)/iso/boot $(MP)/boot
-        mount --bind $(MPBASE)/iso$(LFSSRC) $(MP)$(LFSSRC)
         mount --bind $(MPBASE)/iso/drivers $(MP)/drivers
         -ln -nsf $(MPBASE)$(WD) /
@@ -297 +295 @@
         make -C $(PKG)/$* chroot
 
-gvim: $(MKTREE)
-        make -C $(PKG)/vim chroot3
-
 # The following takes the form 'make [package name]-clean'
 # Cleans the build directory of a single package.
@@ -357 +352 @@
         mandb -c 2>/dev/null
         echo 'dummy / ext2 defaults 0 0' >/etc/mtab
-        updatedb --prunepaths='/sources /tools /lfs-livecd /lfs-sources /proc /sys /dev /tmp /var/tmp'
+        updatedb --prunepaths='/sources /tools /lfs-livecd /proc /sys /dev /tmp /var/tmp'
         echo >/etc/mtab
-
-chroot-gvim:
-        make -C $(PKG)/vim stage3
 
 # Targets to create the iso
@@ -393 +385 @@
         -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
         -V "lfslivecd-$(VERSION)" ./
-        @cd $(MPBASE)/iso ; $(WD)/bin/mkisofs -z -R -l --allow-leading-dots -D -o \
-        $(MPBASE)$(ROOT)/lfslivecd-$(VERSION)-nosrc.iso -b boot/isolinux/isolinux.bin \
-        -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
-        -m lfs-sources -V "lfslivecd-$(VERSION)" ./
 
 # Targets to clean your tree. 
@@ -431 +419 @@
         -umount $(MP)/boot
         -umount $(MP)/drivers
-        -umount $(MP)$(LFSSRC)
         -umount $(MP)$(SRC)
         -umount $(MP)$(WD)
         -umount $(MP)$(ROOT)
         -rmdir $(MP)$(SRC) $(MP)$(WD) $(MP)$(ROOT)
-        -rmdir $(MP)/boot $(MP)$(LFSSRC) $(MP)/drivers
+        -rmdir $(MP)/boot $(MP)/drivers
         -umount $(MP)
 
@@ -444 +431 @@
         -make unmount
 
-.PHONY: mount unmount clean_sources scrub clean iso chroot-gvim update-caches \
+.PHONY: mount unmount clean_sources scrub clean iso update-caches \
         final-environment re-adjust-toolchain ch-% ch-glibc-32 lfs-adjust-toolchain \
         lfs-%-scpt lfs-%-scpt-32 lfs-%-pass1 lfs-%-pass2 createfiles \
-        gvim %-only-ch lfs-%-only lfs-%-only-pass1 lfs-%-only-pass2 lfs-wget \
+        %-only-ch lfs-%-only lfs-%-only-pass1 lfs-%-only-pass2 lfs-wget \
         lfs-rm-wget blfs post-bash pre-bash tools pre-which zeroes

branches/minimal/packages/LFS-BOOK/Makefile

@@ -15 +15 @@
 
 URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK
-
-SEAMONKEY_CONFIG= $(ROOT)/root/.mozilla/default/79exklwh.slt/prefs.js
 
 # Targets
@@ -38 +36 @@
         cd $(DIR) ; make BASEDIR=../$(HTMLDIR)
         cp -av $(DIR) $(HTMLDIR) /usr/share
-        cd $(SRC) ; cp -v `sed 's@^.*/\([^/]*\)$$@\1@' /usr/share/$(HTMLDIR)/wget-list` $(LFSSRC)
-        sed -i \
-         's@file:///.*index.html@file:///usr/share/$(HTMLDIR)/index.html@' \
-         $(SEAMONKEY_CONFIG)
         sed -i 's@WWW_HOME=\".*\"@WWW_HOME=\"/usr/share/$(HTMLDIR)/index.html\"@' \
          $(ROOT)/etc/profile

branches/minimal/packages/jhalfs/configuration

@@ -79 +79 @@
 BUILDDIR="/mnt/build_dir"
 GETPKG=y
-SRC_ARCHIVE="/lfs-sources"
+# SRC_ARCHIVE is not set
 SERVER="http://ftp.lfs-matrix.net/"
 GETKERNEL=y