MultiLib: Merge changes 11880:HEAD

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

5 files changed, 21 insertions, 18 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 45c1ed4b3..850a36f29 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,18 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
     <listitem>
+      <para>2020-05-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Fix bash tests: add a couple of symlinks
+          from /bin to /tools, create the tester user with the uid of
+          the tty owner, run the bash tests with su &lt;&lt; EOF, and
+          explicitely defining stdin (with help from thomas and bdubbs).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2020-05-29</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index ae42cf4cb..4d06fc2a3 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -80,7 +80,9 @@
     <para>Now, run the tests as the <systemitem
     class="username">tester</systemitem> user:</para>
 
-<screen><userinput remap="test">su tester -c "PATH=$PATH make tests"</userinput></screen>
+<screen><userinput remap="test">su tester &lt;&lt; EOF
+PATH=$PATH make tests &lt; $(tty)
+EOF</userinput></screen>
 
     <para>The <systemitem class="username">tester</systemitem>
     user does not have enough permissions for all the tests to pass. This shows
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 78309ba32..ffef82f84 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -116,7 +116,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
     these tests are not skipped we'll add a temporary group and make the
     user <systemitem class="username">tester</systemitem> a part of it:</para>
 
-<screen><userinput remap="test">echo "dummy:x:1000:tester" &gt;&gt; /etc/group</userinput></screen>
+<screen><userinput remap="test">echo "dummy:x:102:tester" &gt;&gt; /etc/group</userinput></screen>
 
     <para>Fix some of the permissions so that the non-root user can compile and
     run the tests:</para>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 157534511..0fbd114d5 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -39,11 +39,10 @@
   will be replaced by real files throughout the course of this chapter after the
   software has been installed:</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,ln,mkdir,pwd,rm,stty,touch} /bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,false,ln,ls,mkdir,pwd,rm,stty,touch} /bin
 ln -sv /tools/bin/{env,install,perl,printf}         /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
-ln -sv /tools/lib/libfl.so*                         /usr/lib
 
 ln -sv bash /bin/sh
 for lib in blkid mount uuid fdisk
@@ -199,16 +198,6 @@ done</userinput></screen>
 
     <varlistentry>
       <term>
-        <parameter><filename>/usr/lib/libfl.so*</filename></parameter>
-      </term>
-      <listitem>
-        <para>This link allows binutils to find the flex library, and to
-	build enhanced versions of ar and ranlib.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>
         <parameter>
           <filename>/usr/lib/lib{blkid,fdisk,mount,uuid}.so*</filename>,
           <filename>/usr/include/{blkid,libfdisk,libmount,uuid}</filename>,
@@ -367,7 +356,7 @@ EOF</userinput></screen>
   <para>Some tests later in the chapter need a regular user. We add this
   user here and delete this account at the end of the chapter.</para>
 
-<screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
+<screen><userinput>echo "tester:x:$(ls -n $(tty) | cut -d" " -f3):101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
 echo "tester:x:101:" &gt;&gt; /etc/group
 install -o tester -d /home/tester</userinput></screen>
 
diff --git a/general.ent b/general.ent
index 77e61b49c..47c54b421 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200529">
+<!ENTITY version         "SVN-20200531">
 <!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        "20200529-systemd">
+<!ENTITY versiond        "20200531-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 29th, 2020">
+<!ENTITY releasedate     "May 31st, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->