Changeset 73ace20 for BOOK/boot/ppc64

Timestamp:

Oct 10, 2012, 6:42:21 PM (14 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (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' of git.cross-lfs.org:cross-lfs

Location:

BOOK/boot/ppc64

Files:

• e2fsprogs.xml (modified) (1 diff)
• util-linux-32.xml (added)
• yaboot-build.xml (modified) (1 diff)

BOOK/boot/ppc64/e2fsprogs.xml

@@ -68 +68 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs
+make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \
+    STATIC_LIBBLKID="-lblkid" LDFLAGS="-Wl,-rpath,/tools/lib64" -C e2fsck/</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    <para os="i">Install the e2fsck binary:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+<screen os="j"><userinput>make install -C e2fsck</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/ppc64/yaboot-build.xml

@@ -43 +43 @@
             -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
             -e 's/-o root -g root//' \
+            -e 's/-Werror//' \
     Makefile.orig &gt; Makefile</userinput></screen>