[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 01629953ea80c730e967762fc830bf0b50a9be5e

[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  01629953ea80c730e967762fc830bf0b50a9be5e (commit)
       via  02ac3c73b95108e24a9e78651fa7e4330226b988 (commit)
      from  b80b685c711c2d0a89dc61d90b40f8f530213175 (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 01629953ea80c730e967762fc830bf0b50a9be5e
Author: Joe Ciccone <jciccone at gmail.com>
Date:   Sun Feb 13 14:07:51 2011 -0500

    Fix compilation issues w/ e2fsprogs in the boot section.

diff --git a/BOOK/boot/64/e2fsprogs.xml b/BOOK/boot/64/e2fsprogs.xml
index d3c166c..34b034f 100644
--- a/BOOK/boot/64/e2fsprogs.xml
+++ b/BOOK/boot/64/e2fsprogs.xml
@@ -34,9 +34,12 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
+  CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+    ../configure --prefix=/tools --enable-elf-shlibs \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-libblkid --disable-libuuid --disable-fsck \
+    --disable-uuidd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
diff --git a/BOOK/boot/common/e2fsprogs.xml b/BOOK/boot/common/e2fsprogs.xml
index fe310ba..c05e4ec 100644
--- a/BOOK/boot/common/e2fsprogs.xml
+++ b/BOOK/boot/common/e2fsprogs.xml
@@ -53,9 +53,8 @@
     href="../../final-system/common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/e2fsprogs.xml"

commit 02ac3c73b95108e24a9e78651fa7e4330226b988
Author: Joe Ciccone <jciccone at gmail.com>
Date:   Sun Feb 13 09:05:49 2011 -0500

    Update Date.

diff --git a/BOOK/general.ent b/BOOK/general.ent
index b65ac54..a9477d5 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
 
 <!ENTITY month "02"> <!-- Use two digits -->
 <!ENTITY month_name "Feburary">
-<!ENTITY day "12"> <!-- Use two digits -->
+<!ENTITY day "13"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">

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

Summary of changes:
 BOOK/boot/64/e2fsprogs.xml     |    9 ++++++---
 BOOK/boot/common/e2fsprogs.xml |    5 ++---
 BOOK/general.ent               |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book