Merge changes from trunk to multilib

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12021 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter01/changelog.xml

@@ -44,6 +44,31 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <itemizedlist>
+      <para>2020-08-11</para>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to systemd-246. Fixes
+          <ulink url="&lfs-ticket-root;4687">#4687</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to check-0.15.2. Fixes
+          <ulink url="&lfs-ticket-root;4711">#4711</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <itemizedlist>
+      <para>2020-08-10</para>
+        <listitem>
+          <para>[ken] - Ensure all the book's perl modules are installed
+          to /usr/lib/perl5/5.32 (some were in /usr/share/perl5). Fixes
+          <ulink url="&lfs-ticket-root;4710">#4710</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <itemizedlist>
       <para>2020-08-06</para>

chapter03/patches.xml

@@ -91,6 +91,7 @@
       </listitem>
     </varlistentry>
 
+<!--
     <varlistentry revision="systemd">
       <term>Systemd GCC-10 Patch - <token>&systemd-gcc10-patch-size;</token>:</term>
       <listitem>
@@ -98,6 +99,7 @@
         <para>MD5 sum: <literal>&systemd-gcc10-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
 
   </variablelist>
 

chapter07/perl.xml

@@ -45,15 +45,15 @@
 
     <para>Prepare Perl for compilation:</para>
 
-    <screen><userinput remap="configure">sh Configure -des                                     \
-             -Dprefix=/usr                            \
-             -Dvendorprefix=/usr                      \
-             -Dprivlib=/usr/share/perl5/core_perl     \
-             -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl  \
-             -Dsitelib=/usr/share/perl5/site_perl     \
-             -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl \
-             -Dvendorlib=/usr/share/perl5/vendor_perl \
-             -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl</userinput></screen>
+    <screen><userinput remap="configure">sh Configure -des                                        \
+             -Dprefix=/usr                               \
+             -Dvendorprefix=/usr                         \
+             -Dprivlib=/usr/lib/perl5/5.32/core_perl     \
+             -Darchlib=/usr/lib/perl5/5.32/core_perl     \
+             -Dsitelib=/usr/lib/perl5/5.32/site_perl     \
+             -Dsitearch=/usr/lib/perl5/5.32/site_perl    \
+             -Dvendorlib=/usr/lib/perl5/5.32/vendor_perl \
+             -Dvendorarch=/usr/lib/perl5/5.32/vendor_perl</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new Configure options:</title>

chapter08/check.xml

@@ -42,7 +42,7 @@
 
     <para>Prepare Check for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
 
     <para>Build the package:</para>
 
@@ -71,7 +71,7 @@
 
       <seglistitem>
         <seg>checkmk</seg>
-        <seg>libcheck.{a,so}</seg>
+        <seg>libcheck.so</seg>
       </seglistitem>
     </segmentedlist>
 

chapter08/gcc.xml

@@ -143,7 +143,7 @@ su tester -c "PATH=$PATH make -k check"</userinput></screen>
     apparently related to the en_HK locale.</para>
 
     <para>Additionally the following tests related to the following files
-    are kown to fail with glibc-2.32: asan_test.C, co-ret-17-void-ret-coro.C, 
+    are known to fail with glibc-2.32: asan_test.C, co-ret-17-void-ret-coro.C, 
     pr95519-05-gro.C, pr80166.c.</para>
 
 <!-- don't fail anymore after the move of iana-etc and /etc/hosts

chapter08/kbd.xml

@@ -88,6 +88,10 @@ sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in</userinput></screen>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
+    <para>Remove an internal library installed unintentionally:</para>
+
+<screen><userinput remap="install">rm -v /usr/lib/libtswrap.{a,la,so*}</userinput></screen>
+
     <note>
       <para>For some languages (e.g., Belarusian) the Kbd package doesn't
       provide a useful keymap where the stock <quote>by</quote> keymap assumes

chapter08/perl.xml

@@ -58,12 +58,12 @@ export BUILD_BZIP2=0</userinput></screen>
  <screen><userinput remap="configure">sh Configure -des                                         \
              -Dprefix=/usr                                \
              -Dvendorprefix=/usr                          \
-             -Dprivlib=/usr/share/perl5/core_perl         \
-             -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl      \
-             -Dsitelib=/usr/share/perl5/site_perl         \
-             -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl     \
+             -Dprivlib=/usr/lib/perl5/5.32/core_perl      \
+             -Darchlib=/usr/lib/perl5/5.32/core_perl      \
+             -Dsitelib=/usr/lib/perl5/5.32/site_perl      \
+             -Dsitearch=/usr/lib/perl5/5.32/site_perl     \
              -Dvendorlib=/usr/share/perl5/vendor_perl     \
-             -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl \
+             -Dvendorarch=/usr/lib/perl5/5.32/vendor_perl \
              -Dman1dir=/usr/share/man/man1                \
              -Dman3dir=/usr/share/man/man3                \
              -Dpager="/usr/bin/less -isR"                 \

