Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/multilib/grub-build.xml

    r88ef769 r03e6a40  
    4141<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    4242    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    43     --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
     43    --libdir=/tools/lib64 --disable-werror \
     44    --enable-grub-mkfont=no</userinput></screen>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../x86/grub-build.xml"
     48    xpointer="xpointer(//*[@os='b'])"/>
     49
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     51    href="../x86/grub-build.xml"
     52    xpointer="xpointer(//*[@os='bc'])"/>
    4453
    4554    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5564    xpointer="xpointer(//*[@os='f'])"/>
    5665
    57 <screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     66    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     67    href="../x86/grub-build.xml"
     68    xpointer="xpointer(//*[@os='ag'])"/>
    5869
    5970  </sect2>
Note: See TracChangeset for help on using the changeset viewer.