[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 5b6948aefec71978ba948960894e6d795ff54752

[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  5b6948aefec71978ba948960894e6d795ff54752 (commit)
      from  35e7499393d6a5d5b81b95549e6275f61efe7325 (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 5b6948aefec71978ba948960894e6d795ff54752
Author: Jonathan Norman <jon at cosmo1847.co.uk>
Date:   Wed Feb 29 12:13:51 2012 +0000

    Fixed issue with e2fsprogs multilib boot method

diff --git a/BOOK/boot/multilib/e2fsprogs.xml b/BOOK/boot/multilib/e2fsprogs.xml
index 2d03856..1a3d997 100644
--- a/BOOK/boot/multilib/e2fsprogs.xml
+++ b/BOOK/boot/multilib/e2fsprogs.xml
@@ -54,9 +54,9 @@ sed -e "/libdir=.*\/lib/s@/lib@/lib64 at g" configure.orig > configure</userinpu
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
+    LDFLAGS="-Wl,-rpath,/tools/lib64"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/e2fsprogs.xml"
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 35d9538..c162763 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
 
 <!ENTITY month "02"> <!-- Use two digits -->
 <!ENTITY month_name "Febuary">
-<!ENTITY day "20"> <!-- Use two digits -->
+<!ENTITY day "29"> <!-- Use two digits -->
 <!ENTITY year "2012"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 7821099..1207eba 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
 -->
 
     <listitem>
+      <para>29 February 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Fixed issue with mutlilib e2fsprogs boot method.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>20 February 2012</para>
       <itemizedlist>
         <listitem>

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

Summary of changes:
 BOOK/boot/multilib/e2fsprogs.xml       |    6 +++---
 BOOK/general.ent                       |    2 +-
 BOOK/introduction/common/changelog.xml |    9 +++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book