Changeset 73ace20 for BOOK/boot


Ignore:
Timestamp:
Oct 10, 2012, 6:42:21 PM (13 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f7b2c72
Parents:
0cce40d (diff), 80cbd64 (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 'master' of git.cross-lfs.org:cross-lfs

Location:
BOOK/boot
Files:
12 added
2 deleted
32 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/64/createfiles.xml

    r0cce40d r73ace20  
    1818  the next chapter after the software has been installed.</para>
    1919
    20 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,sleep,stty} ${CLFS}/bin
     20<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
    2121ln -sv /tools/bin/file ${CLFS}/usr/bin
     22ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
    2223ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    2324ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
    24 ln -sv bash ${CLFS}/bin/sh</userinput></screen>
     25ln -sv bash ${CLFS}/bin/sh
     26ln -sv ../run ${CLFS}/var/run</userinput></screen>
    2527
    2628  <para os="b">To enable some c++ tests in the Glibc and Binutils testsuites

  • BOOK/boot/64/udev.xml

    r0cce40d r73ace20  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" ./configure --prefix=/usr \
    30     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
    32     --libdir=/usr/lib --disable-extras --disable-introspection</userinput></screen>
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" \
     30    BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib64 -lblkid" \
     31    KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
     32    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     33    --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc --libdir=/usr/lib64 \
     34    --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
     35    --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
     36    --with-firmware-path=/lib/firmware</userinput></screen>
    3337
    3438    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/64/util-linux.xml

    r0cce40d r73ace20  
    2222  <sect2 role="installation">
    2323    <title>Installation of Util-linux</title>
     24   
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../chroot/common/util-linux.xml"
     27    xpointer="xpointer(//*[@os='f1'])"/>
     28   
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../chroot/common/util-linux.xml"
     31    xpointer="xpointer(//*[@os='f2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    3038  ./configure --prefix=/tools --exec-prefix=/tools \
    3139    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    32     --enable-login-utils --disable-makeinstall-chown</userinput></screen>
     40    --disable-makeinstall-chown --config-cache</userinput></screen>
    3341
    3442    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/alpha-chapter.xml

    r0cce40d r73ace20  
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     19 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>

  • BOOK/boot/common/createfiles.xml

    r0cce40d r73ace20  
    1616  the next chapter after the software has been installed.</para>
    1717
    18 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,sleep,stty} ${CLFS}/bin
     18<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
    1919ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
    2020ln -sv /tools/bin/file ${CLFS}/usr/bin
    2121ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    2222ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
    23 ln -sv bash ${CLFS}/bin/sh</userinput></screen>
     23ln -sv bash ${CLFS}/bin/sh
     24ln -sv ../run ${CLFS}/var/run</userinput></screen>
    2425
    2526</sect1>

  • BOOK/boot/common/creatingdirs.xml

    r0cce40d r73ace20  
    1515
    1616<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt}
    17 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys}
    18 mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
     17mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
     18mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
    1919mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
    2020install -dv -m 0750 ${CLFS}/root

  • BOOK/boot/common/fstab.xml

    r0cce40d r73ace20  
    3232devpts         /dev/pts     devpts gid=&gid-tty;,mode=620   0     0
    3333shm            /dev/shm     tmpfs  defaults         0     0
     34tmpfs          /run            tmpfs       defaults         0     0
     35devtmpfs       /dev            devtmpfs    mode=0755,nosuid 0     0
    3436# End /etc/fstab</literal>
    3537EOF</userinput></screen>

  • BOOK/boot/common/udev.xml

    r0cce40d r73ace20  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>LIBS="-lpthread" ./configure --prefix=/usr \
    30     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --exec-prefix="" --sysconfdir=/etc \
    32     --libexecdir=/lib/udev --libdir=/usr/lib \
    33     --disable-extras --disable-introspection</userinput></screen>
     29<screen os="b"><userinput>LIBS="-lpthread" \
     30    BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib -lblkid" \
     31    KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib -lkmod" \
     32    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     33    --with-rootprefix=$CLFS --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
     34    --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
     35    --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
     36    --with-firmware-path=/lib/firmware</userinput></screen>
    3437
    3538    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4750<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
    4851
     52    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     53    href="../../final-system/common/udev.xml"
     54    xpointer="xpointer(//*[@os='i'])"/>
     55
     56<screen os="k"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
     57
    4958  </sect2>
    5059

  • BOOK/boot/common/util-linux.xml

    r0cce40d r73ace20  
    2222  <sect2 role="installation">
    2323    <title>Installation of Util-linux</title>
     24   
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../chroot/common/util-linux.xml"
     27    xpointer="xpointer(//*[@os='f1'])"/>
     28   
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../chroot/common/util-linux.xml"
     31    xpointer="xpointer(//*[@os='f2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    3038  ./configure --prefix=/tools --exec-prefix=/tools \
    3139    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    32     --enable-login-utils --disable-makeinstall-chown</userinput></screen>
     40    --disable-makeinstall-chown --config-cache</userinput></screen>
    3341
    3442    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/mips-chapter.xml

    r0cce40d r73ace20  
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     20 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
    2324  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>

  • BOOK/boot/mips64-64-chapter.xml

    r0cce40d r73ace20  
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
     19 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
     20 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
    22   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/udev.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/udev.xml"/>
    2324  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
    2425  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>

  • BOOK/boot/mips64-chapter.xml

    r0cce40d r73ace20  
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
     20 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
    2324  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>

  • BOOK/boot/mips64/createfiles.xml

    r0cce40d r73ace20  
    1515  xpointer="xpointer(//*[@os='a'])"/>
    1616
    17 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,sleep,stty} ${CLFS}/bin
     17<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
    1818ln -sv /tools/bin/file ${CLFS}/usr/bin
     19ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
    1920ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    2021ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
    … …  
    2324ln -sv /tools/lib32/libstd*so* ${CLFS}/usr/lib32
    2425ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
    25 ln -sv bash ${CLFS}/bin/sh</userinput></screen>
     26ln -sv bash ${CLFS}/bin/sh
     27ln -sv ../run ${CLFS}/var/run</userinput></screen>
    2628
    2729</sect1>

  • BOOK/boot/mips64/creatingdirs.xml

    r0cce40d r73ace20  
    1616
    1717<screen><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
    18 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys}
    19 mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
     18mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{shm},sbin,srv,sys}
     19mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
    2020mkdir -pv ${CLFS}/var/{opt,cache,lib{,32,64}/{misc,locate},local}
    2121install -dv ${CLFS}/root -m 0750

  • BOOK/boot/multilib/createfiles.xml

    r0cce40d r73ace20  
    1515  xpointer="xpointer(//*[@os='a'])"/>
    1616
    17 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,sleep,stty} ${CLFS}/bin
     17<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
    1818ln -sv /tools/bin/file ${CLFS}/usr/bin
     19ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
    1920ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    2021ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
    2122ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
    2223ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
    23 ln -sv bash ${CLFS}/bin/sh</userinput></screen>
     24ln -sv bash ${CLFS}/bin/sh
     25ln -sv ../run ${CLFS}/var/run</userinput></screen>
    2426
    2527</sect1>

  • BOOK/boot/multilib/creatingdirs.xml

    r0cce40d r73ace20  
    1616
    1717<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
    18 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys}
    19 mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
     18mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
     19mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
    2020mkdir -pv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
    2121install -dv ${CLFS}/root -m 0750

  • BOOK/boot/multilib/e2fsprogs.xml

    r0cce40d r73ace20  
    5555    xpointer="xpointer(//*[@os='f'])"/>
    5656
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../common/e2fsprogs.xml"
    59     xpointer="xpointer(//*[@os='g'])"/>
     57<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
     58    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
     59    LDFLAGS="-Wl,-rpath,/tools/lib64"</userinput></screen>
    6060
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/multilib/udev.xml

    r0cce40d r73ace20  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" ./configure --prefix=/usr \
    30     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
    32     --libdir=/usr/lib64 --disable-extras --disable-introspection</userinput></screen>
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" \
     30    BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib64 -lblkid" \
     31    KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
     32    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     33    --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
     34    --libdir=/usr/lib64 --disable-introspection \
     35    --with-usb-ids-path=no --with-pci-ids-path=no \
     36    --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
     37    --with-firmware-path=/lib/firmware</userinput></screen>
    3338
    3439    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/multilib/util-linux.xml

    r0cce40d r73ace20  
    2222  <sect2 role="installation">
    2323    <title>Installation of Util-linux</title>
     24   
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../chroot/common/util-linux.xml"
     27    xpointer="xpointer(//*[@os='f1'])"/>
     28   
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../chroot/common/util-linux.xml"
     31    xpointer="xpointer(//*[@os='f2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    3139    --prefix=/tools --exec-prefix=/tools \
    3240    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    33     --libdir=/tools/lib64 --enable-login-utils \
    34     --disable-makeinstall-chown</userinput></screen>
     41    --libdir=/tools/lib64 --disable-makeinstall-chown --config-cache</userinput></screen>
    3542
    3643    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc-chapter.xml

    r0cce40d r73ace20  
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     19 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>

  • BOOK/boot/ppc/yaboot-build.xml

    r0cce40d r73ace20  
    3333    loader. It also tries to change user and group ownership for the installed
    3434    files to <systemitem class="username">root</systemitem>, which the
    35     <systemitem class="username">clfs</systemitem> user cannot do. The following
    36     command fixes both issues:</para>
     35    <systemitem class="username">clfs</systemitem> user cannot do. It will also
     36    fail due to a compile warning with the -Werror flag on.   The following
     37    command fixes these issues:</para>
    3738
    3839<screen><userinput>cp -v Makefile{,.orig}
    3940sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
    4041    -e 's/-o root -g root//' \
     42    -e 's/-Werror//' \
    4143    Makefile.orig &gt; Makefile</userinput></screen>
    4244

  • BOOK/boot/ppc64-chapter.xml

    r0cce40d r73ace20  
    1515  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
     17  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/util-linux-32.xml"/>
    1718  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
    1820  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
    1921  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
    2022  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
    2224  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
    2325  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
    … …  
    2729  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot-build.xml"/>
    2830  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
     31  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
    2932  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
    3033  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>

  • BOOK/boot/ppc64/e2fsprogs.xml

    r0cce40d r73ace20  
    6868    xpointer="xpointer(//*[@os='f'])"/>
    6969
    70     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    71     href="../64/e2fsprogs.xml"
    72     xpointer="xpointer(//*[@os='g'])"/>
     70<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
     71    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs
     72make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \
     73    STATIC_LIBBLKID="-lblkid" LDFLAGS="-Wl,-rpath,/tools/lib64" -C e2fsck/</userinput></screen>
    7374
    74     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    75     href="../common/e2fsprogs.xml"
    76     xpointer="xpointer(//*[@os='i'])"/>
     75    <para os="i">Install the e2fsck binary:</para>
    7776
    78     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    79     href="../common/e2fsprogs.xml"
    80     xpointer="xpointer(//*[@os='j'])"/>
     77<screen os="j"><userinput>make install -C e2fsck</userinput></screen>
    8178
    8279    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc64/yaboot-build.xml

    r0cce40d r73ace20  
    4343            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
    4444            -e 's/-o root -g root//' \
     45            -e 's/-Werror//' \
    4546    Makefile.orig &gt; Makefile</userinput></screen>
    4647

  • BOOK/boot/sparc-chapter.xml

    r0cce40d r73ace20  
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     19 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>

  • BOOK/boot/sparc/fstab.xml

    r0cce40d r73ace20  
    3131devpts         /dev/pts        devpts      gid=4,mode=620   0     0
    3232shm            /dev/shm        tmpfs       defaults         0     0
     33tmpfs          /run            tmpfs       defaults         0     0
     34devtmpfs       /dev            devtmpfs    mode=0755,nosuid 0     0
    3335none           /proc/openprom  openpromfs  defaults         0     0
    3436# End /etc/fstab</literal>

  • BOOK/boot/sparc64-64-chapter.xml

    r0cce40d r73ace20  
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
     19 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/udev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/udev.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
    2324  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>

  • BOOK/boot/sparc64-chapter.xml

    r0cce40d r73ace20  
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
     19 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>

  • BOOK/boot/x86-chapter.xml

    r0cce40d r73ace20  
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    1819  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>

  • BOOK/boot/x86/grub-build.xml

    r0cce40d r73ace20  
    2727    xpointer="xpointer(//*[@os='n1'])"/>
    2828
    29 <note>
    30   <para>Grub2 requires Flex 3.5.35 or greater which has not been installed
    31    yet. If your host does not have Flex then install it now via the
    32    distro's package manager.</para>
    33 </note>
    34 
    3529    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3630    href="../../final-system/x86/grub.xml"
    3731    xpointer="xpointer(//*[@os='a'])"/>
    3832
    39 <screen os="ab"><userinput>./configure --prefix=/usr \
     33<screen os="ab"><userinput>./configure --prefix=/tools \
    4034    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4135    --sysconfdir=/etc --disable-werror</userinput></screen>

  • BOOK/boot/x86_64-64-chapter.xml

    r0cce40d r73ace20  
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
     19 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/udev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/udev.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
    2324  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
    24   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
     25  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
    2526  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
    2627  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>

  • BOOK/boot/x86_64-chapter.xml

    r0cce40d r73ace20  
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
     19 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
    2223  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
    2324  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
    24   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
     25  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
    2526  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
    2627  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
Note: See TracChangeset for help on using the changeset viewer.