From f70b664df1faabe31c1e5b545ef679eff15ac868 Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Sun, 22 Jan 2012 09:01:57 +0000 Subject: [PATCH] Upgrade to Udev-178 and add its dependency of Kmod-4. Fixes #2998 and #3001. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9711 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 42 +++++++++++++++++++++++++-- bootscripts/ChangeLog | 5 ++++ bootscripts/lfs/init.d/udev | 2 +- chapter01/changelog.xml | 12 ++++++++ chapter01/whatsnew.xml | 11 +++++-- chapter03/packages.xml | 17 +++++------ chapter06/chapter06.xml | 5 ++-- chapter06/udev.xml | 57 ++++++++++++++----------------------- chapter06/xz.xml | 2 +- general.ent | 4 +-- packages.ent | 23 ++++++++------- 11 files changed, 115 insertions(+), 65 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index b00f9f263..dd5430af4 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1045,6 +1045,42 @@ + + Kmod + + + &dependencies; + + + Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc, + Gzip, Make, Sed, Xz-Utils, Zlib + + + + + &testsuites; + + + No test suite available + + + + + &before; + + + Udev + + + + + &external; + + + None + + + Less @@ -1913,7 +1949,7 @@ Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, - Make, and Sed + Kmod, Make, and Sed @@ -1937,7 +1973,7 @@ &external; - None + Glib, Pci-Utils, Python, Systemd, USB-Utils @@ -2036,7 +2072,7 @@ &before; - Man-DB + Kmod, Man-DB, Udev diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 8217e2712..c7113a1cd 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,8 @@ +2012-01-22 Matt Burgess + + * lfs/init.d/udev: Change udevd path following upstream changes to its + location + 2011-12-23 Matt Burgess * lfs/init.d/mountvirtfs: Correct permissions on /run/shm diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev index 643ed80dc..49a1e4e9a 100644 --- a/bootscripts/lfs/init.d/udev +++ b/bootscripts/lfs/init.d/udev @@ -49,7 +49,7 @@ case "${1}" in # Start the udev daemon to continually watch for, and act on, # uevents - /sbin/udevd --daemon + /lib/udev/udevd --daemon # Now traverse /sys in order to "coldplug" devices that have # already been discovered diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 77d22fe16..39a2fd410 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,18 @@ --> + + 2012-01-22 + + + [matthew] - Upgrade to Udev-178, including adding its new + depdendency, Kmod-4. Fixes + #2998 and + #3001. + + + + 2012-01-16 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index c42717977..c19a20eb5 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -112,6 +112,9 @@ + @@ -190,9 +193,9 @@ - + @@ -222,6 +225,10 @@ Added: + + Kmod-&kmod-version; + + &mpfr-fixes-patch; diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 85282509b..2a578a9ef 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -284,6 +284,15 @@ + + Kmod (&kmod-version;) - &kmod-size;: + + Home page: + Download: + MD5 sum: &kmod-md5; + + + Less (&less-version;) - &less-size;: @@ -567,14 +576,6 @@ - - Udev Test Tarball (&udev-version;) - &udev-testfiles-size;: - - Download: - MD5 sum: &udev-testfiles-md5; - - - Udev Configuration Tarball - &udev-config-size;: diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index b17c3695a..b1a71197a 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -58,12 +58,13 @@ + + - - + diff --git a/chapter06/udev.xml b/chapter06/udev.xml index 06417c6c1..d17e0ef73 100644 --- a/chapter06/udev.xml +++ b/chapter06/udev.xml @@ -32,32 +32,19 @@ &udev-ch6-sbu; - &udev-ch6-du; plus &udev-testfiles-du; for testfiles + &udev-ch6-du; - Installation of Udev - Optionally remove an unneeded warning message that shows up in this - version of udev at boot time. - -sed -i -e '/deprecated/d' udev/udevadm-trigger.c - - The udev-config tarball contains LFS-specific files used to configure Udev. Unpack it into the Udev source directory: tar -xvf ../&udev-config;.tar.bz2 - The udev-testfiles tarball contains files needed to test udev. The - file expands to an apparent size of about 37MB but the actual disk usage - is less than 7MB. - -tar -xvf ../udev-&udev-version;-testfiles.tar.bz2 --strip-components=1 - Create some devices and directories that Udev cannot handle due to them being required very early in the boot process, or by Udev itself: @@ -67,33 +54,23 @@ mknod -m0666 /lib/udev/devices/null c 1 3 Prepare the package for compilation: -./configure --prefix=/usr \ - --sysconfdir=/etc --sbindir=/sbin \ - --with-rootlibdir=/lib --libexecdir=/lib/udev \ - --disable-hwdb --disable-introspection \ - --disable-keymap --disable-gudev +BLKID_CFLAGS="-I/usr/include/blkid" BLKID_LIBS="-L/lib -lblkid" \ + KMOD_CFLAGS="-I/usr/include" KMOD_LIBS="-L/lib -lkmod" ./configure \ + --prefix=/usr --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \ + --enable-rule_generator --disable-introspection --disable-keymap \ + --disable-gudev --with-usb-ids-path=no --with-pci-ids-path=no \ + --with-systemdsystemunitdir=no The meaning of the new configure options - - --with-rootlibdir=/lib - - This controls where the libudev library is installed. The - library needs to be in /lib - because it's used by Udev at boot time, before /usr might be available, and the default - --rootlibdir is /usr/lib. - - - - - --libexecdir=/lib/udev + --libexecdir=/lib This controls where Udev-internal rules and helper programs are installed. @@ -101,7 +78,15 @@ mknod -m0666 /lib/udev/devices/null c 1 3 - --disable-* + --enable-rule_generator + + This allows persistent rules to be generated for network and + optical media devices + + + + + --disable-* and --with-* These options prevent Udev from installing helper programs and other extras which require more external libraries. These libraries diff --git a/chapter06/xz.xml b/chapter06/xz.xml index cc4db7581..48baad9e3 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -46,7 +46,7 @@ Prepare Xz for compilation with: -./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version; +./configure --prefix=/usr --libdir=/lib --docdir=/usr/share/doc/xz-&xz-version; Compile the package: diff --git a/general.ent b/general.ent index 293ca4929..04da1d74c 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index 47e56722a..cf5b7f0de 100644 --- a/packages.ent +++ b/packages.ent @@ -289,6 +289,14 @@ + + + + + + + + @@ -297,7 +305,7 @@ - + @@ -519,19 +527,14 @@ - - - - + + + + - - - - -