Fix failures in texinfo regression tests.

Update to linux-4.17.5.  
Update to meson-0.47.0.  



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

5 files changed, 54 insertions, 12 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6c16d292c..1fbcd903a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,23 @@
 -->
 
     <listitem>
+      <para>2018-07-08</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Fix failures in texinfo regression tests.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to linux-4.17.5.  Fixes
+           <ulink url="&lfs-ticket-root;4300">#4300</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to meson-0.47.0.  Fixes
+           <ulink url="&lfs-ticket-root;4306">#4306</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2018-07-07</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/meson.xml b/chapter06/meson.xml
index fed402f46..b0410392b 100644
--- a/chapter06/meson.xml
+++ b/chapter06/meson.xml
@@ -40,6 +40,10 @@
   <sect2 role="installation">
     <title>Installation of Meson</title>
 
+    <para>Make a fix from upstream:</para>
+
+<screen><userinput remap="pre">sed -i '309 s/os.getcwd/-C, &amp;/' mesonbuild/minstall.py</userinput></screen>
+
     <para>Compile Meson with the following command:</para>
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>
@@ -48,16 +52,33 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">python3 setup.py install</userinput></screen>
-
+<screen><userinput remap="install">python3 setup.py install --root=dest
+cp -rv dest/* /</userinput></screen>
+<!--
     <para>At last, move Meson man pages to correct location:</para>
 
 <screen><userinput remap="install">mv -v /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share/man/man1/*.1 \
       /usr/share/man/man1
 rm -r /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share</userinput></screen>
+-->
 
-  </sect2>
+    <variablelist>
+      <title>The meaning of the install parameters:</title>
+      
+      <varlistentry>
+        <term><parameter>--root=dest</parameter></term>
+        <listitem>
+          <para>By default <command>python3 setup.py install</command>
+          installs various files (such as man pages) into Python Eggs.
+          With a specified root location, <command>setup.py</command> installs
+          these files into a standard hierarchy.  Then we can just copy
+          the hierarchy so the files will be in the standard location.
+        </para>
+        </listitem>
+      </varlistentry>
 
+    </variablelist>
+  </sect2>
 
   <sect2 id="contents-meson" role="content">
     <title>Contents of Meson</title>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 11a9eed06..97a5a9931 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -41,6 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
+    <para>Fix a file that creates a lot of failures in the regression checks:</para>
+
+<screen><userinput remap="pre">sed -i '5481,5485 s/({/(\\{/' tp/Texinfo/Parser.pm</userinput></screen>
+
     <para>Prepare Texinfo for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
diff --git a/general.ent b/general.ent
index 6bc6c6703..79b13f69b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180707">
+<!ENTITY version         "SVN-20180708">
 <!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        "20180707-systemd">
+<!ENTITY versiond        "20180708-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "July 7, 2018">
+<!ENTITY releasedate     "July 8, 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 f1c324b4d..f044ffe05 100644
--- a/packages.ent
+++ b/packages.ent
@@ -416,12 +416,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "17">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "5">
 <!--<!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,783 KB">
+<!ENTITY linux-size "99,780 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "a5899b46a3d146c65bc2ba724db2f4ca">
+<!ENTITY linux-md5 "1677d884b0e39f217afc9e23e088e330">
 <!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,
@@ -470,10 +470,10 @@
 <!ENTITY man-pages-ch6-du "27 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.46.1">
-<!ENTITY meson-size "1,176 KB">
+<!ENTITY meson-version "0.47.0">
+<!ENTITY meson-size "1,218 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "1698f6526574839de5dcdc45e3f7d582">
+<!ENTITY meson-md5 "5ec10121fcd1e130fdc7e9a10d762a4c">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-ch6-du "16 MB">
 <!ENTITY meson-ch6-sbu "0.1 SBU">