r1568 - in branches/Onward: downloads temporary_system

robert at linuxfromscratch.org robert at linuxfromscratch.org
Tue Feb 23 02:06:33 PST 2010


Author: robert
Date: 2010-02-23 03:06:33 -0700 (Tue, 23 Feb 2010)
New Revision: 1568

Modified:
   branches/Onward/downloads/packages.txt
   branches/Onward/downloads/patches.txt
   branches/Onward/temporary_system/util-linux-ng.txt
Log:
Bump to util-linux-ng-2.17.1.

Modified: branches/Onward/downloads/packages.txt
===================================================================
--- branches/Onward/downloads/packages.txt	2010-02-23 09:40:21 UTC (rev 1567)
+++ branches/Onward/downloads/packages.txt	2010-02-23 10:06:33 UTC (rev 1568)
@@ -125,8 +125,8 @@
 http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-151.tar.bz2
 
 # Util-linux-ng:
-# http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.2.tar.bz2.sign
-http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.2.tar.bz2
+# http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/util-linux-ng-2.17.1.tar.bz2.sign
+http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/util-linux-ng-2.17.1.tar.bz2
 
 # XZ Utils:
 http://tukaani.org/xz/xz-4.999.9beta.tar.bz2

Modified: branches/Onward/downloads/patches.txt
===================================================================
--- branches/Onward/downloads/patches.txt	2010-02-23 09:40:21 UTC (rev 1567)
+++ branches/Onward/downloads/patches.txt	2010-02-23 10:06:33 UTC (rev 1568)
@@ -101,6 +101,6 @@
 http://www.linuxfromscratch.org/~robert/new/patches/patch-2.6.1-mkstemp.diff
 
 # Util-linux-ng Loop-AES patch:
-# http://loop-aes.sourceforge.net/updates/util-linux-ng-2.14.2-20090214.diff.bz2.sign
-http://loop-aes.sourceforge.net/updates/util-linux-ng-2.14.2-20090214.diff.bz2
+# http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17-20100120.diff.bz2.sign
+http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17-20100120.diff.bz2
 

Modified: branches/Onward/temporary_system/util-linux-ng.txt
===================================================================
--- branches/Onward/temporary_system/util-linux-ng.txt	2010-02-23 09:40:21 UTC (rev 1567)
+++ branches/Onward/temporary_system/util-linux-ng.txt	2010-02-23 10:06:33 UTC (rev 1568)
@@ -2,9 +2,12 @@
 
 # Patch for Loop-AES:
 
-bzcat ../util-linux-ng-2.14.2-20090214.diff.bz2 | patch -p1 -i - \
-	; ((${PIPESTATUS[0]}==0)) &&
+bzcat ../util-linux-ng-2.17-20100120.diff.bz2 | patch -p1 -i - \
+	; ((${PIPESTATUS[0]}==0)) ; # &&
 
+# FIXME: There is a rejected hunk in the above patch for the copyright
+# of a Makefile. Ignore this, and wait for a new patch.
+
 # 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
 # have a Random Number Generator Daemon (RNGD) filling /dev/random before swap
@@ -28,21 +31,17 @@
 sed -i.orig 's@/dev/urandom@/dev/random@' \
 	./mount/swapon.c ./mount/lomount.c &&
 
+# Configure Util-linux-ng:
+
 mkdir -v obj/ &&
 cd obj/ &&
+../configure --prefix=/tools --sbindir=/tools/bin --enable-login-utils \
+	--disable-makeinstall-chown --disable-makeinstall-setuid \
+	--infodir=$(pwd)/DESTDIR --mandir=$(pwd)/DESTDIR &&
 
-# --disable-makeinstall-chown is so 'chown' and 'chgrp' are not used during
-# installation.
+# Build and install Util-linux-ng:
 
-../configure --prefix=/tools --sbindir=/tools/bin \
-	--disable-makeinstall-chown --enable-login-utils &&
-
 make &&
-make install &&
+make usrsbin_execdir=/tools/bin install
 
-# This version of util-linux-ng does not respect --sbindir:
 
-mv -v /tools/sbin/{fdformat,ldattach,readprofile,rtcwake,tunelp} /tools/bin &&
-rmdir -v /tools/sbin
-
-




More information about the hlfs-book mailing list