chapter08/systemd.xml

@@ -40,9 +40,11 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
+<!--
     <para>First, apply a patch to fix the build with GCC-10 and fix a segfault:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
+-->
 
     <para>Create a symlink to work around the xsltproc command not being installed:</para>
 
@@ -54,7 +56,7 @@
 
     <para>Remove tests that cannot be built in chroot:</para>
 
-<screen><userinput remap="pre">sed '179,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Remove an unneeded group,
     <systemitem class="groupname">render</systemitem>, from the default udev
@@ -377,8 +379,9 @@ rm -f /usr/bin/xsltproc</userinput></screen>
         <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
-        /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d,
-        /usr/lib/sysctl.d, /usr/lib/systemd, /usr/lib/tmpfiles.d,
+        /usr/lib/binfmt.d, /usr/lib/environment.d, /usr/lib/kernel, 
+        /usr/lib/modules-load.d, /usr/lib/sysctl.d, /usr/lib/systemd, 
+        /usr/lib/tmpfiles.d,
         /usr/share/doc/systemd-&systemd-version;, /usr/share/factory,
         /usr/share/systemd, /var/lib/systemd, and /var/log/journal</seg>
       </seglistitem>

chapter10/kernel.xml

@@ -75,17 +75,12 @@
       <para>Be sure to enable/disable/set the following features or the system might
       not work correctly or boot at all:</para>
 
-      <screen role="nodump" revision="sysv">
-Device Drivers  ---&gt;
+      <screen role="nodump" revision="sysv">Device Drivers  ---&gt;
   Generic Driver Options  ---&gt;
    [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
-   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
-
-Kernel hacking  ---&gt;
-       Choose kernel unwinder (Frame pointer unwinder)  ---&gt; [CONFIG_UNWINDER_FRAME_POINTER]</screen>
+   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]</screen>
 
-      <screen role="nodump" revision="systemd">
-General setup -->
+      <screen role="nodump" revision="systemd">General setup -->
    [*] Control Group support [CONFIG_CGROUPS]
    [ ] Enable deprecated sysfs features to support old userspace tools [CONFIG_SYSFS_DEPRECATED]
    [*] Configure standard kernel features (expert users) [CONFIG_EXPERT] ---&gt;         

general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200806">
+<!ENTITY version         "SVN-20200811">
 <!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        "20200806-systemd">
+<!ENTITY versiond        "20200811-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "August 6th, 2020">
+<!ENTITY releasedate     "August 11th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 

packages.ent

@@ -95,10 +95,10 @@
 <!ENTITY bzip2-fin-du "7.7 MB">
 <!ENTITY bzip2-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY check-version "0.15.1">
-<!ENTITY check-size "757 KB">
+<!ENTITY check-version "0.15.2">
+<!ENTITY check-size "760 KB">
 <!ENTITY check-url "&github;/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz">
-<!ENTITY check-md5 "4b22423bb2dddd0f965465d02b568d7b">
+<!ENTITY check-md5 "50fcafcecde5a380415b12e9c574e0b2">
 <!ENTITY check-home "https://libcheck.github.io/check">
 <!ENTITY check-fin-du "12 MB">
 <!ENTITY check-fin-sbu "0.1 SBU (about 3.3 SBU with tests)">
@@ -629,21 +629,21 @@
 <!ENTITY sysklogd-fin-du "0.6 MB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "245">
+<!ENTITY systemd-version  "246">
 <!--<!ENTITY systemd-stable   "6b4878d">-->
 <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
      change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size     "8,784 KB">
+<!ENTITY systemd-size     "9,312 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5      "04f02d9841ea5992a16f6b03c873da28">
+<!ENTITY systemd-md5      "a3e9efa72d0309dd26513a221cdff31b">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-size "512 KB">
+<!ENTITY systemd-man-size "592 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
-<!ENTITY systemd-man-md5  "ecf8cc4baa33b91ad4212d28e88f8edd">
-<!ENTITY systemd-fin-du   "249 MB">
-<!ENTITY systemd-fin-sbu  "1.9 SBU">
+<!ENTITY systemd-man-md5  "819cc8ccffe51cb1863846fcb59a784a">
+<!ENTITY systemd-fin-du   "262 MB">
+<!ENTITY systemd-fin-sbu  "2.0 SBU">
 
 <!ENTITY sysvinit-version "2.97">
 <!ENTITY sysvinit-size "124 KB">

patches.ent

@@ -62,7 +62,3 @@
 <!ENTITY systemd-consolidated-patch-md5 "2bad2992f4373eb925885f2ea2fb8d14">
 <!ENTITY systemd-consolidated-patch-size "64 KB">
 -->
-
-<!ENTITY systemd-gcc10-patch "systemd-&systemd-version;-gcc_10-fixes-2.patch">
-<!ENTITY systemd-gcc10-patch-md5 "5eaac1d3a66118c40814d3b81ad36b71">
-<!ENTITY systemd-gcc10-patch-size "8 KB">