Changeset af0fe7f for BOOK/boot

Timestamp:

Feb 13, 2011, 11:08:22 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

d89bf75

Parents:

8050e8b (diff), 0162995 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Location:

BOOK/boot

Files:

• 64/e2fsprogs.xml (modified) (1 diff)
• common/e2fsprogs.xml (modified) (1 diff)

BOOK/boot/64/e2fsprogs.xml

@@ -35 +35 @@
     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"

BOOK/boot/common/e2fsprogs.xml

@@ -54 +54 @@
     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"