Changeset 03e6a40 for BOOK/boot/multilib


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

Merge branch 'systemd' into simp

Conflicts:

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

Location:
BOOK/boot/multilib
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/multilib/createfiles.xml

    r88ef769 r03e6a40  
    1515  xpointer="xpointer(//*[@os='a'])"/>
    1616
    17 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
     17<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
    1818ln -sv /tools/bin/file ${CLFS}/usr/bin
    19 ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
    2019ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    2120ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
    22 ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
    23 ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
     21ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
     22ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
     23sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
    2424ln -sv bash ${CLFS}/bin/sh
    25 ln -sv ../run ${CLFS}/var/run</userinput></screen>
     25ln -sv ../run ${CLFS}/var/run
     26ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
     27ln -sv /tools/sbin/init ${CLFS}/sbin
     28ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
     29
     30  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31  href="../common/createfiles.xml"
     32  xpointer="xpointer(//*[@os='c'])"/>
     33
     34  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     35  href="../common/createfiles.xml"
     36  xpointer="xpointer(//*[@os='d'])"/>
    2637
    2738</sect1>

  • BOOK/boot/multilib/creatingdirs.xml

    r88ef769 r03e6a40  
    1515  xpointer="xpointer(//*[@os='a'])"/>
    1616
    17 <screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
     17  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     18  href="../common/creatingdirs.xml"
     19  xpointer="xpointer(//*[@os='b'])"/>
     20
     21<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
    1822mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
    1923mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
    … …  
    2529mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
    2630mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
    27 for dir in ${CLFS}/usr{,/local}; do
    28   ln -sv share/{man,doc,info} $dir
    29 done
    3031install -dv ${CLFS}/usr/lib/locale
    3132ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
    32 
    33   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34   href="../common/creatingdirs.xml"
    35   xpointer="xpointer(//*[@os='c'])"/>
    3633
    3734  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4340  xpointer="xpointer(//*[@os='e'])"/>
    4441
     42  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     43  href="../common/creatingdirs.xml"
     44  xpointer="xpointer(//*[@os='f'])"/>
     45
    4546</sect1>

  • BOOK/boot/multilib/e2fsprogs.xml

    r88ef769 r03e6a40  
    7575    xpointer="xpointer(//*[@os='l'])"/>
    7676
    77     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    78     href="../common/e2fsprogs.xml"
    79     xpointer="xpointer(//*[@os='ad'])"/>
    80 
    81     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    82     href="../common/e2fsprogs.xml"
    83     xpointer="xpointer(//*[@os='ae'])"/>
    84 
    8577  </sect2>
    8678

  • BOOK/boot/multilib/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
    2928<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} \
    33     --host=${CLFS_TARGET} --with-rootprefix='' --enable-split-usr \
    34     --sysconfdir=/etc --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin \
    35     --libdir=/usr/lib64 --with-rootlibdir=/lib64 --disable-introspection \
    36     --disable-gtk-doc-html --disable-gudev --disable-keymap \
    37     --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
     29    KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
     30    CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
     31    --host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
     32    --disable-introspection --disable-gtk-doc-html --disable-gudev \
     33    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
    3834
    3935    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../../final-system/common/eudev.xml"
     36    href="../common/eudev.xml"
    4137    xpointer="xpointer(//*[@os='c'])"/>
    4238
    4339    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../../final-system/common/eudev.xml"
     40    href="../common/eudev.xml"
    4541    xpointer="xpointer(//*[@os='d'])"/>
    4642
    4743    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../../final-system/common/eudev.xml"
     44    href="../common/eudev.xml"
    4945    xpointer="xpointer(//*[@os='g'])"/>
    5046
    … …  
    5450
    5551    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../../final-system/common/eudev.xml"
     52    href="../common/eudev.xml"
    5753    xpointer="xpointer(//*[@os='r1'])"/>
    5854
    … …  
    6359  </sect2>
    6460
    65   <sect2 role="content">
    66     <title/>
    67 
    68     <para>Details on this package are located in <xref
    69     linkend="contents-eudev" role="."/></para>
    70 
    71   </sect2>
     61  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     62  href="../common/eudev.xml"
     63  xpointer="xpointer(//*[@role='content'])"/>
    7264
    7365</sect1>

  • BOOK/boot/multilib/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    --libdir=/tools/lib64 --disable-werror \
     44    --enable-grub-mkfont=no</userinput></screen>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../x86/grub-build.xml"
     48    xpointer="xpointer(//*[@os='b'])"/>
     49
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     51    href="../x86/grub-build.xml"
     52    xpointer="xpointer(//*[@os='bc'])"/>
    4453
    4554    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5564    xpointer="xpointer(//*[@os='f'])"/>
    5665
    57 <screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     66    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     67    href="../x86/grub-build.xml"
     68    xpointer="xpointer(//*[@os='ag'])"/>
    5869
    5970  </sect2>

  • BOOK/boot/multilib/kmod.xml

    r88ef769 r03e6a40  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../common/kmod.xml"
     27    xpointer="xpointer(//*[@os='s1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/kmod.xml"
     31    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2634    href="../../final-system/common/kmod.xml"
    2735    xpointer="xpointer(//*[@os='a'])"/>
    … …  
    3038zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
    3139CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    32     --bindir=/bin --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    33     --libdir=/tools/lib64 --with-xz --with-zlib --disable-manpages</userinput></screen>
     40    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     41    --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
     42
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/kmod.xml"
     45    xpointer="xpointer(//*[@os='c'])"/>
    3446
    3547    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4557    xpointer="xpointer(//*[@os='g'])"/>
    4658
    47 <screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="../common/kmod.xml"
     61    xpointer="xpointer(//*[@os='h'])"/>
    4862
    49 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50 href="../../final-system/common/kmod.xml"
    51 xpointer="xpointer(//*[@os='i'])"/>
     63    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     64    href="../common/kmod.xml"
     65    xpointer="xpointer(//*[@os='i'])"/>
    5266
    53 <screen os="j"><userinput>ln -sv kmod ${CLFS}/bin/lsmod
    54 ln -sv ../bin/kmod ${CLFS}/sbin/depmod
    55 ln -sv ../bin/kmod ${CLFS}/sbin/insmod
    56 ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
    57 ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
    58 ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
     67    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     68    href="../common/kmod.xml"
     69    xpointer="xpointer(//*[@os='j'])"/>
    5970
    6071  </sect2>

  • BOOK/boot/multilib/sysvinit.xml

    r88ef769 r03e6a40  
    1313  <indexterm zone="ch-boot-sysvinit">
    1414    <primary sortas="a-Sysvinit">Sysvinit</primary>
    15     <secondary>boot</secondary>
    1615  </indexterm>
    1716
    1817  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/sysvinit.xml"
     18  href="../common/sysvinit.xml"
    2019  xpointer="xpointer(//*[@role='package'])"/>
    2120
    … …  
    2524    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2625    href="../common/sysvinit.xml"
    27     xpointer="xpointer(//*[@os='aa'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2827
    2928    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3029    href="../common/sysvinit.xml"
    31     xpointer="xpointer(//*[@os='ab'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3231
    3332    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5251  xpointer="xpointer(//*[@role='configuration'])"/>
    5352
    54   <sect2 role="content">
    55     <title/>
    56 
    57     <para>Details on this package are located in <xref
    58     linkend="contents-sysvinit" role="."/></para>
    59 
    60   </sect2>
     53  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     54  href="../common/sysvinit.xml"
     55  xpointer="xpointer(//*[@role='content'])"/>
    6156
    6257</sect1>
Note: See TracChangeset for help on using the changeset viewer.