Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/64/binutils.xml

    rec008670 r229ed25  
    2323    <title>Installation of Binutils</title>
    2424
     25<!-- Branch update patch area
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     27    href="../../final-system/common/binutils.xml"
     28    xpointer="xpointer(//*[@os='p1'])"/>
     29
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../../final-system/common/binutils.xml"
     32    xpointer="xpointer(//*[@os='p2'])"/>
     33-->
    2534    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2635    href="../common/binutils.xml"
    … …  
    3544    xpointer="xpointer(//*[@os='i'])"/>
    3645
    37 <screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-version;/configure \
     46<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
    3847    --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    3948    --target=${CLFS_TARGET} --with-lib-path=/tools/lib --disable-nls \
Note: See TracChangeset for help on using the changeset viewer.