Changeset 229ed25 for BOOK/boot


Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

Location:
BOOK/boot
Files:
13 added
5 deleted
42 edited
4 moved

Legend:

Unmodified
Added
Removed

  • BOOK/boot/64/createfiles.xml

    rec008670 r229ed25  
    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/grub-build.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-temp-system-ppl" role="wrap">
    9   <?dbhtml filename="ppl.html"?>
     8<sect1 id="ch-boot-grub-build" role="wrap">
     9  <?dbhtml filename="grub-build.html"?>
    1010
    11   <title>PPL-&ppl-version;</title>
     11  <title>GRUB-&grub-version;</title>
    1212
    13   <indexterm zone="ch-temp-system-ppl">
    14     <primary sortas="a-PPL">PPL</primary>
    15     <secondary>temporary system</secondary>
     13  <indexterm zone="ch-boot-grub-build">
     14    <primary sortas="a-GRUB">GRUB</primary>
     15    <secondary>boot</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/ppl.xml"
     19  href="../../final-system/x86/grub.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of PPL</title>
     23    <title>Installation of GRUB</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
     26    href="../../final-system/x86/grub.xml"
     27    xpointer="xpointer(//*[@os='n1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../final-system/x86/grub.xml"
     31    xpointer="xpointer(//*[@os='s1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/x86/grub.xml"
     35    xpointer="xpointer(//*[@os='s2'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/x86/grub.xml"
    2739    xpointer="xpointer(//*[@os='a'])"/>
    2840
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     41<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    3042    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --enable-interfaces="c,cxx" --enable-shared \
    32     --disable-optimization --with-libgmp-prefix=/tools \
    33     --with-libgmpxx-prefix=/tools</userinput></screen>
     43    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
    3444
    3545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/ppl.xml"
    37     xpointer="xpointer(//*[@os='bp1'])"/>
    38 
    39     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/ppl.xml"
    41     xpointer="xpointer(//*[@os='bp2'])"/>
    42 
    43     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/ppl.xml"
     46    href="../../final-system/x86/grub.xml"
    4547    xpointer="xpointer(//*[@os='c'])"/>
    4648
    4749    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/ppl.xml"
     50    href="../../final-system/x86/grub.xml"
    4951    xpointer="xpointer(//*[@os='d'])"/>
    50        
    51     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/ppl.xml"
    53     xpointer="xpointer(//*[@os='e'])"/>
    5452
    5553    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/ppl.xml"
     54    href="../../final-system/x86/grub.xml"
    5755    xpointer="xpointer(//*[@os='f'])"/>
     56
     57<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
    5858
    5959  </sect2>
    … …  
    6363
    6464    <para>Details on this package are located in <xref
    65     linkend="contents-ppl" role="."/></para>
     65    linkend="contents-grub" role="."/></para>
    6666
    6767  </sect2>

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

    rec008670 r229ed25  
    2222  <sect2 role="installation">
    2323    <title>Installation of Util-linux</title>
    24 
     24   
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= \
    3030  ./configure --prefix=/tools --exec-prefix=/tools \
    3131    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    32     --enable-login-utils --disable-makeinstall-chown</userinput></screen>
     32    --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
    3333
    3434    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/alpha-chapter.xml

    rec008670 r229ed25  
    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/udev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.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="alpha/kernel.xml"/>

  • BOOK/boot/alpha/kernel.xml

    rec008670 r229ed25  
    8383
    8484    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     85    href="../../bootable/x86/kernel.xml"
     86    xpointer="xpointer(//*[@os='s2'])"/>
     87
     88<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
     89   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     90
     91    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8592    href="../x86/kernel.xml"
    8693    xpointer="xpointer(//*[@os='u'])"/>

  • BOOK/boot/common/createfiles.xml

    rec008670 r229ed25  
    1616  the next chapter after the software has been installed.</para>
    1717
    18 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,sleep,stty} ${CLFS}/bin
     18<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
     19ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
    1920ln -sv /tools/bin/file ${CLFS}/usr/bin
    2021ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    2122ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
    22 ln -sv bash ${CLFS}/bin/sh</userinput></screen>
     23ln -sv bash ${CLFS}/bin/sh
     24ln -sv /run ${CLFS}/var/run</userinput></screen>
    2325
    2426</sect1>

  • BOOK/boot/common/creatingdirs.xml

    rec008670 r229ed25  
    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/devices.xml

    rec008670 r229ed25  
    2020    <note os="a">
    2121      <para>The commands in the remainder of the book should be run as
    22       the <systemitem class="username">root</systemitem> user. Also,
    23       double-check that ${CLFS} is set as
    24       <systemitem class="username">root</systemitem>.</para>
     22      the <systemitem class="username">root</systemitem> user. Check
     23      that ${CLFS} is set in the
     24      <systemitem class="username">root</systemitem> user&rsquo;s environment
     25       before proceeding.</para>
    2526    </note>
    2627

  • BOOK/boot/common/fstab.xml

    rec008670 r229ed25  
    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
     36
    3437# End /etc/fstab</literal>
    3538EOF</userinput></screen>

  • BOOK/boot/common/pwdgroup.xml

    rec008670 r229ed25  
    192192
    193193  <para os="e">The created groups are not part of any standard&mdash;they are
    194   groups decided on in part by the requirements of the Udev configuration
     194  groups decided on in part by the requirements of the Eudev configuration
    195195  in the final system, and in part by common convention employed by a
    196196  number of existing Linux distributions. The Linux Standard Base (LSB,

  • BOOK/boot/common/sysvinit.xml

    rec008670 r229ed25  
    2424
    2525    <para os="aa">The following modifications help locate files specific to this
    26     perticular build:</para>
     26    particular build:</para>
    2727
    2828<screen os="ab"><userinput>cp -v src/Makefile{,.orig}
    … …  
    8686
    8787<screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
    88 <literal>1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
    89 2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
    90 3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
    91 4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
    92 5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
    93 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
     88<literal>1:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty1 9600
     892:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty2 9600
     903:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty3 9600
     914:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty4 9600
     925:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty5 9600
     936:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty6 9600
    9494</literal>
    9595EOF</userinput></screen>
    … …  
    9999
    100100<screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
    101 <literal>c0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
     101<literal>c0:12345:respawn:/sbin/agetty --noclear 115200 ttyS0 vt100
    102102</literal>
    103103EOF</userinput></screen>

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

    rec008670 r229ed25  
    2222  <sect2 role="installation">
    2323    <title>Installation of Util-linux</title>
    24 
     24   
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../../final-system/common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>PKG_CONFIG=true \
     29<screen os="b"><userinput>PKG_CONFIG= \
    3030  ./configure --prefix=/tools --exec-prefix=/tools \
    3131    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    32     --enable-login-utils --disable-makeinstall-chown</userinput></screen>
     32    --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
    3333
    3434    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/mips-chapter.xml

    rec008670 r229ed25  
    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/udev.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.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="mips/kernel.xml"/>

  • BOOK/boot/mips/kernel.xml

    rec008670 r229ed25  
    7575
    7676    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     77    href="../../bootable/x86/kernel.xml"
     78    xpointer="xpointer(//*[@os='s2'])"/>
     79
     80<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
     81   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     82
     83    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7784    href="../x86/kernel.xml"
    7885    xpointer="xpointer(//*[@os='u'])"/>

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

    rec008670 r229ed25  
    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/eudev.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

    rec008670 r229ed25  
    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="64/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/udev.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.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/createfiles.xml

    rec008670 r229ed25  
    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

    rec008670 r229ed25  
    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/mips64/kernel.xml

    rec008670 r229ed25  
    7979
    8080    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     81    href="../../bootable/x86/kernel.xml"
     82    xpointer="xpointer(//*[@os='s2'])"/>
     83
     84<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
     85   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     86
     87    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8188    href="../x86/kernel.xml"
    8289    xpointer="xpointer(//*[@os='u'])"/>

  • BOOK/boot/multilib/createfiles.xml

    rec008670 r229ed25  
    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

    rec008670 r229ed25  
    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

    rec008670 r229ed25  
    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/grub-build.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-temp-system-ppl" role="wrap">
    9   <?dbhtml filename="ppl.html"?>
     8<sect1 id="ch-boot-grub-build" role="wrap">
     9  <?dbhtml filename="grub-build.html"?>
    1010
    11   <title>PPL-&ppl-version;</title>
     11  <title>GRUB-&grub-version;</title>
    1212
    13   <indexterm zone="ch-temp-system-ppl">
    14     <primary sortas="a-PPL">PPL</primary>
    15     <secondary>temporary system</secondary>
     13  <indexterm zone="ch-boot-grub-build">
     14    <primary sortas="a-GRUB">GRUB</primary>
     15    <secondary>boot</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/ppl.xml"
     19  href="../../final-system/x86/grub.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of PPL</title>
     23    <title>Installation of GRUB</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
     26    href="../../final-system/x86/grub.xml"
     27    xpointer="xpointer(//*[@os='n1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../final-system/x86/grub.xml"
     31    xpointer="xpointer(//*[@os='s1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/x86/grub.xml"
     35    xpointer="xpointer(//*[@os='s2'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/x86/grub.xml"
    2739    xpointer="xpointer(//*[@os='a'])"/>
    2840
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     41<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    3042    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --enable-interfaces="c,cxx" --libdir=/tools/lib64 --enable-shared \
    32     --disable-optimization --with-libgmp-prefix=/tools \
    33     --with-libgmpxx-prefix=/tools</userinput></screen>
     43    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
    3444
    3545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/ppl.xml"
    37     xpointer="xpointer(//*[@os='bp1'])"/>
    38 
    39     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/ppl.xml"
    41     xpointer="xpointer(//*[@os='bp2'])"/>
    42 
    43     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/ppl.xml"
     46    href="../../final-system/x86/grub.xml"
    4547    xpointer="xpointer(//*[@os='c'])"/>
    4648
    4749    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/ppl.xml"
     50    href="../../final-system/x86/grub.xml"
    4951    xpointer="xpointer(//*[@os='d'])"/>
    50        
    51     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/ppl.xml"
    53     xpointer="xpointer(//*[@os='e'])"/>
    5452
    5553    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/ppl.xml"
     54    href="../../final-system/x86/grub.xml"
    5755    xpointer="xpointer(//*[@os='f'])"/>
     56
     57<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
    5858
    5959  </sect2>
    … …  
    6363
    6464    <para>Details on this package are located in <xref
    65     linkend="contents-ppl" role="."/></para>
     65    linkend="contents-grub" role="."/></para>
    6666
    6767  </sect2>

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

    rec008670 r229ed25  
    2222  <sect2 role="installation">
    2323    <title>Installation of Util-linux</title>
    24 
     24   
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
    30   ./configure \
    31     --prefix=/tools --exec-prefix=/tools \
    32     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    33     --libdir=/tools/lib64 --enable-login-utils \
    34     --disable-makeinstall-chown</userinput></screen>
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure \
     30    --prefix=/tools --exec-prefix="" --build=${CLFS_HOST} \
     31    --host=${CLFS_TARGET} --libdir=/tools/lib64 --bindir=/tools/bin \
     32    --sbindir=/tools/sbin --disable-makeinstall-chown --disable-login \
     33    --disable-su</userinput></screen>
    3534
    3635    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4645    xpointer="xpointer(//*[@os='g'])"/>
    4746
    48     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/util-linux.xml"
    50     xpointer="xpointer(//*[@os='h'])"/>
     47<screen os="h"><userinput>make usrsbin_execdir=/tools/sbin usrbin_execdir=/tools/bin install</userinput></screen>
    5148
    5249  </sect2>

  • BOOK/boot/ppc-chapter.xml

    rec008670 r229ed25  
    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/udev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.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="ppc/kernel.xml"/>

  • BOOK/boot/ppc/kernel.xml

    rec008670 r229ed25  
    8080
    8181    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     82    href="../../bootable/x86/kernel.xml"
     83    xpointer="xpointer(//*[@os='s2'])"/>
     84
     85<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
     86   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     87
     88    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8289    href="../x86/kernel.xml"
    8390    xpointer="xpointer(//*[@os='u'])"/>

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

    rec008670 r229ed25  
    2323    <title>Installation of Yaboot</title>
    2424
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../final-system/ppc/yaboot.xml"
     27    xpointer="xpointer(//*[@os='p3'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../final-system/ppc/yaboot.xml"
     31    xpointer="xpointer(//*[@os='p4'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/ppc/yaboot.xml"
     35    xpointer="xpointer(//*[@os='p5'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/ppc/yaboot.xml"
     39    xpointer="xpointer(//*[@os='p6'])"/>
     40
    2541    <para os="p1">The following patch allows <command>ofpath</command> to use
    2642    <literal>PATH_PREFIX</literal> like the other
    … …  
    3349    loader. It also tries to change user and group ownership for the installed
    3450    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>
     51    <systemitem class="username">clfs</systemitem> user cannot do. It will also
     52    fail due to a compile warning with the -Werror flag on.   The following
     53    command fixes these issues:</para>
    3754
    3855<screen><userinput>cp -v Makefile{,.orig}
    3956sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
    4057    -e 's/-o root -g root//' \
     58    -e 's/-Werror//' \
    4159    Makefile.orig &gt; Makefile</userinput></screen>
    4260

  • BOOK/boot/ppc64-64/powerpc-utils.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-udev-32" role="wrap">
    9   <?dbhtml filename="udev.html"?>
     8<sect1 id="ch-boot-powerpc-utils" role="wrap">
     9  <?dbhtml filename="powerpc-utils.html"?>
    1010
    11   <title>Udev-&udev-version; 32 Bit Libraries</title>
     11  <title>Powerpc-Utils_&powerpcutils-version;</title>
    1212
    13   <indexterm zone="ch-system-udev-32">
    14     <primary sortas="a-Udev">Udev 32 Bit Libraries</primary>
    15     <secondary>32 Bit</secondary>
     13  <indexterm zone="ch-boot-powerpc-utils">
     14    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
     15    <secondary>boot</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/udev.xml"
     19  href="../../final-system/ppc/powerpc-utils.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Udev</title>
     23    <title>Installation of Powerpc-Utils</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/udev.xml"
     26    href="../../final-system/ppc/powerpc-utils.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    … …  
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/udev.xml"
     36    href="../ppc/powerpc-utils.xml"
     37    xpointer="xpointer(//*[@os='a'])"/>
     38
     39<screen><userinput>${CC} ${BUILD64} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../ppc/powerpc-utils.xml"
    3743    xpointer="xpointer(//*[@os='c'])"/>
    3844
    3945    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/udev.xml"
     46    href="../ppc/powerpc-utils.xml"
    4147    xpointer="xpointer(//*[@os='d'])"/>
    42 
    43     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/udev.xml"
    45     xpointer="xpointer(//*[@os='g'])"/>
    46 
    47     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/udev.xml"
    49     xpointer="xpointer(//*[@os='h'])"/>
    5048
    5149  </sect2>
    … …  
    5452    <title/>
    5553
    56     <para>Details on this package are located in <xref
    57     linkend="contents-udev" role="."/></para>
     54    <para>Details on this package are located in <xref linkend="contents-powerpc-utils" role="."/></para>
    5855
    5956  </sect2>
     57
    6058</sect1>
    61 

  • BOOK/boot/ppc64-chapter.xml

    rec008670 r229ed25  
    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="64/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"/>
    22   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
     24  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
    2325  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
    2426  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.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/devices.xml"/>

  • BOOK/boot/ppc64/e2fsprogs.xml

    rec008670 r229ed25  
    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/kernel.xml

    rec008670 r229ed25  
    7979
    8080    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     81    href="../../bootable/x86/kernel.xml"
     82    xpointer="xpointer(//*[@os='s2'])"/>
     83
     84<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
     85   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     86
     87    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8188    href="../x86/kernel.xml"
    8289    xpointer="xpointer(//*[@os='u'])"/>

  • BOOK/boot/ppc64/util-linux-32.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-udev-n32" role="wrap">
    9   <?dbhtml filename="udev-n32.html"?>
     8<sect1 id="ch-boot-util-linux-32" role="wrap">
     9  <?dbhtml filename="util-linux-32.html"?>
    1010
    11   <title>Udev-&udev-version; N32 Libraries</title>
     11  <title>Util-linux-&util-linux-version; 32bit</title>
    1212
    13   <indexterm zone="ch-system-udev-n32">
    14     <primary sortas="a-Udev">Udev</primary>
    15     <secondary>N32</secondary>
     13  <indexterm zone="ch-boot-util-linux-32">
     14    <primary sortas="a-Util-linux">Util-linux 32bit</primary>
     15    <secondary>boot</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/udev.xml"
     19  href="../../final-system/common/util-linux.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Udev</title>
    24 
     23    <title>Installation of Util-linux 32 bit</title>
     24   
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/udev.xml"
     26    href="../common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    … …  
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/udev.xml"
    37     xpointer="xpointer(//*[@os='c'])"/>
    38 
    39     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/udev.xml"
     36    href="../common/util-linux.xml"
    4137    xpointer="xpointer(//*[@os='d'])"/>
    4238
    4339    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/udev.xml"
     40    href="../common/util-linux.xml"
     41    xpointer="xpointer(//*[@os='e'])"/>
     42
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/util-linux.xml"
    4545    xpointer="xpointer(//*[@os='g'])"/>
    4646
    4747    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/udev.xml"
     48    href="../common/util-linux.xml"
    4949    xpointer="xpointer(//*[@os='h'])"/>
    5050
    … …  
    5555
    5656    <para>Details on this package are located in <xref
    57     linkend="contents-udev" role="."/></para>
     57    linkend="contents-util-linux" role="."/></para>
    5858
    5959  </sect2>
     60
    6061</sect1>
    61 
    62 
    63 

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

    rec008670 r229ed25  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../final-system/ppc/yaboot.xml"
     27    xpointer="xpointer(//*[@os='p3'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../final-system/ppc/yaboot.xml"
     31    xpointer="xpointer(//*[@os='p4'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/ppc/yaboot.xml"
     35    xpointer="xpointer(//*[@os='p5'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/ppc/yaboot.xml"
     39    xpointer="xpointer(//*[@os='p6'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2642    href="../ppc/yaboot-build.xml"
    2743    xpointer="xpointer(//*[@os='p1'])"/>
    … …  
    4359            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
    4460            -e 's/-o root -g root//' \
     61            -e 's/-Werror//' \
    4562    Makefile.orig &gt; Makefile</userinput></screen>
    4663

  • BOOK/boot/sparc-chapter.xml

    rec008670 r229ed25  
    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/udev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.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/sparc/fstab.xml

    rec008670 r229ed25  
    2929proc           /proc           proc        defaults         0     0
    3030sysfs          /sys            sysfs       defaults         0     0
    31 devpts         /dev/pts        devpts      gid=4,mode=620   0     0
     31devpts         /dev/pts        devpts      gid=&gid-tty;,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/sparc/kernel.xml

    rec008670 r229ed25  
    7575
    7676    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     77    href="../../bootable/x86/kernel.xml"
     78    xpointer="xpointer(//*[@os='s2'])"/>
     79
     80<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
     81   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     82
     83    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7784    href="../x86/kernel.xml"
    7885    xpointer="xpointer(//*[@os='u'])"/>

  • BOOK/boot/sparc/silo-build.xml

    rec008670 r229ed25  
    3131    xpointer="xpointer(//*[@os='b'])"/>
    3232
     33<para os="ae">This sed allows us to compile the bin2h binary separately.</para>
     34
     35<screen os="ad"><userinput>sed -i -e 's@\$(PROGRAMS)$@programs\n\nprograms: &amp;@' common/Makefile</userinput></screen>
     36
     37<para os="af">Compile the bin2h and util binaries for the host.</para>
     38
     39<screen os="aa"><userinput>make -C common programs CC=cc
     40make -C second util CC=cc</userinput></screen>
     41
     42    <variablelist>
     43      <varlistentry>
     44        <term><parameter>CC=cc</parameter></term>
     45        <listitem>
     46          <para>Overwrites the default value of <command>gcc -m32</command> which will fail
     47to compile on 64 bit targets. This is not to be confused with <command>CC=${CC}</command> below.</para>
     48        </listitem>
     49      </varlistentry>
     50    </variablelist>
     51
    3352    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3453    href="../../final-system/sparc/silo.xml"
    3554    xpointer="xpointer(//*[@os='c'])"/>
    3655
    37 <screen os="aa"><userinput>make CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
     56<screen os="ac"><userinput>make CC=${CC} AS=${AS} LD=${LD} STRIP=${STRIP}</userinput></screen>
    3857
    3958    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    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/eudev.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

    rec008670 r229ed25  
    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="64/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/udev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.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/kernel.xml

    rec008670 r229ed25  
    7373    xpointer="xpointer(//*[@os='s'])"/>
    7474
    75 <screen><userinput>make INSTALL_MOD_PATH=${CLFS} ARCH=sparc64 \
     75<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=${CLFS} \
    7676   CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
     77
     78    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     79    href="../../bootable/x86/kernel.xml"
     80    xpointer="xpointer(//*[@os='s2'])"/>
     81
     82<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- \
     83   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
    7784
    7885    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/x86-chapter.xml

    rec008670 r229ed25  
    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/udev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.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/kernel.xml"/>

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

    rec008670 r229ed25  
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3030    href="../../final-system/x86/grub.xml"
     31    xpointer="xpointer(//*[@os='s1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/x86/grub.xml"
     35    xpointer="xpointer(//*[@os='s2'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/x86/grub.xml"
    3139    xpointer="xpointer(//*[@os='a'])"/>
    3240
    33 <screen os="ab"><userinput>./configure --prefix=/usr \
     41<screen os="ab"><userinput>./configure --prefix=/tools \
    3442    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    3543    --sysconfdir=/etc --disable-werror</userinput></screen>

  • BOOK/boot/x86/kernel.xml

    rec008670 r229ed25  
    8282    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
    8383
     84    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     85    href="../../bootable/x86/kernel.xml"
     86    xpointer="xpointer(//*[@os='s2'])"/>
     87
     88<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
     89   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     90
    8491    <para os="u">After kernel compilation is complete, additional steps are
    8592    required to complete the installation. Some files need to be copied to

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

    rec008670 r229ed25  
    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/eudev.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

    rec008670 r229ed25  
    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="64/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/udev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
     22  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.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"/>

  • BOOK/boot/x86_64/kernel.xml

    rec008670 r229ed25  
    7979
    8080    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     81    href="../../bootable/x86/kernel.xml"
     82    xpointer="xpointer(//*[@os='s2'])"/>
     83
     84<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
     85   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     86
     87    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8188    href="../x86/kernel.xml"
    8289    xpointer="xpointer(//*[@os='u'])"/>
Note: See TracChangeset for help on using the changeset viewer.