r1960 - in branches/minimal: . packages/LFS-BOOK packages/jhalfs

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Jul 16 10:23:40 PDT 2007


Author: jhuntwork
Date: 2007-07-16 11:23:40 -0600 (Mon, 16 Jul 2007)
New Revision: 1960

Modified:
   branches/minimal/Makefile
   branches/minimal/packages/LFS-BOOK/Makefile
   branches/minimal/packages/jhalfs/configuration
Log:
Minimal CD will contain no source packages

Modified: branches/minimal/Makefile
===================================================================
--- branches/minimal/Makefile	2007-07-16 17:07:13 UTC (rev 1959)
+++ branches/minimal/Makefile	2007-07-16 17:23:40 UTC (rev 1960)
@@ -55,7 +55,6 @@
 export MP := $(MPBASE)/image
 export ROOT := /lfs-livecd
 export SRC := /sources
-export LFSSRC := /lfs-sources
 export PKG := packages
 
 export MKTREE := $(MP)$(ROOT)
@@ -115,13 +114,12 @@
 	mkdir -p $(MP) $(MPBASE)$(SRC) $(MPBASE)$(WD)/bin $(MPBASE)/iso/boot
 	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)
 	mount --bind $(MPBASE)$(WD) $(MP)$(WD)
 	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) /
 	-ln -nsf $(MPBASE)$(SRC) /
@@ -296,9 +294,6 @@
 %-only-ch: $(MKTREE)
 	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.
 
@@ -356,12 +351,9 @@
 	cd /usr/share/fonts ; mkfontscale ; mkfontdir ; fc-cache -f
 	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
 #==============================================================================
 
@@ -392,10 +384,6 @@
 	$(MPBASE)$(ROOT)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
 	-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. 
 #==============================================================================
@@ -430,12 +418,11 @@
 	-umount $(MP)/sys
 	-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)
 
 zeroes: $(MKTREE)
@@ -443,8 +430,8 @@
 	-rm $(MP)/zeroes
 	-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

Modified: branches/minimal/packages/LFS-BOOK/Makefile
===================================================================
--- branches/minimal/packages/LFS-BOOK/Makefile	2007-07-16 17:07:13 UTC (rev 1959)
+++ branches/minimal/packages/LFS-BOOK/Makefile	2007-07-16 17:23:40 UTC (rev 1960)
@@ -15,8 +15,6 @@
 
 URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK
 
-SEAMONKEY_CONFIG= $(ROOT)/root/.mozilla/default/79exklwh.slt/prefs.js
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -37,10 +35,6 @@
 	# tar xf $(FILE)
 	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 at file:///.*index.html at file:///usr/share/$(HTMLDIR)/index.html@' \
-	 $(SEAMONKEY_CONFIG)
 	sed -i 's at WWW_HOME=\".*\"@WWW_HOME=\"/usr/share/$(HTMLDIR)/index.html\"@' \
 	 $(ROOT)/etc/profile
 

Modified: branches/minimal/packages/jhalfs/configuration
===================================================================
--- branches/minimal/packages/jhalfs/configuration	2007-07-16 17:07:13 UTC (rev 1959)
+++ branches/minimal/packages/jhalfs/configuration	2007-07-16 17:23:40 UTC (rev 1960)
@@ -78,7 +78,7 @@
 LGROUP="lfs"
 BUILDDIR="/mnt/build_dir"
 GETPKG=y
-SRC_ARCHIVE="/lfs-sources"
+# SRC_ARCHIVE is not set
 SERVER="http://ftp.lfs-matrix.net/"
 GETKERNEL=y
 RUNMAKE=y




More information about the livecd mailing list