From 410e2ab87294160d7e0131b2ff11d476baad6389 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 29 Apr 2014 00:25:34 +0000 Subject: [PATCH] Synchronize udev extras with LFS git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13006 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/sysutils/udev-extras.xml | 147 ++++++++--------------------- introduction/welcome/changelog.xml | 3 + 2 files changed, 40 insertions(+), 110 deletions(-) diff --git a/general/sysutils/udev-extras.xml b/general/sysutils/udev-extras.xml index 119fcbff37..5799aeedbd 100644 --- a/general/sysutils/udev-extras.xml +++ b/general/sysutils/udev-extras.xml @@ -7,9 +7,9 @@ - - - + + + ]> @@ -29,29 +29,11 @@ Introduction to Udev Extras - In 2012, the Udev code distribution was - merged with systemd. - Systemd is a set of programs that replace the - SysVInit package used by LFS and is much more - complex. It is not compatible with the LFS bootscripts and has many - problems and few advantages for most LFS users. + Udev was installed as a part of systemd in LFS. However, not + all components were installed due to dependencies that were unavailable. + This procedure adds those missing components. - The procedures below extract libraries and programs from the systemd - sources that could not be built in LFS due to library dependency - issues. - - Unlike any other package in the BLFS book, there is no set version - of systemd specified to download. Several version - updates to LFS and BLFS means there are probably many different - versions of Udev on the platforms that BLFS is - being built upon. Therefore, you should download and use the version of - systemd your computer currently uses. The BLFS - team has no experience updating (or reverting to an older version) the - Udev programs on the fly. To - discover the version of Udev your computer - currently uses, issue /sbin/udevadm --version. - - &lfs75_checked; + Package Information @@ -79,9 +61,11 @@ Required - - (match the udev-lfs-???.tar.bz2 tarball version to the systemd version used in LFS), - (for the gudev library), and + (for the gudev library) + + + Optional Dependencies + (for gir-data, needed for Gnome) @@ -99,103 +83,56 @@ Installation of Udev Extras - First, put the custom LFS files in place: + First, build systemd: - UDEV=<version> -tar -xf ../udev-lfs-$UDEV.tar.bz2 +./configure --disable-tests && +make - For udev-lfs-197-2.tar.bz2, there is a minor error - in the Makefile. For that version, run: + If you maintained the default System V/systemd + installation in LFS, do not run make install. + It will overwrite the symbolic links needed to switch boot + systems. - sed -i -e '/samsung-9/d' udev-lfs-197-2/makefile-incl.keymap + Now install gudev as the root + user: - - keymap +mkdir -pv /usr/include/gudev-1.0/gudev /usr/share/gtk-doc/html/gudev && - - Starting with systemd-206, the keymap capabilities are built into the - udev procedures initial installation in LFS. These procedures only - apply to udev versions before 206. - +cp -v src/gudev/gudev.h /usr/include/gudev-1.0/gudev && +cp -v src/gudev/gudev[a-e,t]*.h /usr/include/gudev-1.0/gudev && +cp -v .libs/libgudev-1.0.so.0.2.0 /usr/lib && - - Support for special keys for many laptops is provided by the - keymap program and supporting files. If the - keymap capability is desired, use: - +ln -svfn libgudev-1.0.so.0.2.0 /usr/lib/libgudev-1.0.so && +ln -svfn libgudev-1.0.so.0.2.0 /usr/lib/libgudev-1.0.so.0 && -make -f udev-lfs-$UDEV/Makefile.lfs keymap +cp -v src/gudev/gudev-1.0.pc /usr/lib/pkgconfig && +cp -v docs/gudev/html/* /usr/share/gtk-doc/html/gudev - To install keymap and its associated files, - issue the following command as the - root user: + If the optional gobject-introspection package was availible, + install the gir-data files as the root + user: -make -f udev-lfs-$UDEV/Makefile.lfs install-keymap +mkdir -pv /usr/lib/girepository-1.0 /usr/share/gir-1.0 && - +cp -v src/gudev/GUdev-1.0.typelib /usr/lib/girepository-1.0 && +cp -v src/gudev/GUdev-1.0.gir /usr/share/gir-1.0 - - gudev - - To build the libgudev-1.0 library and - interface files, run: - -make -f udev-lfs-$UDEV/Makefile.lfs gudev - - Install the gudev library, - run, as the root user: - -make -f udev-lfs-$UDEV/Makefile.lfs install-gudev - - - - - GObject Files - - To build the gobject-introspection - interface (gir) files for the libgudev-1.0 library, run: - -make -f udev-lfs-$UDEV/Makefile.lfs gir-data - - Install the gir data, as the root user: - -make -f udev-lfs-$UDEV/Makefile.lfs install-gir-data - - There is a shortcut to build and install all of the - udev components at once using the - all and install-all - Makefile.lfs targets. The installation of this target - will overwrite the base LFS udev files and has not been thoroughly tested - at the time of this writing. If using this procedure, the udev daemon - should be stopped before overwriting the existing udevd - and udev libraries. - - Contents - A list of the installed files, along with their short descriptions - can be found at - . - - The following is some additional content information. - Installed Programs Installed Library Installed Directories - findkeyboards, keyboard-force-release.sh, and keymap + None libgudev-1.0.so - /lib/udev/keymaps/force-release, - /usr/include/gudev-1.0/gudev, + /usr/include/gudev-1.0/gudev, /usr/lib/girepository-1.0, /usr/share/gir-1.0, and /usr/share/gtk-doc/html/gudev @@ -207,16 +144,6 @@ tar -xf ../udev-lfs-$UDEV.tar.bz2 - - keymap - - configures computer model specific key mappings. - - keymap (from systemd) - - - - libgudev-1.0.so diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 083e845b2e..0503e3ad6b 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,9 @@ April 28th, 2014 + + [bdubbs] - Synchronize udev extras with LFS. + [bdubbs] - Add references to dbus-launch to window managers.