Changeset e88a471b

Timestamp:

12/22/2017 06:20:59 AM (6 years ago)

Author:

DJ Lucas <dj@…>

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, 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:

896e77e

Parents:

ea5492c

Message:

Update to util-linux-2.31.1. Fixes #4176.
Correct build issue with systemd-236 tests.

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

Files:

• chapter01/changelog.xml (modified) (5 diffs)
• chapter06/systemd.xml (modified) (3 diffs)
• general.ent (modified) (1 diff)
• packages.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -44 +44 @@
 -->
     <listitem>
+      <para>2017-12-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to util-linux-2.31.1.  Fixes
+          <ulink url="&lfs-ticket-root;4176">#4176</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[dj] - Correct build issue with systemd-236 tests.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2017-12-19</para>
       <itemizedlist>
@@ -54 +67 @@
           <ulink url="&lfs-ticket-root;4173">#4173</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision="systemd">
           <para>[bdubbs] - Update to systemd-236.  Fixes
           <ulink url="&lfs-ticket-root;4174">#4174</ulink>.</para>
@@ -72 +85 @@
           <ulink url="&lfs-ticket-root;4170">#4170</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision="sysv">
           <para>[bdubbs] - Update to eudev-3.2.5.  Fixes
           <ulink url="&lfs-ticket-root;4169">#4169</ulink>.</para>
@@ -99 +112 @@
           <ulink url="&lfs-ticket-root;4167">#4167</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision="systemd">
           <para>[bdubbs] - Update to dbus-1.12.2.  Fixes
           <ulink url="&lfs-ticket-root;4166">#4166</ulink>.</para>
@@ -181 +194 @@
     </listitem>
 
-    <listitem>
+    <listitem revision="sysv">
       <para>2017-10-27</para>
       <itemizedlist>

chapter06/systemd.xml

@@ -44 +44 @@
 
 <screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
+
     <para>Set up the man pages:</para>
 
 <screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
+
+    <para>Remove tests that cannot be built in chroot:</para>
+
+<screen><userinput remap="pre">sed '179,223d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
@@ -61 +66 @@
       -Ddefault-dnssec=no          \
       -Dfirstboot=false            \
+      -Dinstall-tests=false        \
       -Dkill-path=/bin/kill        \
       -Dkmod-path=/bin/kmod        \
@@ -101 +107 @@
           the first time. They are not useful for LFS because
           everything is done manually.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dinstall-tests=false</parameter></term>
+        <listitem>
+          <para>This switch prevents installation of the compiled tests.</para>
         </listitem>
       </varlistentry>

general.ent

@@ -1 @@
-<!ENTITY version         "SVN-20171219">
+<!ENTITY version         "SVN-20171222">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20171219-systemd">
+<!ENTITY versiond        "20171222-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "December 19, 2017">
+<!ENTITY releasedate     "December 22, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->

packages.ent

@@ -655 +655 @@
 
 <!ENTITY util-linux-minor "2.31">
-<!ENTITY util-linux-version "2.31">
-<!ENTITY util-linux-size "4,390 KB">
+<!ENTITY util-linux-version "2.31.1">
+<!ENTITY util-linux-size "4,412 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "5b6821c403c3cc6e7775f74df1882a20">
+<!ENTITY util-linux-md5 "7733b583dcb51518944d42aa62ef19ea">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "123 MB">