r574 - in x86/trunk: initramfs packages/blfs-bootscripts packages/flex packages/isoinfo packages/linux packages/nALFS-profile packages/squashfs

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Aug 16 12:42:03 PDT 2005


Author: thomasp
Date: 2005-08-16 13:42:01 -0600 (Tue, 16 Aug 2005)
New Revision: 574

Modified:
   x86/trunk/initramfs/Makefile
   x86/trunk/packages/blfs-bootscripts/Makefile
   x86/trunk/packages/flex/Makefile
   x86/trunk/packages/isoinfo/Makefile
   x86/trunk/packages/linux/Makefile
   x86/trunk/packages/nALFS-profile/Makefile
   x86/trunk/packages/squashfs/Makefile
Log:
*Updated initramfs Makefile
*Added copying of squashfs kernel patch to packages/linux
*Updated blfs-bootscripts, old version is no longer available
*Fixed /usr/bin/lex script, needed another \
*Fixed a few typos



Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile	2005-08-15 13:59:30 UTC (rev 573)
+++ x86/trunk/initramfs/Makefile	2005-08-16 19:42:01 UTC (rev 574)
@@ -1,45 +1,65 @@
 # Makefile for initramfs included on the LFS livecd
-#
+#==============================================================================
 
+NM= initramfs
+VRS= 1
+
 MK= mknod
 CP= cp
-WD= temp
+WDIR= temp
 KLIBC= /usr/lib/klibc
 
-all: initramfs_data.cpio.gz
+# Targets
+# =============================================================================
 
-initramfs_data.cpio.gz: init
-	mkdir -p $(WD)/{dev,bin,lib,.tmpfs,.union}
-	$(CP) $(KLIBC)/bin/{insmod,isoinfo,ln,losetup,mkdir,mount,run-init,sh,sleep} $(WD)/bin
-	$(CP) $(KLIBC)/lib/klibc-*.so $(WD)/lib
-	$(CP) /lib/modules/$(KVERS)/kernel/fs/unionfs.ko $(WD)/lib
-	$(CP) init $(WD)
-	$(MK) -m 640 $(WD)/dev/console c 5 1
-	$(MK) -m 660 $(WD)/dev/hda b 3 0
-	$(MK) -m 660 $(WD)/dev/hdb b 3 64
-	$(MK) -m 660 $(WD)/dev/hdc b 22 0
-	$(MK) -m 660 $(WD)/dev/hdd b 22 64
-	$(MK) -m 660 $(WD)/dev/hde b 33 0
-	$(MK) -m 660 $(WD)/dev/hdf b 33 64
-	$(MK) -m 660 $(WD)/dev/hdg b 34 0
-	$(MK) -m 660 $(WD)/dev/hdh b 34 64
-	$(MK) -m 664 $(WD)/dev/null c 1 3
-	$(MK) -m 660 $(WD)/dev/sr0 b 11 0
-	$(MK) -m 660 $(WD)/dev/sr1 b 11 1
-	$(MK) -m 660 $(WD)/dev/sr2 b 11 2
-	$(MK) -m 660 $(WD)/dev/sr3 b 11 3
-	$(MK) -m 660 $(WD)/dev/sr4 b 11 4
-	$(MK) -m 660 $(WD)/dev/sr5 b 11 5
-	$(MK) -m 660 $(WD)/dev/sr6 b 11 6
-	$(MK) -m 660 $(WD)/dev/sr7 b 11 7
-	$(MK) -m 660 $(WD)/dev/loop0 b 7 0
-	cd $(WD); find . | cpio -o -H newc | gzip -9 > ../initramfs_data.cpio.gz
-	$(CP) initramfs_data.cpio.gz /boot/isolinux
-	rm -rf temp
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-initramfs $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
+stage2: Makefile
+	@make compile-$@
+
+compile-stage2:
+	@$(call echo_message, Building)
+#==============================================================================
+# Building commands below \/
+#==============================================================================
+	@mkdir -p $(WDIR)/{dev,bin,lib,.tmpfs,.union}
+	@$(CP) $(KLIBC)/bin/{insmod,isoinfo,ln,losetup,mkdir,mount,run-init,sh,sleep} $(WDIR)/bin
+	@$(CP) $(KLIBC)/lib/klibc-*.so $(WDIR)/lib
+	@$(CP) /lib/modules/$(KVERS)/kernel/fs/unionfs.ko $(WDIR)/lib
+	@$(CP) init $(WDIR)
+	@$(MK) -m 640 $(WDIR)/dev/console c 5 1
+	@$(MK) -m 660 $(WDIR)/dev/hda b 3 0
+	@$(MK) -m 660 $(WDIR)/dev/hdb b 3 64
+	@$(MK) -m 660 $(WDIR)/dev/hdc b 22 0
+	@$(MK) -m 660 $(WDIR)/dev/hdd b 22 64
+	@$(MK) -m 660 $(WDIR)/dev/hde b 33 0
+	@$(MK) -m 660 $(WDIR)/dev/hdf b 33 64
+	@$(MK) -m 660 $(WDIR)/dev/hdg b 34 0
+	@$(MK) -m 660 $(WDIR)/dev/hdh b 34 64
+	@$(MK) -m 664 $(WDIR)/dev/null c 1 3
+	@$(MK) -m 660 $(WDIR)/dev/sr0 b 11 0
+	@$(MK) -m 660 $(WDIR)/dev/sr1 b 11 1
+	@$(MK) -m 660 $(WDIR)/dev/sr2 b 11 2
+	@$(MK) -m 660 $(WDIR)/dev/sr3 b 11 3
+	@$(MK) -m 660 $(WDIR)/dev/sr4 b 11 4
+	@$(MK) -m 660 $(WDIR)/dev/sr5 b 11 5
+	@$(MK) -m 660 $(WDIR)/dev/sr6 b 11 6
+	@$(MK) -m 660 $(WDIR)/dev/sr7 b 11 7
+	@$(MK) -m 660 $(WDIR)/dev/loop0 b 7 0
+	@cd $(WDIR); find . | cpio -o -H newc | gzip -9 > ../initramfs_data.cpio.gz
+	@$(CP) initramfs_data.cpio.gz /boot/isolinux
+	@rm -rf temp
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+
 clean:
