aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml21
-rw-r--r--chapter06/systemd.xml13
-rw-r--r--general.ent6
-rw-r--r--packages.ent6
4 files changed, 36 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 11739c056..7e3fe1655 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,19 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<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>
<listitem>
@@ -53,7 +66,7 @@
<para>[bdubbs] - Update meson-0.44.0. Fixes
<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>
</listitem>
@@ -71,7 +84,7 @@
<para>[bdubbs] - Update to man-pages-4.14. Fixes
<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>
</listitem>
@@ -98,7 +111,7 @@
<para>[bdubbs] - Update to libpipeline-1.5.0. Fixes
<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>
</listitem>
@@ -180,7 +193,7 @@
</itemizedlist>
</listitem>
- <listitem>
+ <listitem revision="sysv">
<para>2017-10-27</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 192e0035c..867b6fdcf 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -43,10 +43,15 @@
<para>Create a symlink to work around missing xsltproc:</para>
<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>
<screen><userinput remap="configure">mkdir -p build
@@ -60,6 +65,7 @@ meson --prefix=/usr \
-Dbuildtype=release \
-Ddefault-dnssec=no \
-Dfirstboot=false \
+ -Dinstall-tests=false \
-Dkill-path=/bin/kill \
-Dkmod-path=/bin/kmod \
-Dldconfig=false \
@@ -104,6 +110,13 @@ meson --prefix=/usr \
</varlistentry>
<varlistentry>
+ <term><parameter>-Dinstall-tests=false</parameter></term>
+ <listitem>
+ <para>This switch prevents installation of the compiled tests.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><parameter>-Dldconfig=no</parameter></term>
<listitem>
<para>This switch prevents installation of a systemd
diff --git a/general.ent b/general.ent
index d991b435e..12ce6d1e4 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!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; -->
<!ENTITY milestone "8.2">
diff --git a/packages.ent b/packages.ent
index 9084e1a70..9ad7fc64c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -654,10 +654,10 @@
<!ENTITY udev-lfs-home " ">
<!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">
<!ENTITY util-linux-ch5-sbu "0.8 SBU">