Changeset 03e6a40 for BOOK/boot/ppc64


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

Location:
BOOK/boot/ppc64
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/ppc64/e2fsprogs.xml

    r88ef769 r03e6a40  
    8585    xpointer="xpointer(//*[@os='l'])"/>
    8686
    87     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    88     href="../common/e2fsprogs.xml"
    89     xpointer="xpointer(//*[@os='ad'])"/>
    90 
    91     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    92     href="../common/e2fsprogs.xml"
    93     xpointer="xpointer(//*[@os='ae'])"/>
    94 
    9587  </sect2>
    9688

  • BOOK/boot/ppc64/kernel.xml

    r88ef769 r03e6a40  
    7676
    7777<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
    78    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
     78   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
    7979
    8080    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    8383
    8484<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
    85    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     85   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
    8686
    8787    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    9393    xpointer="xpointer(//*[@os='v'])"/>
    9494
    95 <screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
     95<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
    9696
    9797    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.