Index: BOOK/boot/common/whatnext.xml
===================================================================
--- BOOK/boot/common/whatnext.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/common/whatnext.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -23,8 +23,12 @@
Boot Methods
-
-
-
-
+
+
+
+
+
+
+
+
@@ -34,4 +38,5 @@
+
@@ -41,5 +46,7 @@
+
+
Index: BOOK/boot/mips64/flags.xml
===================================================================
--- BOOK/boot/mips64/flags.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/mips64/flags.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -16,5 +16,6 @@
echo export BUILDN32=\""${BUILDN32}\"" >> ${CLFS}/root/.bash_profile
echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> \
+ ${CLFS}/root/.bash_profile
Index: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/multilib/e2fsprogs.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -43,6 +43,6 @@
CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
---enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" --with-linker=${LD} \
---host=${CLFS_TARGET}
+ --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" \
+ --with-linker=${LD} --host=${CLFS_TARGET}
CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
---enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" --with-linker=${LD} \
---build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache
+ --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" \
+ --with-linker=${LD} --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --cache-file=config.cache
echo export BUILD32=\""${BUILD32}\"" >> ${CLFS}/root/.bash_profile
echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> \
+ ${CLFS}/root/.bash_profile
Index: BOOK/boot/x86_64/flags.xml
===================================================================
--- BOOK/boot/x86_64/flags.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/x86_64/flags.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -15,5 +15,6 @@
echo export BUILD32=\""${BUILD32}\"" >> ${CLFS}/root/.bash_profile
echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> \
+ ${CLFS}/root/.bash_profile
Index: BOOK/bootable/ppc/yaboot.xml
===================================================================
--- BOOK/bootable/ppc/yaboot.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/bootable/ppc/yaboot.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -59,13 +59,13 @@
way. At least some of the distros specify a full OF path to the 'device' and
to the image(s), such as
- device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:
- for the disk, and
- image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;
- which definitely works.
+ device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:
+ for the disk, and
+ image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;
+ which definitely works.
Create a yaboot.conf
file defining yaboot's boot
menu:
-cat > /etc/yaboot.conf << "EOF"
+cat > /etc/yaboot.conf << "EOF"
# Begin /etc/yaboot.conf
@@ -89,5 +89,5 @@
root=/dev/hda7
-# where ybin is to find yaboot and ofboot
+# where ybin is to find yaboot and ofboot
install=/usr/lib/yaboot/yaboot
magicboot=/usr/lib/yaboot/ofboot
Index: BOOK/bootscripts/common/inputrc.xml
===================================================================
--- BOOK/bootscripts/common/inputrc.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/bootscripts/common/inputrc.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -37,5 +37,5 @@
using the following command:
-cat > /etc/inputrc << "EOF"
+cat > /etc/inputrc << "EOF"
# Begin /etc/inputrc
# Modified by Chris Lynn <roryo@roryo.dynup.net>
Index: BOOK/cross-tools/alpha/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc-headers.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/alpha/glibc-headers.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -27,5 +27,5 @@
because this only installs the headers, no compiling takes place. In the
next Glibc installation, we use the GCC that's built right after this section:
-
+
cp -v configure{,.orig}
sed -e 's/3.4/3.[0-9]/g' configure.orig > configure
@@ -65,5 +65,5 @@
The meaning of the configure options:
-
+
CC=gcc
@@ -72,5 +72,5 @@
-
+
--prefix=/tools
@@ -81,5 +81,5 @@
-
+
--build=${CLFS_HOST}
@@ -89,5 +89,5 @@
-
+
--host=${CLFS_TARGET}
@@ -97,5 +97,5 @@
-
+
--disable-sanity-checks
@@ -104,5 +104,5 @@
-
+
--enable-kernel=2.6.0
@@ -112,5 +112,5 @@
-
+
--with-headers=/tools/include
@@ -122,5 +122,5 @@
-
+
--with-binutils=/cross-tools/${CLFS_TARGET}/bin
@@ -129,7 +129,7 @@
-
+
-
+
Now, install the headers:
@@ -139,5 +139,5 @@
we will copy the additional header files we need.
- First we will copy a common file over to First we will copy a common file over to /tools/include:
@@ -150,6 +150,7 @@
Another header is needed for NPTL:
-
-cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h /tools/include/bits/
+
+cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
+ /tools/include/bits/
Index: BOOK/cross-tools/alpha/variables.xml
===================================================================
--- BOOK/cross-tools/alpha/variables.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/alpha/variables.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -45,7 +45,11 @@
Processor Type and Target Triplets
-
-
-
+
+
+
+
+
+
+
@@ -54,4 +58,5 @@
+
@@ -88,5 +93,7 @@
+
+
Index: BOOK/cross-tools/sparc64-64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/flags.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/sparc64-64/flags.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -14,6 +14,6 @@
xpointer="xpointer(//*[@os='a'])"/>
-export BUILD64="[BUILD64 entries]"
-export GCCTARGET="[GCCTARGET entries]"
+export BUILD64="[BUILD64 entries]"
+export GCCTARGET="[GCCTARGET entries]"
List of architectures, target triplets, and recommended book
-
-
-
-
+
+
+
+
+
+
+
+
@@ -41,4 +45,5 @@
+
@@ -53,5 +58,7 @@
+
+
Index: BOOK/cross-tools/sparc64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64/flags.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/sparc64/flags.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -14,7 +14,7 @@
from the table at the bottom of the page.
-export BUILD32="[BUILD32 entries]"
-export BUILD64="[BUILD64 entries]"
-export GCCTARGET="[GCCTARGET entries]"
+export BUILD32="[BUILD32 entries]"
+export BUILD64="[BUILD64 entries]"
+export GCCTARGET="[GCCTARGET entries]"
List of 32-Bit settings, 64-Bit Build settings, and GCC setting
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -46,4 +50,5 @@
+
@@ -60,5 +65,7 @@
+
+
Index: BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-final.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/x86/gcc-final.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -67,5 +67,6 @@
cp -v configure{,.orig}
-sed -e '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig >configure
+sed -e '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig > \
+ configure
-export CLFS_HOST="$(echo $MACHTYPE | sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"
+export CLFS_HOST="$(echo $MACHTYPE | \
+ sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"
Now you will need to set the triplet for the target
@@ -42,7 +43,11 @@
Processor Type and Target Triplets
-
-
-
+
+
+
+
+
+
+
@@ -51,4 +56,5 @@
+
@@ -73,5 +79,7 @@
+
+
Index: BOOK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-final.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/x86_64/gcc-final.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -68,5 +68,6 @@
cp -v configure{,.orig}
-sed -e '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig >configure
+sed -e '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig > \
+ configure
- m4
+
+ m4
copies the given files while expanding the macros that they
Index: BOOK/final-system/multilib/shadow-64bit.xml
===================================================================
--- BOOK/final-system/multilib/shadow-64bit.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/final-system/multilib/shadow-64bit.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -41,7 +41,7 @@
to make sure the correct library is linked:
- sed -i libtool \
- -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g' \
- -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g'
+sed -i libtool \
+ -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g' \
+ -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g'
Index: BOOK/final-system/multilib/shadow-n32.xml
===================================================================
--- BOOK/final-system/multilib/shadow-n32.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/final-system/multilib/shadow-n32.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -41,7 +41,7 @@
to make sure the correct library is linked.
- sed -i libtool \
- -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g' \
- -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g'
+sed -i libtool \
+ -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g' \
+ -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g'
Index: BOOK/final-system/multilib/temp-perl.xml
===================================================================
--- BOOK/final-system/multilib/temp-perl.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/final-system/multilib/temp-perl.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -43,5 +43,6 @@
xpointer="xpointer(//*[@os='c'])"/>
-./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc ${BUILD32}"
+./configure.gnu --prefix=/tools \
+ -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc ${BUILD32}"
make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
- EXTRAS="extras/cdrom_id extras/floppy extras/firmware extras/scsi_id extras/volume_id \
- extras/ata_id extras/usb_id extras/edd_id extras/dasd_id extras/path_id"
+ EXTRAS="extras/cdrom_id extras/floppy extras/firmware extras/scsi_id \
+ extras/volume_id extras/ata_id extras/usb_id extras/edd_id \
+ extras/dasd_id extras/path_id"
-configure: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used.
+configure: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used.
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/temp-system/mips64-64/gcc.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -91,6 +91,6 @@
--build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
--with-local-prefix=/tools --enable-long-long --with-abi=64 \
- --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
- --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch
+ --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
+ --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml (revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/temp-system/mips64/gcc.xml (revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -89,8 +89,8 @@
CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} --with-abi=64 \
- --with-local-prefix=/tools --enable-long-long --enable-c99 \
- --enable-shared --enable-threads=posix --enable-__cxa_atexit \
- --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
+ --with-abi=64 --with-local-prefix=/tools --enable-long-long \
+ --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
+ --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch
-uname -a | grep '^Linux.*2\.6\..*ppc64' && echo "ok to chroot" || echo "you must boot"
+uname -a | grep '^Linux.*2\.6\..*ppc64' && \
+ echo "ok to chroot" || echo "you must boot"
+ --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
+ --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch