r585 - in x86/trunk: . etc

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Wed Aug 24 18:57:49 PDT 2005


Author: jhuntwork
Date: 2005-08-24 19:57:48 -0600 (Wed, 24 Aug 2005)
New Revision: 585

Modified:
   x86/trunk/Makefile
   x86/trunk/etc/issue
Log:
Fixed issue with BLFS sources being copied to iso.
Changed /sources on CD to /lfs-sources.
Made a separate target for creating the squashfs file.
Fixed minor typo.


Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-08-24 04:55:07 UTC (rev 584)
+++ x86/trunk/Makefile	2005-08-25 01:57:48 UTC (rev 585)
@@ -385,19 +385,21 @@
 	@cp -ra root $(MP)/etc/skel
 	@-mv $(MP)/bin/uname.real $(MP)/bin/uname
 	@-mkdir $(MP)/iso
-	@cp -rav $(MP)/sources $(MP)/iso && \
-	 cp -rav $(MP)/boot $(MP)/iso && \
-	 rm -f iso/.root.sqfs && \
-	 $(WD)/bin/mksquashfs $(MP) $(MP)/iso/.root.sqfs -info -e \
-	 boot sources tools iso lfs-livecd lost+found tmp proc && \
-	 echo "LFS-LIVECD" > $(MP)/iso/LFS
-	@touch prepiso
+	@cp -rav $(MP)/lfs-sources $(MP)/iso
+	@cp -rav $(MP)/boot $(MP)/iso
+	@echo "LFS-LIVECD" > $(MP)/iso/LFS
+	@touch $@
 
-iso: prepiso
-	cd $(MP)/iso ; $(WD)/bin/mkisofs -R -l -L -D -o \
+$(MP)/iso/.root.sqfs:
+	@$(WD)/bin/mksquashfs $(MP) .root.sqfs -info -e \
+	 boot sources lfs-sources tools iso lfs-livecd lost+found tmp proc >sqfs.log 2>&1 && \
+	 mv .root.sqfs $@
+
+iso: prepiso $(MP)/iso/.root.sqfs
+	cd $(MP)/iso ; $(MP)/usr/bin/mkisofs -R -l -L -D -o \
 	$(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
 	-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
-	-V "LFS_CD" ./
+	-V "lfslivecd-$(VERSION)" ./
 
 # Targets to clean your tree. 
 #==============================================================================

Modified: x86/trunk/etc/issue
===================================================================
--- x86/trunk/etc/issue	2005-08-24 04:55:07 UTC (rev 584)
+++ x86/trunk/etc/issue	2005-08-25 01:57:48 UTC (rev 585)
@@ -11,10 +11,10 @@
 Please read the /root/README file before using this CD.
 
 All the source packages you will need to build an LFS system
-are located in /sources and you can find the book in
+are located in /lfs-sources and you can find the book in
 /usr/share/LFS-BOOK-6.1-HTML.
 
-Support questions concerning this cd should be directed to
+Support questions concerning this CD should be directed to
 livecd at linuxfromscratch.org
 
 Type "greeting" at any time to view this message again.




More information about the livecd mailing list