Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

3 files changed, 30 insertions, 5 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9694954cd..c049903fc 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,17 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem revision='sysv'>
+      <para>2023-12-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Restore NIC naming based on physical system
+          characteristics.  Fixes
+          <ulink url='&lfs-ticket-root;5386'>#5386</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-11-30</para>
       <itemizedlist>
diff --git a/chapter08/udev.xml b/chapter08/udev.xml
index 46ab88cff..dd686f489 100644
--- a/chapter08/udev.xml
+++ b/chapter08/udev.xml
@@ -55,6 +55,11 @@
 
  <screen><userinput remap="pre">sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in</userinput></screen>
 
+    <para>Adjust the hardcoded paths to network configuration files for the
+    standalone udev installation:</para>
+
+ <screen><userinput remap="pre">sed '/NETWORK_DIRS/s/systemd/udev/' -i src/basic/path-lookup.h</userinput></screen>
+
     <para>Prepare Udev for compilation:</para>
 
 <screen><userinput remap="configure">mkdir -p build
@@ -128,7 +133,7 @@ meson setup \
 
     <para>Install the package:</para>
 
-    <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb,rules}.d
+    <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb.d,rules.d,network}
 install -vm755 -d /usr/{lib,share}/pkgconfig
 install -vm755 udevadm                             /usr/bin/
 install -vm755 systemd-hwdb                        /usr/bin/udev-hwdb
@@ -143,7 +148,8 @@ install -vm644 $(find ../rules.d/*.rules \
                       -not -name '*power-switch*') /usr/lib/udev/rules.d/
 install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/
 install -vm755 $(find src/udev \
-                      -type f -not -name '*.*')    /usr/lib/udev</userinput></screen>
+                      -type f -not -name '*.*')    /usr/lib/udev
+install -vm644 ../network/99-default.link          /usr/lib/udev/network</userinput></screen>
 
     <para>Install some custom rules and support files useful in an LFS
     environment:</para>
@@ -158,13 +164,21 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
 <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.link.5'                  \
                                   '*/systemd-'{hwdb,udevd.service}.8
+
+sed 's|systemd/network|udev/network|'                                 \
+    /usr/share/man/man5/systemd.link.5                                \
+  > /usr/share/man/man5/udev.link.5
+
 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                       \
   > /usr/share/man/man8/udevd.8
-rm  /usr/share/man/man8/systemd-*.8</userinput></screen>
+
+rm /usr/share/man/man*/systemd*</userinput></screen>
 
   </sect2>
 
diff --git a/packages.ent b/packages.ent
index 5093b8aa1..50b140bf2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -739,8 +739,8 @@
 <!-- <!ENTITY vim-majmin "90"> -->
 <!ENTITY vim-docdir "vim/vim90">
 <!ENTITY vim-size "16,989 KB">
-<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
-<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
+<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
+<!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">-->
 <!ENTITY vim-md5 "8dcf113cb690bcdd13d75a4e7c2e3a62">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "229 MB">