Changeset 03e6a40 for BOOK/boot/ppc/kernel.xml

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:

• BOOK/boot/ppc/kernel.xml (modified) (3 diffs)

BOOK/boot/ppc/kernel.xml

@@ -77 +77 @@
 
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -84 +84 @@
 
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -94 +94 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"