Changeset 03e6a40 for BOOK/boot/64


Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (12 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

Location:
BOOK/boot/64
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/64/createfiles.xml

    r88ef769 r03e6a40  
    1313  <title>Creating Essential Symlinks</title>
    1414
    15   <para os="a">Some programs use hard-wired paths to programs which do not exist
    16   yet. In order to satisfy these programs, create a number of symbolic
    17   links which will be replaced by real files throughout the course of
    18   the next chapter after the software has been installed.</para>
     15  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     16  href="../common/createfiles.xml"
     17  xpointer="xpointer(//*[@os='a'])"/>
    1918
    20 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
    21 ln -sv /tools/bin/file ${CLFS}/usr/bin
    22 ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
    23 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    24 ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
    25 ln -sv bash ${CLFS}/bin/sh
    26 ln -sv ../run ${CLFS}/var/run</userinput></screen>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     20  href="../common/createfiles.xml"
     21  xpointer="xpointer(//*[@os='b'])"/>
    2722
    28   <para os="b">To enable some c++ tests in the Glibc and Binutils testsuites
     23  <para os="e">To enable some C++ tests in the Glibc and Binutils testsuites
    2924  to link, create a directory and make some symbolic links:</para>
    3025
    31 <screen><userinput>mkdir -pv ${CLFS}/usr/lib64
    32 ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib64</userinput></screen>
     26<screen os="f"><userinput>mkdir -pv ${CLFS}/usr/lib64
     27ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib64</userinput></screen>
     28
     29  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30  href="../common/createfiles.xml"
     31  xpointer="xpointer(//*[@os='c'])"/>
     32
     33  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34  href="../common/createfiles.xml"
     35  xpointer="xpointer(//*[@os='d'])"/>
    3336
    3437</sect1>

  • BOOK/boot/64/e2fsprogs.xml

    r88ef769 r03e6a40  
    4949    xpointer="xpointer(//*[@os='f'])"/>
    5050
    51     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../multilib/e2fsprogs.xml"
    53     xpointer="xpointer(//*[@os='g'])"/>
     51<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
     52    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
     53    LDFLAGS="-Wl,-rpath,/tools/lib"</userinput></screen>
    5454
    5555    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6969    xpointer="xpointer(//*[@os='l'])"/>
    7070
    71     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    72     href="../common/e2fsprogs.xml"
    73     xpointer="xpointer(//*[@os='ad'])"/>
    74 
    75     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    76     href="../common/e2fsprogs.xml"
    77     xpointer="xpointer(//*[@os='ae'])"/>
    78 
    79 
    8071  </sect2>
    8172

  • BOOK/boot/64/eudev.xml

    r88ef769 r03e6a40  
    1313  <indexterm zone="ch-boot-eudev">
    1414    <primary sortas="a-Eudev">Eudev</primary>
    15     <secondary>boot</secondary>
    1615  </indexterm>
    1716
    1817  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/eudev.xml"
     18  href="../common/eudev.xml"
    2019  xpointer="xpointer(//*[@role='package'])"/>
    2120
    … …  
    2423
    2524    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../final-system/common/eudev.xml"
     25    href="../common/eudev.xml"
    2726    xpointer="xpointer(//*[@os='a'])"/>
    2827
    29 <screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
    30 KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
    31 CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
    32     ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    33     --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
    34     --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin --libdir=/lib64 \
    35     --disable-introspection --disable-gtk-doc-html --disable-gudev \
    36     --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
     28<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
     29    KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
     30    CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
     31    --host=${CLFS_TARGET}  --disable-introspection --disable-gtk-doc-html \
     32    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
     33    --enable-libkmod</userinput></screen>
    3734
    3835    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    39     href="../../final-system/common/eudev.xml"
     36    href="../common/eudev.xml"
    4037    xpointer="xpointer(//*[@os='c'])"/>
    4138
    4239    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    43     href="../../final-system/common/eudev.xml"
     40    href="../common/eudev.xml"
    4441    xpointer="xpointer(//*[@os='d'])"/>
    4542
    4643    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    47     href="../../final-system/common/eudev.xml"
     44    href="../common/eudev.xml"
    4845    xpointer="xpointer(//*[@os='g'])"/>
    4946
    … …  
    5350
    5451    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    55     href="../../final-system/common/eudev.xml"
     52    href="../common/eudev.xml"
     53    xpointer="xpointer(//*[@os='i'])"/>
     54
     55    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     56    href="../common/eudev.xml"
     57    xpointer="xpointer(//*[@os='k'])"/>
     58
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="../common/eudev.xml"
    5661    xpointer="xpointer(//*[@os='r1'])"/>
    5762
    … …  
    6065    xpointer="xpointer(//*[@os='r2'])"/>
    6166
    62  </sect2>
    63 
    64   <sect2 role="content">
    65     <title/>
    66 
    67     <para>Details on this package are located in <xref
    68     linkend="contents-eudev" role="."/></para>
    69 
    7067  </sect2>
    7168
     69  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     70  href="../common/eudev.xml"
     71  xpointer="xpointer(//*[@role='content'])"/>
     72
    7273</sect1>

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

    r88ef769 r03e6a40  
    4141<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    4242    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    43     --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
     43    --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
     44
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../x86/grub-build.xml"
     47    xpointer="xpointer(//*[@os='b'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../x86/grub-build.xml"
     51    xpointer="xpointer(//*[@os='bc'])"/>
    4452
    4553    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5563    xpointer="xpointer(//*[@os='f'])"/>
    5664
    57 <screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     65    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     66    href="../x86/grub-build.xml"
     67    xpointer="xpointer(//*[@os='ag'])"/>
    5868
    5969  </sect2>

  • BOOK/boot/64/shadow.xml

    r88ef769 r03e6a40  
    3636
    3737<screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} --sysconfdir=/etc</userinput></screen>
     38    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6666    xpointer="xpointer(//*[@os='l'])"/>
    6767
     68    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     69    href="../common/shadow.xml"
     70    xpointer="xpointer(//*[@os='m'])"/>
     71
    6872  </sect2>
    6973
Note: See TracChangeset for help on using the changeset viewer.