Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (10 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

File:
1 edited

Legend:

Unmodified
Added
Removed

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