From 6c672426f85596f90903645f78d510d52f2846a5 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 20 Sep 2018 17:02:36 +0000
Subject: Clean up of unneeded symbolic links. Reordered packages so version
 specific packages are built as late as possible in Chapter 6. Now building
 util-linux in Chapter 5 is unneeded and has been removed.

Update to eudev-3.2.6.
Update to elfutils-0.174 (libelf).
Update to psmisc-23.2.
Update to openssl-1.1.1.
Update to linux-4.18.9.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11472 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/chapter06.xml   | 21 +++++++++----------
 chapter06/createfiles.xml | 51 +++++++++++++++++++++--------------------------
 chapter06/e2fsprogs.xml   | 10 +++++++---
 chapter06/libelf.xml      |  2 +-
 chapter06/make.xml        |  2 +-
 5 files changed, 41 insertions(+), 45 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index cd152491d..79212653c 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -39,7 +39,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
@@ -65,12 +64,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/> 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
@@ -85,20 +78,24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
 
   <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+  <!-- props needs libsystemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
 
   <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index cd90477df..0f7b7e0ac 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -39,40 +39,27 @@
   will be replaced by real files throughout the course of this chapter after the
   software has been installed:</para>
 
-<!--
-<screen revision="sysv"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
-ln -sv /tools/bin/{install,perl} /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-ln -sv bash /bin/sh
+<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
+ln -sv /tools/bin/{env,install,perl}                /usr/bin
+ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
+ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
 
+install -vdm755 /usr/lib/pkgconfig
 
-</userinput></screen>
--->
-<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la -->
+ln -sv bash /bin/sh</userinput></screen>
 
-<!--<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin-->
-<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
-ln -sv /tools/bin/{env,install,perl} /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-for lib in blkid lzma mount uuid
+<!--for lib in blkid lzma mount uuid
 do
     ln -sv /tools/lib/lib$lib.so* /usr/lib
-done
-ln -svf /tools/include/blkid    /usr/include
+done-->
+<!--ln -svf /tools/include/blkid    /usr/include
 ln -svf /tools/include/libmount /usr/include
-ln -svf /tools/include/uuid     /usr/include
-install -vdm755 /usr/lib/pkgconfig
-for pc in blkid mount uuid
+ln -svf /tools/include/uuid     /usr/include-->
+<!--for pc in blkid mount uuid
 do
     sed 's@tools@usr@g' /tools/lib/pkgconfig/${pc}.pc \
         > /usr/lib/pkgconfig/${pc}.pc
-done
-ln -sv bash /bin/sh</userinput></screen>
-
-<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
-   sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la-->
+done-->
   <variablelist>
     <title>The purpose of each link:</title>
 
@@ -107,6 +94,14 @@ ln -sv bash /bin/sh</userinput></screen>
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term><parameter><filename>/usr/bin/env</filename></parameter></term>
+      <listitem>
+        <para>This pathname is hard-coded into some packages build procedures.
+        <!-- systemd  This may not be needed if we move sysd to the end--></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term><parameter><filename>/usr/bin/install</filename></parameter></term>
       <listitem>
@@ -182,14 +177,14 @@ ln -sv bash /bin/sh</userinput></screen>
     </varlistentry>
 -->
     <!--<varlistentry revision="systemd">-->
-    <varlistentry>
+<!--    <varlistentry>
       <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
       <listitem>
-        <para>These links prevent <!--systemd--> utilities from acquiring an
+        <para>These links prevent utilities from acquiring an
         unnecessary reference to the
         <filename class="directory">/tools</filename> directory.</para>
       </listitem>
-    </varlistentry>
+    </varlistentry>-->
 
     <varlistentry>
       <term><parameter><filename>/bin/sh</filename></parameter></term>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 6b935a265..76bb1db15 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -117,13 +117,17 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
-
+<!--
     <para>To set up and run the test suite we need to first link some 
     libraries from /tools/lib to a location where the test programs look.
     To run the tests, issue:</para>
+-->
+
+    <para>To run the tests, issue:</para>
 
-<screen><userinput remap="test">ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
-make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
+<!--ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib -->
+<!--make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
 
     <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory.
     If you do not have significantly more RAM than this, be sure to enable
diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml
index 7166dd48f..280d1fe66 100644
--- a/chapter06/libelf.xml
+++ b/chapter06/libelf.xml
@@ -14,7 +14,7 @@
     <address>&elfutils-url;</address>
   </sect1info>
 
-  <title>Libelf &elfutils-version;</title>
+  <title>Libelf from Elfutils-&elfutils-version;</title>
 
   <indexterm zone="ch-system-libelf">
     <primary sortas="a-Libelf">Libelf</primary>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index bf57ce74c..e2792976b 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,7 +40,7 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
-    <para>Again, work around an error caused by glibc-2.27:</para>
+    <para>Again, work around an error caused by glibc-2.27 and later:</para>
 
 <screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
     <para>Prepare Make for compilation:</para>
-- 
cgit v1.2.3-54-g00ecf