Author: robert
Date: 2009-02-22 15:45:18 -0700 (Sun, 22 Feb 2009)
New Revision: 1499
Modified:
branches/Onward/temporary_system/linux-kernel.txt
branches/Onward/temporary_system/util-linux-ng.txt
Log:
When using zcat to decompress a file and pipe it to patch, we need to check 0
to see if zcat worked, otherwise && will always continue even if the file
doesn't exist.
Modified: branches/Onward/temporary_system/linux-kernel.txt
===================================================================
--- branches/Onward/temporary_system/linux-kernel.txt 2009-02-22 21:49:34 UTC
(rev 1498)
+++ branches/Onward/temporary_system/linux-kernel.txt 2009-02-22 22:45:18 UTC
(rev 1499)
@@ -1,8 +1,9 @@
# Temporary tools - Linux kernel
-# This && doesn't work, because of the | pipe, but I don't know how to fix it.
+# PIPESTATUS is is used to make sure zcat worked, so the && works correctly:
-zcat ../grsecurity-2.1.12-2.6.27.10-200812271347.patch.gz | patch -p1 &&
+zcat ../grsecurity-2.1.12-2.6.27.10-200812271347.patch.gz | patch -p1 -i - \
+ ; ((${PIPESTATUS[0]}==0)) &&
# Broken - FIXME
# patch -p1 -i ../linux-2.6.24.7-frandom-1.patch &&
@@ -12,11 +13,11 @@
# who can read the device file:
tar xf ../loop-AES-v3.2e.tar.bz2 &&
-cd loop-AES-v3.2e &&
-# This && doesn't work, because of the | pipe, but I don't know how to fix it.
-bzcat ../loop-AES-v3.2e-20090112.diff.bz2 | patch -p1 &&
+cd loop-AES-v3.2e/ &&
+bzcat ../../loop-AES-v3.2e-20090112.diff.bz2 | patch -p1 -i - \
+ ; ((${PIPESTATUS[0]}==0)) &&
cd ../ &&
-rm -fv ./drivers/block/loop.c ./include/linux/loop.h &&
+rm -vf ./drivers/block/loop.c ./include/linux/loop.h &&
patch -p1 -i loop-AES-v3.2e/kernel-2.6.27.diff &&
mkdir -v obj/ &&
Modified: branches/Onward/temporary_system/util-linux-ng.txt
===================================================================
--- branches/Onward/temporary_system/util-linux-ng.txt 2009-02-22 21:49:34 UTC
(rev 1498)
+++ branches/Onward/temporary_system/util-linux-ng.txt 2009-02-22 22:45:18 UTC
(rev 1499)
@@ -1,9 +1,9 @@
# Temporary tools - Util-linux-ng
# Patch for Loop-AES:
-# Fixme: This && doesn't work because of the | pipe.
-bzcat ../util-linux-ng-2.14.1-20081015.diff.bz2 | patch -p1 &&
+bzcat ../util-linux-ng-2.14.1-20081015.diff.bz2 | patch -p1 -i - \
+ ; ((${PIPESTATUS[0]}==0)) &&
# Loop-AES uses /dev/urandom when generating a random key for swap. Swap is
# mounted very early during boot, and may be predictable. Ideally we would
--
http://linuxfromscratch.org/mailman/listinfo/hlfs-book
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
