From bd7538b84054408fe146f79b8077f574a106d41a Mon Sep 17 00:00:00 2001 From: Jeremy Utley Date: Wed, 22 Sep 2004 04:50:54 +0000 Subject: [PATCH] Upgraded util-linux, udev, and hotplug to latest versions git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4185 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 17 +++++++++++------ chapter05/udev.xml | 16 ++++------------ chapter06/udev.xml | 8 ++++++-- general.ent | 6 +++--- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index cba779d63..461bfd472 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,7 +44,7 @@ first a summary, then a detailed log. sed-4.1.2 tar-1.14 tcl-8.4.7 -util-linux-2.12d +util-linux-2.12e vim-6.3 @@ -55,10 +55,9 @@ first a summary, then a detailed log. coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch flex-2.5.31-debian_fixes-2.patch gcc-3.4.2-linkonce-1.patch -hotplug-2004_04_01 -hotplug-2004_04_01-bogus_deps-1.patch -hotplug-2004_04_01-device-2.patch -hotplug-2004_04_01-isapnp-2.patch +hotplug-2004_09_20 +hotplug-2004_09_20-bogus_deps-1.patch +hotplug-2004_09_20-device-2.patch inetutils-1.4.2-kernel_headers-1.patch iproute2-2.6.8-040823 iproute2-2.6.8-040823-remove_db-1.patch @@ -69,7 +68,8 @@ first a summary, then a detailed log. readline-5.0-display_wrap-1.patch syslog-ng-1.6.5 sysvinit-2.85-proclen-1.patch -udev-030 +udev-032 +udev-032-etcdir-2.patch udev-config-1.permissions udev-config-1.rules util-linux-2.12a-kernel_headers-1.patch @@ -95,6 +95,11 @@ first a summary, then a detailed log. +September 21st, 2004 [jeremy]: Upgraded to Util-linux-2.12e, +Udev-032, and Hotplug-2004_09_20. Thanks to David Jensen and Kevin Fleming +for their hard work in putting together the new udev instructions, including +the new patch. + September 20th, 2004 [jeremy]: Upgraded to iana-etc 1.02, libtool 1.5.10, automake-1.9.2. September 20th, 2004 [jeremy]: Upgraded to Util-Linux 2.12d, diff --git a/chapter05/udev.xml b/chapter05/udev.xml index c79001a59..4f6ef8dcf 100644 --- a/chapter05/udev.xml +++ b/chapter05/udev.xml @@ -29,25 +29,17 @@ Installation of Udev -The udevstart program hardcodes the path -to the udev program in itself, which is bad since we -install udev in a non-standard location. Fix this by -running the following: +Patch Udev to allow for udev.conf to be found in $PREFIX/etc: -sed -i 's@/sbin/udev@/tools/sbin/udev@g' udevstart.c - -Also assure that udev knows the correct location to look for its -configuration files: - -sed -i 's@/etc@/tools/etc@g' etc/udev/udev.conf.in +patch -Np1 -i ../udev-&udev-version;-etcdir-2.patch Now compile Udev: -make prefix=/tools etcdir=/tools/etc +make prefix=/tools udevdir=/dev Install it: -make DESTDIR=/tools udevdir=/dev install +make prefix=/tools install Udev's configuration is far from ideal by default, so we install our own configuration files here: diff --git a/chapter06/udev.xml b/chapter06/udev.xml index 38ef9e3bf..d6bf3913c 100644 --- a/chapter06/udev.xml +++ b/chapter06/udev.xml @@ -23,7 +23,11 @@ Installation of Udev -First compile Udev: +Patch Udev to allow installation of udev.conf to $PREFIX/etc: + +patch -Np1 -i ../udev-&udev-version;-etcdir-2.patch + +Compile Udev: make udevdir=/dev @@ -37,7 +41,7 @@ create device nodes in. Install it: -make udevdir=/dev install +make install Udev's configuration is far from ideal by default, so we install our own configuration files here: diff --git a/general.ent b/general.ent index 4168373f5..0a13c2435 100644 --- a/general.ent +++ b/general.ent @@ -38,7 +38,7 @@ - + @@ -68,7 +68,7 @@ - - + +