[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-888-ge90b5e5

[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  e90b5e5b22d729a3edd3503123102a15398ec9b6 (commit)
      from  49288c7c249cc97405034a59ec9bd47575a93dcd (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 e90b5e5b22d729a3edd3503123102a15398ec9b6
Author: Chris Staub <chris at beaker67.com>
Date:   Wed Apr 30 18:38:15 2014 -0400

    Prevent kmod from trying to locate the bash-completion package on the host

diff --git a/BOOK/boot/64/kmod.xml b/BOOK/boot/64/kmod.xml
index 6db782a..b72f1de 100644
--- a/BOOK/boot/64/kmod.xml
+++ b/BOOK/boot/64/kmod.xml
@@ -34,9 +34,10 @@
     href="../../final-system/common/kmod.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib -llzma" \
-zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
-CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
+    liblzma_LIBS="-L/tools/lib -llzma" \
+    zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
+    CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/boot/common/kmod.xml b/BOOK/boot/common/kmod.xml
index 8c46470..283c8f6 100644
--- a/BOOK/boot/common/kmod.xml
+++ b/BOOK/boot/common/kmod.xml
@@ -32,9 +32,10 @@ sed '/dirname_default_prefix /s@/lib/modules@/tools&@' \
     href="../../final-system/common/kmod.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib -llzma" \
-zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
-./configure --prefix=/tools \
+<screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
+    liblzma_LIBS="-L/tools/lib -llzma" \
+    zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
+    ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
 
     <variablelist os="c">
diff --git a/BOOK/boot/multilib/kmod.xml b/BOOK/boot/multilib/kmod.xml
index 4de7e1b..bb4893f 100644
--- a/BOOK/boot/multilib/kmod.xml
+++ b/BOOK/boot/multilib/kmod.xml
@@ -34,9 +34,10 @@
     href="../../final-system/common/kmod.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib64 -llzma" \
-zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
-CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
+    liblzma_LIBS="-L/tools/lib64 -llzma" \
+    zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
+    CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
 
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 1cc2891..64a7a1b 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,18 @@
 -->
 
     <listitem>
+      <para>30 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added "PKG_CONFIG=" to boot section kmod commands,
+          otherwise it will use pkg-config to find the "bash-completion"
+          package and install stuff to that prefix if found. Thanks to boloco
+          in IRC for finding this.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>28 April 2014</para>
       <itemizedlist>
         <listitem>

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

Summary of changes:
 BOOK/boot/64/kmod.xml                  |    7 ++++---
 BOOK/boot/common/kmod.xml              |    7 ++++---
 BOOK/boot/multilib/kmod.xml            |    7 ++++---
 BOOK/introduction/common/changelog.xml |   12 ++++++++++++
 4 files changed, 24 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book