r1559 - in branches/Onward: downloads temporary_system

robert at linuxfromscratch.org robert at linuxfromscratch.org
Mon Feb 22 12:45:19 PST 2010


Author: robert
Date: 2010-02-22 13:45:19 -0700 (Mon, 22 Feb 2010)
New Revision: 1559

Modified:
   branches/Onward/downloads/packages.txt
   branches/Onward/downloads/patches.txt
   branches/Onward/temporary_system/linux-kernel.txt
Log:
Bump to linux-2.6.32.8. New grsecurity and loop-aes versions.

Modified: branches/Onward/downloads/packages.txt
===================================================================
--- branches/Onward/downloads/packages.txt	2010-02-22 06:52:05 UTC (rev 1558)
+++ branches/Onward/downloads/packages.txt	2010-02-22 20:45:19 UTC (rev 1559)
@@ -72,8 +72,8 @@
 http://ftp.gnu.org/gnu/gzip/gzip-1.4.tar.xz
 
 # Linux kernel:
-# http://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.20.tar.bz2.sign
-http://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.20.tar.bz2
+# http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.8.tar.bz2.sign
+http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.8.tar.bz2
 
 # M4:
 # http://ftp.gnu.org/gnu/m4/m4-1.4.12.tar.bz2.sig

Modified: branches/Onward/downloads/patches.txt
===================================================================
--- branches/Onward/downloads/patches.txt	2010-02-22 06:52:05 UTC (rev 1558)
+++ branches/Onward/downloads/patches.txt	2010-02-22 20:45:19 UTC (rev 1559)
@@ -67,8 +67,8 @@
 http://www.linuxfromscratch.org/~robert/new/patches/glibc-2.8-strlcpy_strlcat.diff
 
 # Grsecurity patch:
-# http://www.grsecurity.net/grsecurity-2.1.12-2.6.27.10-200812271347.patch.gz.sig
-http://www.grsecurity.net/grsecurity-2.1.12-2.6.27.10-200812271347.patch.gz
+# http://www.grsecurity.net/test/grsecurity-2.1.14-2.6.32.8-201002200811.patch.sig
+http://www.grsecurity.net/test/grsecurity-2.1.14-2.6.32.8-201002200811.patch
 
 # Grub patches:
 http://www.linuxfromscratch.org/patches/downloads/grub/grub-0.97-256byte_inode-1.patch
@@ -90,10 +90,8 @@
 # http://www.linuxfromscratch.org/patches/downloads/linux/linux-2.6.24.7-frandom-1.patch
 
 # Loop-AES patch:
-# http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2e.tar.bz2.sign
-http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2e.tar.bz2
-# http://loop-aes.sourceforge.net/updates/loop-AES-v3.2e-20090112.diff.bz2.sign
-http://loop-aes.sourceforge.net/updates/loop-AES-v3.2e-20090112.diff.bz2
+# http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2h.tar.bz2.sign
+http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2h.tar.bz2
 
 # Module-init-tools nostatic patch:
 http://www.linuxfromscratch.org/~robert/new/patches/module-init-tools-3.6-nostatic.diff

Modified: branches/Onward/temporary_system/linux-kernel.txt
===================================================================
--- branches/Onward/temporary_system/linux-kernel.txt	2010-02-22 06:52:05 UTC (rev 1558)
+++ branches/Onward/temporary_system/linux-kernel.txt	2010-02-22 20:45:19 UTC (rev 1559)
@@ -1,9 +1,8 @@
 # Temporary tools - Linux kernel
 
-# PIPESTATUS is is used to make sure zcat worked, so the && works correctly:
+# Apply the Grsecurity patch:
 
-zcat ../grsecurity-2.1.12-2.6.27.10-200812271347.patch.gz | patch -p1 -i - \
-	; ((${PIPESTATUS[0]}==0)) &&
+patch -p1 -i ../grsecurity-2.1.14-2.6.32.8-201002200811.patch &&
 
 # Broken - FIXME
 # patch -p1 -i ../linux-2.6.24.7-frandom-1.patch &&
@@ -12,14 +11,16 @@
 # is relevant even on servers because the swap space is vulnerable to anyone
 # who can read the device file:
 
-tar xf ../loop-AES-v3.2e.tar.bz2 &&
-cd loop-AES-v3.2e/ &&
-bzcat ../../loop-AES-v3.2e-20090112.diff.bz2 | patch -p1 -i - \
-	; ((${PIPESTATUS[0]}==0)) &&
-cd ../ &&
+tar xf ../loop-AES-v3.2h.tar.bz2 &&
 rm -vf ./drivers/block/loop.c ./include/linux/loop.h &&
-patch -p1 -i loop-AES-v3.2e/kernel-2.6.27.diff &&
+patch -p1 -i loop-AES-v3.2h/kernel-2.6.31.diff &&
 
+# Work around an issue with the Binutils version:
+
+sed 's/$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))//' -i arch/x86/Makefile
+
+# Clean the kernel source tree:
+
 mkdir -v obj/ &&
 cd obj/ &&
 make -C ../ mrproper &&
@@ -28,12 +29,9 @@
 
 make -C ../ O=$(pwd) menuconfig &&
 
-# Install the kernel:
+# Install the kernel and modules:
 
 make -C ../ O=$(pwd) &&
-cp -v arch/x86/boot/bzImage /tools/boot/hlfs-kernel &&
+make -C ../ O=$(pwd) INSTALL_MOD_PATH=/tools modules_install &&
+cp -v arch/x86/boot/bzImage /tools/boot/hlfs-kernel
 
-# And modules:
-
-make -C ../ O=$(pwd) INSTALL_MOD_PATH=/tools modules_install
-




More information about the hlfs-book mailing list