[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-707-g8fdd4fb

[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  8fdd4fb1f18a8d9715c4edf4923a7a21fdd09544 (commit)
       via  14922bb2b04ee30ef2c1de2807b4bee110851d40 (commit)
      from  f1283d8a887c83d8f113a81abf7c88be47599c1f (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 8fdd4fb1f18a8d9715c4edf4923a7a21fdd09544
Merge: 14922bb f1283d8
Author: Chris Staub <chris at beaker67.com>
Date:   Sat Apr 12 00:18:32 2014 -0400

    Merge branch 'systemd' of git.cross-lfs.org:cross-lfs into systemd


commit 14922bb2b04ee30ef2c1de2807b4bee110851d40
Author: Chris Staub <chris at beaker67.com>
Date:   Sat Apr 12 00:18:17 2014 -0400

    Disable installation of grub-mkfont

diff --git a/BOOK/boot/64/grub-build.xml b/BOOK/boot/64/grub-build.xml
index b7a28b8..1685c4b 100644
--- a/BOOK/boot/64/grub-build.xml
+++ b/BOOK/boot/64/grub-build.xml
@@ -40,7 +40,15 @@
 
 <screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
+    --sysconfdir=/etc --disable-werror --enable-grub-mkfont=no</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/x86/grub.xml"
diff --git a/BOOK/boot/multilib/grub-build.xml b/BOOK/boot/multilib/grub-build.xml
index b7a28b8..5162d36 100644
--- a/BOOK/boot/multilib/grub-build.xml
+++ b/BOOK/boot/multilib/grub-build.xml
@@ -40,7 +40,16 @@
 
 <screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
+    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror \
+    --enable-grub-mkfont=no</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/x86/grub.xml"
diff --git a/BOOK/boot/x86/grub-build.xml b/BOOK/boot/x86/grub-build.xml
index ca0dfaa..01a6636 100644
--- a/BOOK/boot/x86/grub-build.xml
+++ b/BOOK/boot/x86/grub-build.xml
@@ -40,7 +40,18 @@
 
 <screen os="ab"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --sysconfdir=/etc --disable-werror</userinput></screen>
+    --sysconfdir=/etc --disable-werror --enable-grub-mkfont=no</userinput></screen>
+
+<para os="b">The meaning of the new configure option:</para>
+
+  <variablelist os="bc">
+    <varlistentry>
+      <term><parameter>--enable-grub-mkfont=no</parameter></term>
+      <listitem><para>Prevents GRUB from trying to build
+      <command>grub-mkfont</command>, which requires Freetype.</para></listitem>
+    </varlistentry>
+
+  </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/x86/grub.xml"
diff --git a/BOOK/introduction/x86/changelog.xml b/BOOK/introduction/x86/changelog.xml
index 4b6122b..17827b1 100644
--- a/BOOK/introduction/x86/changelog.xml
+++ b/BOOK/introduction/x86/changelog.xml
@@ -32,6 +32,16 @@
 
 -->
     <listitem>
+      <para>11 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Prevent GRUB from trying to build mkfont, to avoid
+          linking to host system libraries.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>24 October 2013</para>
       <itemizedlist>
         <listitem>

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

Summary of changes:
 BOOK/boot/64/grub-build.xml         |   10 +++++++++-
 BOOK/boot/multilib/grub-build.xml   |   11 ++++++++++-
 BOOK/boot/x86/grub-build.xml        |   13 ++++++++++++-
 BOOK/introduction/x86/changelog.xml |   10 ++++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book