From 76a706e9bdeaf6e424f36d3f28cd661b15be241d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 16 Jun 2019 21:09:30 +0000
Subject: Update to vim-8.1.1535. Update to shadow-4.7. Update to linux-5.1.10.
 Update to less-551. Update to util-linux-2.34. Remove eudev instructions
 referring to /tools.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11619 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/eudev.xml | 20 +++++++++++++-------
 chapter06/vim.xml   | 11 ++++++++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/eudev.xml b/chapter06/eudev.xml
index de2ba41c6..4342e2172 100644
--- a/chapter06/eudev.xml
+++ b/chapter06/eudev.xml
@@ -49,6 +49,7 @@
 
 <screen><userinput remap="pre">sed -i '/keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c</userinput></screen>
 -->
+<!--
     <para>First, add a workaround to prevent the /tools directory from being 
     hard coded into Eudev binary files library locations:</para>
 
@@ -57,7 +58,7 @@ HAVE_BLKID=1
 BLKID_LIBS="-lblkid"
 BLKID_CFLAGS="-I/tools/include"
 EOF</userinput></screen>
-
+-->
 <para>Prepare Eudev for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr           \
@@ -69,11 +70,13 @@ EOF</userinput></screen>
             --with-rootprefix=      \
             --with-rootlibdir=/lib  \
             --enable-manpages       \
-            --disable-static        \
-            --config-cache</userinput></screen>
+            --disable-static</userinput></screen>
+<!--           - -config-cache</userinput></screen> -->
 
 <para>Compile the package:</para>
 
+<screen><userinput remap="make">make</userinput></screen>
+<!--
 <screen><userinput remap="make">LIBRARY_PATH=/tools/lib make</userinput></screen>
 
 <note><para>The LIBRARY_PATH variable here and the LD_LIBRARY_PATH variable
@@ -81,7 +84,7 @@ below are needed to allow the use of libraries that were installed in /tools,
 but have not yet been installed in the main system.  LIBRARY_PATH is
 used to find libraries during the linking process.  LD_LIBRARY_PATH is
 used to find libraries during program execution.</para></note>
-
+-->
 <para>Create some directories now that are needed for tests, but
 will also be used as a part of installation:</para>
 
@@ -90,11 +93,13 @@ mkdir -pv /etc/udev/rules.d</userinput></screen>
 
 <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
+<!--<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
+<!--<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>-->
 
     <para>Install some custom rules and support files useful in an LFS 
     environment:</para>
@@ -123,7 +128,8 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
     into a binary database <filename>/etc/udev/hwdb.bin</filename>. Create the
     initial database:</para>
 
-<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb --update</userinput></screen>
+<!--<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb - -update</userinput></screen>-->
+<screen><userinput>udevadm hwdb --update</userinput></screen>
 
     <para>This command needs to be run each time the hardware information is
     updated.</para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 04f6d9bd8..4d84df75f 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -66,7 +66,16 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue:</para>
+    <para>To prepare the tests, ensure that the 
+    <systemitem class="username">nobody</systemitem> user can write 
+    to the sources tree:</para>
+
+<screen><userinput remap="test">chown -Rv nobody .</userinput></screen>
+
+    <para>Now run the tests as the <systemitem
+    class="username">nobody</systemitem> user:</para>
+
+<screen><userinput remap="test">su nobody -s /bin/bash -c "LANG=en_US.UTF-8 make -j1 test" &amp;> vim-test.log</userinput></screen>
 
 <screen><userinput remap="test">LANG=en_US.UTF-8 make -j1 test &amp;&gt; vim-test.log</userinput></screen>
 
-- 
cgit v1.2.3-54-g00ecf