Changeset 229ed25 for BOOK/final-system/ppc/yaboot.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/final-system/ppc/yaboot.xml (modified) (2 diffs)

BOOK/final-system/ppc/yaboot.xml

@@ -26 +26 @@
     <title>Installation of Yaboot</title>
 
+    <para os="p3">The following patch adds stub functions for newer e2fsprogs releases:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&yaboot-stubfuncs-patch;</userinput></screen>
+
+    <para os="p5">The following patch adds Parted support to yabootconfig:</para>
+
+<screen os="p6"><userinput>patch -Np1 -i ../&yaboot-parted-patch;</userinput></screen>
+
     <para os="a">The supplied man pages have <filename
     class="directory">/usr/local</filename> in the text. This sed will correct
@@ -31 +39 @@
 
 <screen os="b"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
+
+    <para os="aa"> Prevent the build from failing due to warnings with
+    the following sed:</para>
+
+<screen os="ba"><userinput>sed -i 's%-Werror%%' Makefile</userinput></screen>
 
     <para os="c">Compile the package:</para>