Changeset 03e6a40 for BOOK/boot/mips64

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/mips64

Files:

• createfiles.xml (modified) (1 diff)
• creatingdirs.xml (modified) (1 diff)
• kernel.xml (modified) (3 diffs)

BOOK/boot/mips64/createfiles.xml

@@ -15 +15 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
 ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
 ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
-ln -sv /tools/lib32/libstd*so* ${CLFS}/usr/lib32
-ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
+ln -sv /tools/lib32/libstdc++.so{.6,} ${CLFS}/usr/lib32
+ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
 ln -sv bash ${CLFS}/bin/sh
-ln -sv ../run ${CLFS}/var/run</userinput></screen>
+ln -sv ../run ${CLFS}/var/run
+ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
+ln -sv /tools/sbin/init ${CLFS}/sbin
+ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

BOOK/boot/mips64/creatingdirs.xml

@@ -25 +25 @@
 mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
 install -dv ${CLFS}/usr/lib/locale
 ln -sv ../lib/locale ${CLFS}/usr/lib32

BOOK/boot/mips64/kernel.xml

@@ -76 +76 @@
 
 <screen><userinput>make ARCH=mips 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"
@@ -83 +83 @@
 
 <screen><userinput>make ARCH=mips 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"
@@ -93 +93 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/vmlinux-&linux-version;
+gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"