Author: alexander Date: 2006-09-09 10:04:08 -0600 (Sat, 09 Sep 2006) New Revision: 1727
Modified: branches/6.2/packages/linux/Makefile branches/6.2/packages/linux/config.ppc branches/6.2/packages/linux/config.ppc.ata branches/6.2/packages/linux/config.x86 branches/6.2/packages/linux/config.x86.ata branches/6.2/packages/linux64/Makefile branches/6.2/packages/linux64/config.x86_64 branches/6.2/packages/linux64/config.x86_64.ata branches/6.2/packages/util-linux/Makefile Log: Added loop-aes by Vladdy's request Modified: branches/6.2/packages/linux/Makefile =================================================================== --- branches/6.2/packages/linux/Makefile 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/linux/Makefile 2006-09-09 16:04:08 UTC (rev 1727) @@ -8,6 +8,16 @@ URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) SHA-$(FILE)= ef8635746668d49ba76e799ca681c1b46837e176 +DIR1= loop-AES-v3.1d +FILE1= $(DIR1).tar.bz2 +URL-$(FILE1)= http://loop-aes.sourceforge.net/loop-AES/$(FILE1) +SHA-$(FILE1)= 0be0d2e4e70c79a53b2ac6462659c1e36d2e69e6 + +DIR2= ciphers-v3.0d +FILE2= $(DIR2).tar.bz2 +URL-$(FILE2)= http://loop-aes.sourceforge.net/ciphers/$(FILE2) +SHA-$(FILE2)= abdccd258c07729ce1d32843fecccc9228b51cd1 + # URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/ PATCH028= patch-2.6.16.27-28.bz2 @@ -30,6 +40,8 @@ URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50) SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5 +DEPS= $(FILE) $(FILE1) $(FILE2) $(PATCH028) +DEPS+= $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) # Targets include $(ROOT)/scripts/functions @@ -44,7 +56,7 @@ cd reiser4 ; grep 'reiser4' series | grep -v '#' >reiser4-patches -cd reiser4 ; $(WGET) -nc -B $(URL_REISER4) -i reiser4-patches -stage2: Makefile $(FILE) $(PATCH028) $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) +stage2: Makefile $(DEPS) $(std_build) cp $(SRC)/{$(FILE),$(PATCH028),$(PATCH50)} $(LFSSRC)/ @@ -53,6 +65,10 @@ mkdir -p /boot/isolinux endif ifndef LIBATA_SUFFIX + unpack ../$(FILE1) + unpack ../$(FILE2) + rm -f drivers/block/loop.c include/linux/loop.h + patch -Np1 -i $(DIR1)/kernel-2.6.16.diff bzcat ../$(PATCH028) | patch -Np1 zcat ../$(PATCH1) | patch -Np1 # for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i ../reiser4/$$a ; done @@ -67,6 +83,7 @@ ifndef LIBATA_SUFFIX make $(PM) make modules_install + cd $(DIR2) ; unset VERSION ; make LINUX_SOURCE=.. endif ifeq ($(LFS-ARCH),x86) make $(PM) bzImage Modified: branches/6.2/packages/linux/config.ppc =================================================================== --- branches/6.2/packages/linux/config.ppc 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/linux/config.ppc 2006-09-09 16:04:08 UTC (rev 1727) @@ -418,7 +418,8 @@ # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_LOOP_AES=y +# CONFIG_BLK_DEV_LOOP_KEYSCRUB is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set Modified: branches/6.2/packages/linux/config.ppc.ata =================================================================== --- branches/6.2/packages/linux/config.ppc.ata 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/linux/config.ppc.ata 2006-09-09 16:04:08 UTC (rev 1727) @@ -416,7 +416,8 @@ # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_LOOP_AES=y +# CONFIG_BLK_DEV_LOOP_KEYSCRUB is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set Modified: branches/6.2/packages/linux/config.x86 =================================================================== --- branches/6.2/packages/linux/config.x86 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/linux/config.x86 2006-09-09 16:04:08 UTC (rev 1727) @@ -519,7 +519,9 @@ # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_LOOP_AES=y +# CONFIG_BLK_DEV_LOOP_KEYSCRUB is not set +CONFIG_BLK_DEV_LOOP_PADLOCK=y CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set Modified: branches/6.2/packages/linux/config.x86.ata =================================================================== --- branches/6.2/packages/linux/config.x86.ata 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/linux/config.x86.ata 2006-09-09 16:04:08 UTC (rev 1727) @@ -519,7 +519,9 @@ # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_LOOP_AES=y +# CONFIG_BLK_DEV_LOOP_KEYSCRUB is not set +CONFIG_BLK_DEV_LOOP_PADLOCK=y CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set Modified: branches/6.2/packages/linux64/Makefile =================================================================== --- branches/6.2/packages/linux64/Makefile 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/linux64/Makefile 2006-09-09 16:04:08 UTC (rev 1727) @@ -8,6 +8,16 @@ URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) SHA-$(FILE)= ef8635746668d49ba76e799ca681c1b46837e176 +DIR1= loop-AES-v3.1d +FILE1= $(DIR1).tar.bz2 +URL-$(FILE1)= http://loop-aes.sourceforge.net/loop-AES/$(FILE1) +SHA-$(FILE1)= 0be0d2e4e70c79a53b2ac6462659c1e36d2e69e6 + +DIR2= ciphers-v3.0d +FILE2= $(DIR2).tar.bz2 +URL-$(FILE2)= http://loop-aes.sourceforge.net/ciphers/$(FILE2) +SHA-$(FILE2)= abdccd258c07729ce1d32843fecccc9228b51cd1 + # URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/ PATCH028= patch-2.6.16.27-28.bz2 @@ -30,6 +40,8 @@ URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50) SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5 +DEPS= $(FILE) $(FILE1) $(FILE2) $(PATCH028) +DEPS+= $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) # Targets include $(ROOT)/scripts/functions @@ -44,11 +56,15 @@ cd reiser4 ; grep 'reiser4' series | grep -v '#' >reiser4-patches -cd reiser4 ; $(WGET) -nc -B $(URL_REISER4) -i reiser4-patches -stage2: Makefile $(FILE) $(PATCH028) $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) +stage2: Makefile $(DEPS) $(std_build) compile-stage2: ifndef LIBATA_SUFFIX + unpack ../$(FILE1) + unpack ../$(FILE2) + rm -f drivers/block/loop.c include/linux/loop.h + patch -Np1 -i $(DIR1)/kernel-2.6.16.diff bzcat ../$(PATCH028) | patch -Np1 zcat ../$(PATCH1) | patch -Np1 # for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i ../reiser4/$$a ; done @@ -63,7 +79,8 @@ ifndef LIBATA_SUFFIX PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- PATH=$$PATH:$(WD)/bin make modules_install ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- - rm /lib/modules/$(VRS)-64bit/{source,build} + cd $(DIR2) ; unset VERSION ; PATH=$$PATH:$(WD)/bin make LINUX_SOURCE=.. ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- + rm /lib/modules/*-64bit/{source,build} endif PATH=$$PATH:$(WD)/bin make bzImage ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64$(LIBATA_SUFFIX) Modified: branches/6.2/packages/linux64/config.x86_64 =================================================================== --- branches/6.2/packages/linux64/config.x86_64 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/linux64/config.x86_64 2006-09-09 16:04:08 UTC (rev 1727) @@ -455,7 +455,9 @@ # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_LOOP_AES=y +# CONFIG_BLK_DEV_LOOP_KEYSCRUB is not set +CONFIG_BLK_DEV_LOOP_PADLOCK=y CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set Modified: branches/6.2/packages/linux64/config.x86_64.ata =================================================================== --- branches/6.2/packages/linux64/config.x86_64.ata 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/linux64/config.x86_64.ata 2006-09-09 16:04:08 UTC (rev 1727) @@ -455,7 +455,9 @@ # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_LOOP_AES=y +# CONFIG_BLK_DEV_LOOP_KEYSCRUB is not set +CONFIG_BLK_DEV_LOOP_PADLOCK=y CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set Modified: branches/6.2/packages/util-linux/Makefile =================================================================== --- branches/6.2/packages/util-linux/Makefile 2006-09-09 09:55:42 UTC (rev 1726) +++ branches/6.2/packages/util-linux/Makefile 2006-09-09 16:04:08 UTC (rev 1727) @@ -8,6 +8,10 @@ URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4 +FILE1=loop-AES-v3.1d.tar.bz2 +URL-$(FILE1)= http://loop-aes.sourceforge.net/loop-AES/$(FILE1) +SHA-$(FILE1)= 0be0d2e4e70c79a53b2ac6462659c1e36d2e69e6 + PATCH1= $(DIR)-cramfs-1.patch URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) SHA-$(PATCH1)= 00f5192493b939c2c996df9c1f3f769abfa3fa8c @@ -17,7 +21,7 @@ SHA-$(PATCH31)= 638972c2f2b09cf20aac60ede91e803a96cea4d9 STAGE1_DEPS = $(FILE) -STAGE2_DEPS = $(FILE) $(PATCH1) +STAGE2_DEPS = $(FILE) $(FILE1) $(PATCH1) # Targets @@ -44,6 +48,8 @@ cp $(SRC)/$(PATCH1) $(LFSSRC)/ compile-stage2: + tar jxf ../$(FILE1) + patch -Np1 -i */util-linux-2.12r.diff sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/lib/hwclock/[EMAIL PROTECTED]' hwclock/hwclock.c mkdir -p /var/lib/hwclock patch -Np1 -i ../$(PATCH1) -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
