Changeset 03e6a40 for BOOK/boot/mips


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/mips
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/mips/bootloaders.xml

    r88ef769 r03e6a40  
    1818  netbooting can be found at the link below.</para>
    1919
    20   <para><ulink url="http://documents.jg555.com/netboot"/></para>
     20  <para><ulink url="&hints-root;Category:Netboot"/></para>
    2121
    2222</sect1>

  • BOOK/boot/mips/kernel.xml

    r88ef769 r03e6a40  
    7272
    7373<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
    74    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
     74   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
    7575
    7676    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    7979
    8080<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
    81    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     81   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
    8282
    8383    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    8989    xpointer="xpointer(//*[@os='v'])"/>
    9090
    91 <screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
    92 gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
     91<screen><userinput>cp -v vmlinux /tools/boot/vmlinux-&linux-version;
     92gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen>
    9393
    9494    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.