Changeset 229ed25 for BOOK/boot/multilib


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/multilib
Files:
3 added
2 deleted
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • 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>
Note: See TracChangeset for help on using the changeset viewer.