From f896e21c3f635470dec99e91be17dba666c0908c Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 16 Jul 2012 17:19:20 +0000 Subject: [PATCH] Updated udev to version 186. This update has a major procedure change due to merging systemd and udev. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9908 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/udev-rules.xml | 2 +- aux-file-data.sh | 10 +- chapter01/changelog.xml | 12 ++ chapter01/whatsnew.xml | 2 +- chapter03/packages.xml | 14 +- chapter06/chapter06.xml | 2 +- chapter06/systemd.xml | 178 ++++++++++++++++++++ chapter06/udev.xml | 339 -------------------------------------- chapter07/udev.xml | 2 +- general.ent | 5 +- make-aux-files.sh | 10 +- packages.ent | 24 +-- 12 files changed, 226 insertions(+), 374 deletions(-) create mode 100644 chapter06/systemd.xml delete mode 100644 chapter06/udev.xml diff --git a/appendices/udev-rules.xml b/appendices/udev-rules.xml index 71881ddc2..2549e5fc9 100644 --- a/appendices/udev-rules.xml +++ b/appendices/udev-rules.xml @@ -12,7 +12,7 @@ Udev configuration rules - The rules from &udev-config;.tar.bz2 in this appendix are listed for + The rules from &udev-lfs;.tar.bz2 in this appendix are listed for convenience. Installation is normally done via instructions in . diff --git a/aux-file-data.sh b/aux-file-data.sh index 527635e12..04678db8f 100755 --- a/aux-file-data.sh +++ b/aux-file-data.sh @@ -31,10 +31,10 @@ sed -i -e s/BOOTSCRIPTS-SIZE/$bootsize/ \ ############ # udev configuration tarball data -udevconfig=$(ls udev-config*.bz2) -udevsize=$(ls -lk $udevconfig | cut -f5 -d" ") -udevmd5=$(md5sum $udevconfig | cut -f1 -d" ") +#udevconfig=$(ls udev-config*.bz2) +#udevsize=$(ls -lk $udevconfig | cut -f5 -d" ") +#udevmd5=$(md5sum $udevconfig | cut -f1 -d" ") -sed -i -e s/UDEV-SIZE/$udevsize/ \ - -e s/UDEV-MD5SUM/$udevmd5/ $FILE +#sed -i -e s/UDEV-SIZE/$udevsize/ \ +# -e s/UDEV-MD5SUM/$udevmd5/ $FILE diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a590c6293..9ee401277 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,18 @@ --> + + 2012-07-16 + + + [bdubbs] - Updated udev to version 186. This update + has a major procedure change due to merging systemd and + udev. Fixes + #3098. + + + + 2012-07-14 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 2879ddb30..71f1e85ca 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -188,7 +188,7 @@ Texinfo &texinfo-version; --> - Udev &udev-version; + Udev &systemd-version; (extracted from systemd-&systemd-version;) -./configure --prefix=/usr \ - --with-rootprefix='' \ - --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 - - - - --libexecdir=/lib - - This controls where Udev-internal rules and helper programs - are installed. - - - - - --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 - are not part of the base LFS system. See the Udev - README file for more information. - - - - - Compile the package: - -make - - Test the package. - -make check - - Install the package: - -make install - - Remove an empty documentation directory: - -rmdir -v /usr/share/doc/udev - - Now install the LFS-specific custom rules files: - -cd &udev-config; -make install - - Install the documentation that explains the LFS-specific rules - files: - -make install-doc - - - - - Contents of Udev - - - Installed programs - Installed libraries - Installed directories - - - ata_id, cdrom_id, collect, create_floppy_devices, edd_id, - firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, - usb_id, write_cd_rules, and write_net_rules - libudev.{a,so} - /etc/udev, /lib/udev, /lib/firmware, /usr/share/doc/udev-config, - /usr/share/gtk-doc/html/libudev - - - - - Short Descriptions - - - - - ata_id - - Provides Udev with a unique string and - additional information (uuid, label) for an ATA drive - - ata_id - - - - - - cdrom_id - - Provides Udev with the capabilities of a - CD-ROM or DVD-ROM drive - - cdrom_id - - - - - - collect - - Given an ID for the current uevent and a list of - IDs (for all target uevents), registers the current ID - and indicates whether all target IDs have been registered - - collect - - - - - - create_floppy_devices - - Creates all possible floppy devices based on the CMOS type - - create_floppy_devices - - - - - - edd_id - - Provides Udev with the EDD ID for a BIOS disk drive - - edd_id - - - - - - firmware.sh - - Uploads firmware to devices - - firmware.sh - - - - - - fstab_import - - Finds an entry in /etc/fstab that - matches the current device, and provides its information to - Udev - - fstab_import - - - - - - path_id - - Provides the shortest possible unique hardware path to a - device - - path_id - - - - - - scsi_id - - Provides Udev with a unique SCSI identifier - based on the data returned from sending a SCSI INQUIRY command to - the specified device - - scsi_id - - - - - - udevadm - - Generic udev administration tool: controls the udevd daemon, - provides info from the Udev database, monitors uevents, waits for - uevents to finish, tests Udev configuration, and triggers uevents - for a given device - - udevadm - - - - - - udevd - - A daemon that listens for uevents on the netlink socket, - creates devices and runs the configured external programs in - response to these uevents - - udevd - - - - - - usb_id - - Provides Udev with information about USB - devices - - usb_id - - - - - - write_cd_rules - - A script which generates Udev rules to provide stable names for - optical drives (see also ) - - write_cd_rules - - - - - - write_net_rules - - A script which generates rules to provide stable names for - network interfaces (see also ) - - - write_net_rules - - - - - - libudev - - A library interface to udev device information - - libudev - - - - - - /etc/udev - - Contains Udev configuration files, - device permissions, and rules for device naming - - /etc/udev - - - - - - - - - diff --git a/chapter07/udev.xml b/chapter07/udev.xml index 33d10c17d..1d65a221f 100644 --- a/chapter07/udev.xml +++ b/chapter07/udev.xml @@ -132,7 +132,7 @@ Device Node Creation - As of Udev-&udev-version;, udevd no longer + In recent version of udev, udevd no longer creates device files in /dev. Instead, this must be handled in the kernel, by the devtmpfs filesystem. Any driver that diff --git a/general.ent b/general.ent index 21e9083f5..3ef270ce9 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + @@ -13,6 +13,7 @@ + diff --git a/make-aux-files.sh b/make-aux-files.sh index c57352a9d..fbec73302 100755 --- a/make-aux-files.sh +++ b/make-aux-files.sh @@ -10,13 +10,13 @@ mv bootscripts lfs-bootscripts-$version tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version mv lfs-bootscripts-$version bootscripts -rm -f udev-config*.bz2 +#rm -f udev-config*.bz2 # Get file name and move udev config directory to that name -version=`grep "ENTITY udev-config " packages.ent |cut -d'"' -f2` -mv udev-config $version +#version=`grep "ENTITY udev-config " packages.ent |cut -d'"' -f2` +#mv udev-config $version # Create the tarball and clean up -tar -cjf $version.tar.bz2 --exclude .svn $version -mv $version udev-config +#tar -cjf $version.tar.bz2 --exclude .svn $version +#mv $version udev-config diff --git a/packages.ent b/packages.ent index 70c837618..ca51d6ade 100644 --- a/packages.ent +++ b/packages.ent @@ -532,19 +532,19 @@ - - - - - - - + + + + + + + - - - - - + + + + +