Changeset 73ace20 for BOOK/boot/common


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/common
Files:
2 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

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