Removed incorrect link to /toold/lib64 in systemd instructions. Fixes #4355.

Added systemd-239-meson-0.40.0_fixes-1.patch to resolve build errors with meson.
Update to meson-0.40.0. Fixes #4351.
Update to linux-4.18.12. Fixes #4352.

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

6 files changed, 51 insertions, 10 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a666aff0a..65fec55e2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,29 @@
 -->
 
     <listitem>
+      <para>2018-10-10</para>
+      <itemizedlist>
+        <listitem revision="systemd">
+          <para>[dj] - Removed incorrect link to /toold/lib64 in systemd
+          instructions. Fixes
+          <ulink url="&lfs-ticket-root;4355">#4355</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[dj] - Added systemd-239-meson-0.40.0_fixes-1.patch to resolve
+          build errors with meson.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to meson-0.40.0. Fixes
+          <ulink url="&lfs-ticket-root;4351">#4351</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to linux-4.18.12. Fixes
+          <ulink url="&lfs-ticket-root;4352">#4352</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2018-09-30</para>
       <itemizedlist>
         <listitem revision="systemd">
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f7e71bd64..deb408fea 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -134,6 +134,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry revision="systemd">
+      <term>systemd meson fixes patch - <token>&systemd-meson-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&systemd-meson-patch;"/></para>
+        <para>MD5 sum: <literal>&systemd-meson-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+
   </variablelist>
 
   <para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 0db60770f..c987066d4 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -47,7 +47,7 @@
     <para>Because we have not yet installed the final version of Util-Linux,
     create links to the libraries in the approprite location:</para>
 
-<screen><userinput remap="pre">for file in /tools/lib64/lib{blkid,mount,uuid}*; do
+<screen><userinput remap="pre">for file in /tools/lib/lib{blkid,mount,uuid}*; do
     ln -sf $file /usr/lib/
 done</userinput></screen>
 
@@ -63,6 +63,10 @@ done</userinput></screen>
 
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-glibc_statx_fix-1.patch</userinput></screen>
 
+    <para>Apply a patch to fix a build failure with meson-0.40.0:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-meson-0.40.0_fixes-1.patch</userinput></screen>
+
     <para>Remove an unneeded group,
     <systemitem class="groupname">render</systemitem>, from the default udev
     rules:</para>
diff --git a/general.ent b/general.ent
index f2c6d7f60..2a5afc54e 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180930">
+<!ENTITY version         "SVN-20181010">
 <!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        "20180930-systemd">
+<!ENTITY versiond        "20181010-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "September 30, 2018">
+<!ENTITY releasedate     "October 10, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">
diff --git a/packages.ent b/packages.ent
index 2ea26a333..d7f1cffaf 100644
--- a/packages.ent
+++ b/packages.ent
@@ -413,12 +413,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "18">
-<!ENTITY linux-patch-version "9">
+<!ENTITY linux-patch-version "12">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "99,413 KB">
+<!ENTITY linux-size "99,432 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "6f082741ab20f03a334fe533d533880e">
+<!ENTITY linux-md5 "4f6af94e58a89e89aa1683475544a58a">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -467,10 +467,10 @@
 <!ENTITY man-pages-ch6-du "28 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.47.2">
-<!ENTITY meson-size "1,239 KB">
+<!ENTITY meson-version "0.48.0">
+<!ENTITY meson-size "1,284 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "31bda3519d8c0eb3438267268a78085e">
+<!ENTITY meson-md5 "e92273538c6b8371e68d736287a5d991">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-ch6-du "21 MB">
 <!ENTITY meson-ch6-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 461646a6b..78f132e20 100644
--- a/patches.ent
+++ b/patches.ent
@@ -66,3 +66,8 @@
 <!ENTITY systemd-glibc-patch "systemd-&systemd-version;-glibc_statx_fix-1.patch">
 <!ENTITY systemd-glibc-patch-md5 "a44057d6a6ca69760bafc126458d89e5">
 <!ENTITY systemd-glibc-patch-size "4 KB">
+
+<!ENTITY systemd-meson-patch "systemd-&systemd-version;-meson-0.40.0_fixes-1.patch">
+<!ENTITY systemd-meson-patch-md5 "0e12e0722bd6bb84e8a4ec4de8979722">
+<!ENTITY systemd-meson-patch-size "4 KB">
+