Changeset 2df066c9 for chapter08/udev.xml

Timestamp:

09/15/2023 10:54:55 AM (9 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

7546d8b

Parents:

d58da4b (diff), ba40e32 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

File:

• chapter08/udev.xml (modified) (2 diffs)

chapter08/udev.xml

@@ -128 +128 @@
 install -vm755 udevadm                     /usr/bin/
 install -vm755 systemd-hwdb                /usr/bin/udev-hwdb
-ln      -sv    ../bin/udevadm              /usr/sbin/udevd
+ln      -svfn  ../bin/udevadm              /usr/sbin/udevd
 cp      -av    libudev.so{,*[0-9]}         /usr/lib/
 install -vm644 ../src/libudev/libudev.h    /usr/include/
@@ -148 +148 @@
     <!-- Please make sure systemd man pages tarball has a common leading
          component in the path.  -->
-<screen><userinput remap="install">tar -xf ../../systemd-man-pages-253.tar.xz --strip-components=1       \
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz                            \
+    --no-same-owner --strip-components=1                              \
     -C /usr/share/man --wildcards '*/udev*' '*/libudev*'              \
                                   '*/systemd-'{hwdb,udevd.service}.8
-sed 's/systemd\(\\\?-\)/udev-/' /usr/share/man/man8/systemd-hwdb.8    \
-                              > /usr/share/man/man8/udev-hwdb.8
+sed 's/systemd\(\\\?-\)/udev\1/' /usr/share/man/man8/systemd-hwdb.8   \
+                               > /usr/share/man/man8/udev-hwdb.8
 sed 's|lib.*udevd|sbin/udevd|'                                        \
     /usr/share/man/man8/systemd-udevd.service.8                       \