-	-rm -rf temp
-	-rm -f initramfs_data*
+	@-rm -rf temp
+	@-rm -f initramfs_data*
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/blfs-bootscripts/Makefile
===================================================================
--- x86/trunk/packages/blfs-bootscripts/Makefile	2005-08-15 13:59:30 UTC (rev 573)
+++ x86/trunk/packages/blfs-bootscripts/Makefile	2005-08-16 19:42:01 UTC (rev 574)
@@ -2,12 +2,12 @@
 #==============================================================================
 
 NM= blfs-bootscripts
-VRS= 20050709
+VRS= 20050816
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(FILE)
-SHA-$(FILE)= 013267af112eed7aa96a68843887fdee639adabc
+SHA-$(FILE)= f9c9f1ec3994f16bfb20a35048ba80ab2ec557a4
 
 PATCH1=$(NM)-add-autosshd-1.patch
 SHA-$(PATCH1)= d69c9467e6cfcbff70006ad065f2765dc46c986b
@@ -29,7 +29,7 @@
 #==============================================================================
 # Install commands below \/
 #==============================================================================
-	 @patch -Np1 -i ../$(PATCH)
+	 @patch -Np1 -i ../$(PATCH1)
 	 @make install-service-dhcpcd >../$(DIR)-$@.log 2>&1
 	 @make install-service-pppoe >>../$(DIR)-$@.log 2>&1
 	 @make install-gpm >>../$(DIR)-$@.log 2>&1

Modified: x86/trunk/packages/flex/Makefile
===================================================================
--- x86/trunk/packages/flex/Makefile	2005-08-15 13:59:30 UTC (rev 573)
+++ x86/trunk/packages/flex/Makefile	2005-08-16 19:42:01 UTC (rev 574)
@@ -57,7 +57,7 @@
 	@echo "#!/bin/sh" > /usr/bin/lex
 	@echo "# Begin /usr/bin/lex" >> /usr/bin/lex
 	@echo "" >> /usr/bin/lex
-	@echo "exec /usr/bin/flex -l \"$$@\"" >> /usr/bin/lex
+	@echo "exec /usr/bin/flex -l \"\$$@\"" >> /usr/bin/lex
 	@echo "" >> /usr/bin/lex
 	@echo "# End /usr/bin/lex" >> /usr/bin/lex
 	@chmod 755 /usr/bin/lex

Modified: x86/trunk/packages/isoinfo/Makefile
===================================================================
--- x86/trunk/packages/isoinfo/Makefile	2005-08-15 13:59:30 UTC (rev 573)
+++ x86/trunk/packages/isoinfo/Makefile	2005-08-16 19:42:01 UTC (rev 574)
@@ -55,4 +55,6 @@
 clean:
 	@-rm -rf $(DIR)
 
+klibc-isoinfo: stage2
+
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/linux/Makefile
===================================================================
--- x86/trunk/packages/linux/Makefile	2005-08-15 13:59:30 UTC (rev 573)
+++ x86/trunk/packages/linux/Makefile	2005-08-16 19:42:01 UTC (rev 574)
@@ -36,7 +36,7 @@
 	@if [ ! -d /boot/isolinux ] ; then mkdir /boot/isolinux ; fi
 	@zcat ../$(PATCH1) > ../reiser4.patch
 	@patch -Np1 -i ../reiser4.patch
-	@patch -Np1 -i $(ROOT)/$(PKG)/squashfs/squashfs2.2/linux-2.6.12/$(PATCH2)
+	@patch -Np1 -i ../$(PATCH2)
 	@make mrproper
 	@cp $(ROOT)/linux/config .config
 #

Modified: x86/trunk/packages/nALFS-profile/Makefile
===================================================================
--- x86/trunk/packages/nALFS-profile/Makefile	2005-08-15 13:59:30 UTC (rev 573)
+++ x86/trunk/packages/nALFS-profile/Makefile	2005-08-16 19:42:01 UTC (rev 574)
@@ -26,8 +26,8 @@
 #==============================================================================
 # Install commands below \/
 #==============================================================================
-	@sed -i 's@/your/$(DIR)/packages@/sources at g' $(DIR)/config/general.ent
-	@cp -rav $(DIR) /root/nALFS-profile-$(DIR) >../$(DIR)-$@.log 2>&1
+	@sed -i 's@/your/$(DIR)/packages@/sources at g' config/general.ent
+	@cp -rav . /root/nALFS-profile-$(DIR) >../$(DIR)-$@.log 2>&1
 
 #
 #==Status Messages===========================================

Modified: x86/trunk/packages/squashfs/Makefile
===================================================================
--- x86/trunk/packages/squashfs/Makefile	2005-08-15 13:59:30 UTC (rev 573)
+++ x86/trunk/packages/squashfs/Makefile	2005-08-16 19:42:01 UTC (rev 574)
@@ -36,6 +36,7 @@
 # Install commands below \/
 #==============================================================================
 	 @cd $(NM)-tools ; cp -v mksquashfs $(WD)/bin >>../../$(DIR)-$@.log 2>&1
+	 @cp linux-2.6.12/squashfs2.2-patch $(ROOT)/$(PKG)/linux
 #
 #==Status Messages===========================================
 #




More information about the livecd mailing list