r1223 - in branches/dm/packages: jhalfs linux yaboot

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon Dec 5 05:56:33 PST 2005


Author: alexander
Date: 2005-12-05 06:56:31 -0700 (Mon, 05 Dec 2005)
New Revision: 1223

Modified:
   branches/dm/packages/jhalfs/Makefile
   branches/dm/packages/linux/config.ppc
   branches/dm/packages/yaboot/Makefile
   branches/dm/packages/yaboot/boot.msg
Log:
Reduced unneeded differences from trunk


Modified: branches/dm/packages/jhalfs/Makefile
===================================================================
--- branches/dm/packages/jhalfs/Makefile	2005-12-05 13:04:58 UTC (rev 1222)
+++ branches/dm/packages/jhalfs/Makefile	2005-12-05 13:56:31 UTC (rev 1223)
@@ -14,7 +14,7 @@
 
 stage2: Makefile
 	@$(call echo_message, Building)
-	@svn co svn://linuxfromscratch.org/ALFS/jhalfs/branches/$(VRS) $(DIR)
+	@svn co svn://linuxfromscratch.org/ALFS/jhalfs/tags/$(VRS) $(DIR)
 	@make CROSSVARS=../$(CROSSVARS) -C $(DIR) -f ../Makefile compile-$@ >>$(DIR)-$@.log 2>&1
 	@make clean >>$(DIR)-$@.log 2>&1
 	@touch $@

Modified: branches/dm/packages/linux/config.ppc
===================================================================
--- branches/dm/packages/linux/config.ppc	2005-12-05 13:04:58 UTC (rev 1222)
+++ branches/dm/packages/linux/config.ppc	2005-12-05 13:56:31 UTC (rev 1223)
@@ -1500,16 +1500,11 @@
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=y
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-CONFIG_UNION_FS=y
 
 #
 # Network File Systems

Modified: branches/dm/packages/yaboot/Makefile
===================================================================
--- branches/dm/packages/yaboot/Makefile	2005-12-05 13:04:58 UTC (rev 1222)
+++ branches/dm/packages/yaboot/Makefile	2005-12-05 13:56:31 UTC (rev 1223)
@@ -28,7 +28,7 @@
 	cp ../ofboot.b /boot/
 	cp /usr/lib/yaboot/yaboot /boot/
 	cp ../yaboot.conf /boot/
-	cp ../boot.msg /boot/
+	sed 's|Version:.*|Version: $(VERSION)|' ../boot.msg >/boot/boot.msg
 
 clean:
 	-rm -rf $(DIR)

Modified: branches/dm/packages/yaboot/boot.msg
===================================================================
--- branches/dm/packages/yaboot/boot.msg	2005-12-05 13:04:58 UTC (rev 1222)
+++ branches/dm/packages/yaboot/boot.msg	2005-12-05 13:56:31 UTC (rev 1223)
@@ -1,2 +1,3 @@
-LFS-6.2 PPC LiveCD
+LFS PPC LiveCD
+Version:
 ===========================================




More information about the livecd mailing list