[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1292-g62afd55

[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  62afd55a62b6fcc413b1e41c2cd056bd075ff782 (commit)
       via  b0c53c06ba4bf7a6d78556a6770d623ef7a2c530 (commit)
      from  0959d108bdaba17d037b825fab319fef95bb6245 (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 62afd55a62b6fcc413b1e41c2cd056bd075ff782
Author: Chris Staub <chris at beaker67.com>
Date:   Tue Jun 24 13:06:08 2014 -0400

    Avoid running setcap during systemd installation

diff --git a/BOOK/final-system/common/systemd.xml b/BOOK/final-system/common/systemd.xml
index b5b90fc..3f4dfb4 100644
--- a/BOOK/final-system/common/systemd.xml
+++ b/BOOK/final-system/common/systemd.xml
@@ -32,11 +32,18 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
 
-    <para os="s1">The <filename>timesyncd.conf</filename> file contains a
+    <para os="s1">Prevent the <filename>Makefile</filename> from trying to run
+    <command>setcap</command> on <command>systemd-detect-virt</command>,
+    which will fail if the kernel or file system does not support extended
+    capabilities:</para>
+
+<screen os="s2"><userinput>sed -i '/virt-install-hook /d' Makefile.in</userinput></screen>
+
+    <para os="s3">The <filename>timesyncd.conf</filename> file contains a
     reference to a non-existent <filename>timesyncd.conf(5)</filename> man
     page. Remove that reference to avoid possible confusion:</para>
 
-<screen os="s2"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
+<screen os="s4"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
 
     <para os="a">Prepare systemd for compilation:</para>
 
diff --git a/BOOK/final-system/multilib/systemd-64bit.xml b/BOOK/final-system/multilib/systemd-64bit.xml
index b650fda..c70e8b2 100644
--- a/BOOK/final-system/multilib/systemd-64bit.xml
+++ b/BOOK/final-system/multilib/systemd-64bit.xml
@@ -38,6 +38,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 29dad02..4b71065 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -43,6 +43,10 @@
           <para>[Chris] - Remove reference to a non-existent man page
           from <filename>timesyncd.conf</filename>.</para>
         </listitem>
+        <listitem>
+          <para>[Chris] - Prevent systemd from running
+          <command>setcap</command> during installation.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

commit b0c53c06ba4bf7a6d78556a6770d623ef7a2c530
Author: Chris Staub <chris at beaker67.com>
Date:   Tue Jun 24 13:05:12 2014 -0400

    Added changelog entry for latest update

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index ef80cd7..29dad02 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>24 June 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Remove reference to a non-existent man page
+          from <filename>timesyncd.conf</filename>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>23 June 2014</para>
       <itemizedlist>
         <listitem>

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

Summary of changes:
 BOOK/final-system/common/systemd.xml         |   11 +++++++++--
 BOOK/final-system/multilib/systemd-64bit.xml |    8 ++++++++
 BOOK/introduction/common/changelog.xml       |   14 ++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book