From efcb3933433838b71f3a4a53ec1ac6d899aaec0b Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sun, 3 May 2020 21:02:51 +0000
Subject: Make the new book

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11831 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/util-linux.xml | 71 ++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 41 deletions(-)

(limited to 'chapter05/util-linux.xml')

diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index b164fa2db..6aebad7a1 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -41,66 +41,55 @@
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-    <para>Prepare Util-linux for compilation:</para>
+    <para>First create a directory
+    to enable storage for the <command>hwclock</command> program:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools                \
-            --without-python               \
-            --disable-makeinstall-chown    \
-            --without-systemdsystemunitdir \
-            --without-ncurses              \
-            PKG_CONFIG=""</userinput></screen>
+<screen><userinput remap="pre">mkdir -pv /var/lib/hwclock</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the configure option:</title>
+    <para>Prepare Util-linux for compilation:</para>
 
-      <varlistentry>
-        <term><parameter>--without-python</parameter></term>
-        <listitem>
-          <para>This switch disables using <application>Python</application>
-          if it is installed on the host system.  It avoids trying to build
-          unneeded bindings.</para>
-        </listitem>
-      </varlistentry>
+<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
+            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
+            --disable-chfn-chsh  \
+            --disable-login      \
+            --disable-nologin    \
+            --disable-su         \
+            --disable-setpriv    \
+            --disable-runuser    \
+            --disable-pylibmount \
+            --disable-static     \
+            --without-python</userinput></screen>
 
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+<!-- TODO -->
       <varlistentry>
-        <term><parameter>--disable-makeinstall-chown</parameter></term>
+        <term><parameter>ADJTIME_PATH=/var/lib/hwclock/adjtime</parameter></term>
         <listitem>
-          <para>This switch disables using the <command>chown</command> command
-          during installation.  This is not needed when installing into the
-          /tools directory and avoids the necessity of installing as
-          root.</para>
+          <para>This sets the location of the file recording information about
+          the hardware clock, in accordance to the FHS. This is not stricly
+          needed fot his temporary tool, but it prevent creating a file
+          at another location, which would not be overwritten or removed
+          when building the final util-linux.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--without-ncurses</parameter></term>
+        <term><parameter>--disable-*</parameter></term>
         <listitem>
-          <para>This switch disables using the ncurses library for
-          the build process. This is not needed when installing into the
-          /tools directory and avoids problems on some host distros.</para>
+          <para>Those switches prevent warnings about building components
+          that require packages not in LFS or not installed yet.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--without-systemdsystemunitdir</parameter></term>
+        <term><parameter>--without-python</parameter></term>
         <listitem>
-          <para>On systems that use systemd, the package tries to install 
-          a systemd specific file to a non-existent directory in /tools.
-          This switch disables the unnecessary action.</para>
+          <para>This switch disables using <application>Python</application>.
+          It avoids trying to build unneeded bindings.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><envar>PKG_CONFIG=""</envar></term>
-        <listitem>
-          <para>Setting this environment variable prevents adding unneeded
-          features that may be available on the host. Note that the location
-          shown for setting this environment variable is different from other
-          LFS sections where variables are set preceding the command.  This
-          location is shown to demonstrate an alternative way of setting an
-          environment variable when using configure.</para>
-        </listitem>
-      </varlistentry>
      </variablelist>
 
     <para>Compile the package:</para>
-- 
cgit v1.2.3-54-g00ecf