Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (10 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:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/ppc64/yaboot-build.xml

    rec008670 r229ed25  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../final-system/ppc/yaboot.xml"
     27    xpointer="xpointer(//*[@os='p3'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../final-system/ppc/yaboot.xml"
     31    xpointer="xpointer(//*[@os='p4'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/ppc/yaboot.xml"
     35    xpointer="xpointer(//*[@os='p5'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/ppc/yaboot.xml"
     39    xpointer="xpointer(//*[@os='p6'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2642    href="../ppc/yaboot-build.xml"
    2743    xpointer="xpointer(//*[@os='p1'])"/>
    … …  
    4359            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
    4460            -e 's/-o root -g root//' \
     61            -e 's/-Werror//' \
    4562    Makefile.orig &gt; Makefile</userinput></screen>
    4663
Note: See TracChangeset for help on using the changeset viewer.