Changeset f9d6f78

Timestamp:

11/22/2012 11:50:54 PM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

79bfd82

Parents:

5ee47cb

Message:

Upgrade to systemd-196/lfs-udev-196

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10050 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/systemd.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• udev-lfs/Makefile.lfs (modified) (9 diffs)

chapter01/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>2012-11-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to systemd-196/lfs-udev-196. Fixes
+          <ulink url="&lfs-ticket-root;3233">#3233</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2012-11-18</para>
       <itemizedlist>

chapter06/systemd.xml

@@ -53 +53 @@
 
 <screen><userinput remap="pre">tar -xvf ../&udev-lfs;.tar.bz2</userinput></screen>
+
+    <para>Fix a typo in the <userinput>udevadm</userinput> usage output:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/create/update/' src/udev/udevadm-hwdb.c</userinput></screen>
 
     <para>Compile the package:</para>

general.ent

@@ -1 @@
-<!ENTITY version "SVN-20121118">
-<!ENTITY releasedate "November 18, 2012">
+<!ENTITY version "SVN-20121122">
+<!ENTITY releasedate "November 22, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">

packages.ent

@@ -525 +525 @@
 <!ENTITY texinfo-ch6-sbu "0.2 SBU">
 
-<!ENTITY systemd-version "195">
-<!ENTITY systemd-size    "1,412 KB">
+<!ENTITY systemd-version "196">
+<!ENTITY systemd-size    "1,928 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "38e8c8144e7e6e5bc3ce32eb4260e680">
+<!ENTITY systemd-md5     "05ebd7f108e420e2b4e4810ea4b3c810">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "18 MB">
+<!ENTITY systemd-ch6-du  "23 MB">
 <!ENTITY systemd-ch6-sbu "0.1 SBU">
 
@@ -542 +542 @@
 
 <!ENTITY udev-lfs        "udev-lfs-&systemd-version;"> 
-<!ENTITY udev-lfs-size   "17 KB">   
+<!ENTITY udev-lfs-size   "20 KB">   
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
-<!ENTITY udev-lfs-md5    "6e1c852e51646e42e4e9a02570050c71">    
+<!ENTITY udev-lfs-md5    "abfc9dad2075109ac9c08f40c6d2aae8">    
 <!ENTITY udev-lfs-home   " ">
 

udev-lfs/Makefile.lfs

@@ -5 +5 @@
 
 SHELL=/bin/bash
-VERSION=195
+VERSION=196
 
 ifeq ($(V),)
@@ -34 +34 @@
       -DSYSCONFDIR=\"/etc\"             \
       -DFIRMWARE_PATH="\"/lib/firmware/updates/\", \"/lib/firmware/\"" \
-      -DUSB_DATABASE=\"/usr/share/misc/usb.ids\"                       \
-      -DPCI_DATABASE=\"/usr/share/misc/pci.ids\"                       \
+      -DHWDB_BIN=\"/etc/udev/hwdb.bin\"                                \
       -DROOTPREFIX=                     \
       -DUDEVLIBEXECDIR=\"/lib/udev\"    \
@@ -46 +45 @@
                libudev-device.c         \
                libudev-enumerate.c      \
+               libudev-hwdb.c           \
                libudev-list.c           \
                libudev-monitor.c        \
@@ -95 +95 @@
              udev-builtin-kmod.c     \
              udev-builtin-uaccess.c  \
+             udev-builtin-net_id.c   \
              udev-builtin-usb_id.c   \
              udev-builtin-input_id.c \
@@ -105 +106 @@
                   udevadm-monitor.c       \
                   udevadm-settle.c        \
+                  udevadm-hwdb.c          \
                   udevadm-info.c          \
                   udevadm-test-builtin.c  \
@@ -121 +123 @@
                   udev-builtin-kmod.c     \
                   udev-builtin-uaccess.c  \
+                  udev-builtin-net_id.c   \
                   udev-builtin-usb_id.c   \
                   udev-builtin-input_id.c \
@@ -159 +162 @@
       build/libudev.pc
 
-common: udev-lfs-$(VERSION)/cfg.h
+cfg.h: udev-lfs-$(VERSION)/cfg.h
+        sed  -e 's/LFS-VERSION/$(VERSION)/' udev-lfs-$(VERSION)/cfg.h > ./cfg.h
         @mkdir -p build
-        sed  -e 's/LFS-VERSION/$(VERSION)/' udev-lfs-$(VERSION)/cfg.h > ./cfg.h
+
+common: cfg.h 
+        @touch common
 
 build/%o: %c common
@@ -282 +288 @@
         @cp -v udev-lfs-$(VERSION)/*.rules    $(DESTDIR)/etc/udev/rules.d
 
+   # Set up hardware DB
+        @mkdir -pv $(DESTDIR)/lib/udev/hwdb.d
+        @cp hwdb/* $(DESTDIR)/lib/udev/hwdb.d
+        @build/udevadm hwdb --update
+
    # Copy documentation
         @cp -v man/udev.7                     $(DESTDIR)/usr/share/man/man7
@@ -302 +313 @@
         rm -rf build
         rm -f  cfg.h
-        rm -f src/gudev/gudevmarshal.h
-        rm -f src/gudev/gudevmarshal.c
-        rm -f src/gudev/gudevenumtypes.h
-        rm -f src/gudev/gudevenumtypes.c
-        rm -f src/udev/keymap/keys.txt
-        rm -f src/udev/keymap/keys-from-name.gperf
-        rm -f src/udev/keymap/keys-from-name.h
-        rm -f src/udev/keymap/keys-to-name.h
-
-.PHONY: clean build 
-
+        rm -f  common
+        rm -f  src/gudev/gudevmarshal.h
+        rm -f  src/gudev/gudevmarshal.c
+        rm -f  src/gudev/gudevenumtypes.h
+        rm -f  src/gudev/gudevenumtypes.c
+        rm -f  src/udev/keymap/keys.txt
+        rm -f  src/udev/keymap/keys-from-name.gperf
+        rm -f  src/udev/keymap/keys-from-name.h
+        rm -f  src/udev/keymap/keys-to-name.h
+
+.PHONY: clean 
+