[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-systemd-87-g0fc2814

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  0fc2814d87104cf9797399ef09edaba2b9e3e96f (commit)
      from  0f2cdb1775d325aa61c75929db584b7694a4b617 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0fc2814d87104cf9797399ef09edaba2b9e3e96f
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Fri Oct 31 09:45:10 2014 -0500

    Add ADJTIME_PATH variable during configure for setting the adjtime path rather than use a sed.

diff --git a/BOOK/final-system/common/util-linux.xml b/BOOK/final-system/common/util-linux.xml
index b154f5f..97aa735 100644
--- a/BOOK/final-system/common/util-linux.xml
+++ b/BOOK/final-system/common/util-linux.xml
@@ -32,9 +32,7 @@
     location for the <filename>adjtime</filename> file. To make the
     <command>hwclock</command> program FHS-compliant, run the following:</para>
 
-<screen><userinput>sed -i -e 's at etc/adjtime at var/lib/hwclock/adjtime at g' \
-    $(grep -rl '/etc/adjtime' .)
-mkdir -pv /var/lib/hwclock</userinput></screen>
+<screen><userinput>mkdir -pv /var/lib/hwclock</userinput></screen>
 
   </sect2>
 
@@ -43,7 +41,8 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
 
     <para os="a">Prepare Util-linux for compilation:</para>
 
-<screen os="b"><userinput>./configure --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+<screen os="b"><userinput>./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist os="c">
       <title>The meaning of the configure options:</title>
diff --git a/BOOK/final-system/multilib/util-linux-64bit-pass1.xml b/BOOK/final-system/multilib/util-linux-64bit-pass1.xml
index 2296ae8..dd58e9f 100644
--- a/BOOK/final-system/multilib/util-linux-64bit-pass1.xml
+++ b/BOOK/final-system/multilib/util-linux-64bit-pass1.xml
@@ -25,8 +25,8 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="be"><userinput>./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
+    --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir='${prefix}'/lib64 --disable-makeinstall-chown \
     --disable-makeinstall-setuid</userinput></screen>
 
diff --git a/BOOK/final-system/multilib/util-linux-64bit.xml b/BOOK/final-system/multilib/util-linux-64bit.xml
index e555c56..fbe2d47 100644
--- a/BOOK/final-system/multilib/util-linux-64bit.xml
+++ b/BOOK/final-system/multilib/util-linux-64bit.xml
@@ -29,8 +29,8 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
+    --libdir=/lib64 --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
diff --git a/BOOK/final-system/multilib/util-linux-n32.xml b/BOOK/final-system/multilib/util-linux-n32.xml
index 060d666..8802484 100644
--- a/BOOK/final-system/multilib/util-linux-n32.xml
+++ b/BOOK/final-system/multilib/util-linux-n32.xml
@@ -26,8 +26,8 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
-    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure ADJTIME_PATH=/var/lib/hwclcock/adjtime \
+    --libdir=/lib32 --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
diff --git a/BOOK/final-system/multilib/util-linux.xml b/BOOK/final-system/multilib/util-linux.xml
index 4aa28fb..dd17ca9 100644
--- a/BOOK/final-system/multilib/util-linux.xml
+++ b/BOOK/final-system/multilib/util-linux.xml
@@ -26,8 +26,8 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
-    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
+    --libdir=/lib --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/util-linux.xml            |    7 +++----
 .../multilib/util-linux-64bit-pass1.xml            |    4 ++--
 BOOK/final-system/multilib/util-linux-64bit.xml    |    4 ++--
 BOOK/final-system/multilib/util-linux-n32.xml      |    4 ++--
 BOOK/final-system/multilib/util-linux.xml          |    4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book