[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-772-gdf44c72

[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, systemd has been updated
       via  df44c72fa87f66a346a170e8ae818c0ecd03b4cc (commit)
      from  5847541e02bd58ee1d4bfaa6a0b6f439feda84a0 (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 df44c72fa87f66a346a170e8ae818c0ecd03b4cc
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Tue Jan 21 13:07:47 2014 -0600

    Tidy up systemd multilib instructions to be proper in each 32bit, n32, and 64bit build.

diff --git a/BOOK/final-system/multilib/systemd-64bit.xml b/BOOK/final-system/multilib/systemd-64bit.xml
index cda8e5a..0e939cd 100644
--- a/BOOK/final-system/multilib/systemd-64bit.xml
+++ b/BOOK/final-system/multilib/systemd-64bit.xml
@@ -26,9 +26,9 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
   ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" -with-rootlibdir=/lib \
+    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64 --docdir=/usr/share/doc/systemd-&systemd-version; \
+    --with-rootprefix="" -with-rootlibdir=/lib64 \
     --enable-split-usr --disable-gudev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/systemd-n32.xml b/BOOK/final-system/multilib/systemd-n32.xml
index e02e290..6037782 100644
--- a/BOOK/final-system/multilib/systemd-n32.xml
+++ b/BOOK/final-system/multilib/systemd-n32.xml
@@ -31,50 +31,26 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
   ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var \
+    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \
     --libexecdir=/usr/lib32 --docdir=/usr/share/doc/systemd-&systemd-version; \
     --with-rootprefix="" -with-rootlibdir=/lib32 \
     --enable-split-usr --disable-gudev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 
diff --git a/BOOK/final-system/multilib/systemd.xml b/BOOK/final-system/multilib/systemd.xml
index ffe1007..3620b56 100644
--- a/BOOK/final-system/multilib/systemd.xml
+++ b/BOOK/final-system/multilib/systemd.xml
@@ -45,37 +45,17 @@
     href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make pam_systemd.la</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>make install-pamlibLTLIBRARIES</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

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

Summary of changes:
 BOOK/final-system/multilib/systemd-64bit.xml |    6 ++--
 BOOK/final-system/multilib/systemd-n32.xml   |   34 ++++----------------------
 BOOK/final-system/multilib/systemd.xml       |   26 ++-----------------
 3 files changed, 11 insertions(+), 55 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book