Changeset 229ed25 for BOOK/chroot


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/chroot
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • BOOK/chroot/64/createfiles.xml

    rec008670 r229ed25  
    2121ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
    2222ln -sv /tools/lib/libstd* /usr/lib
    23 ln -sv bash /bin/sh</userinput></screen>
     23ln -sv bash /bin/sh
     24ln -sv /run /var/run</userinput></screen>
    2425
    2526  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/chroot/common/createfiles.xml

    rec008670 r229ed25  
    1919ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
    2020ln -sv /tools/lib/libstd* /usr/lib
    21 ln -sv bash /bin/sh</userinput></screen>
     21ln -sv bash /bin/sh
     22ln -sv /run /var/run</userinput></screen>
    2223
    2324</sect1>

  • BOOK/chroot/common/creatingdirs.xml

    rec008670 r229ed25  
    1616
    1717<screen os="b"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
    18 mkdir -pv /{proc,media/{floppy,cdrom},sbin,srv,sys}
    19 mkdir -pv /var/{lock,log,mail,run,spool}
     18mkdir -pv /{proc,media/{floppy,cdrom},run/shm,sbin,srv,sys}
     19mkdir -pv /var/{lock,log,mail,spool}
    2020mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
    2121install -dv -m 0750 /root

  • BOOK/chroot/common/devices.xml

    rec008670 r229ed25  
    3030
    3131    <para>This file&mdash;<filename>/etc/fstab</filename>&mdash;has not
    32     been created yet but is also not required for the file systems to be
    33     properly mounted. As such, the warning can be safely ignored.</para>
     32    been created yet (unless using the boot method), but is also not required
     33    for the file systems to be properly mounted. The warning can be safely
     34    ignored.</para>
    3435
    3536  </sect2>

  • BOOK/chroot/common/kernfs.xml

    rec008670 r229ed25  
    3636  <para>Two device nodes, /dev/console and /dev/null, are required to be
    3737  present on the filesystem.  These are needed by the kernel even before
    38   starting Udev early in the boot process, so we create them here:</para>
     38  starting Eudev early in the boot process, so we create them here:</para>
    3939
    4040<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
    … …  
    4242
    4343  <para>Once the system is complete and booting, the rest of our device
    44   nodes are created by the Udev package.  Since this package is not
     44  nodes are created by the Eudev package.  Since this package is not
    4545  available to us right now, we must take other steps to provide device
    4646  nodes under on the CLFS filesystem.  We will use the <quote>bind</quote>
    … …  
    5454  for each of these now:</para>
    5555
    56 <screen><userinput>mount -f -vt tmpfs tmpfs ${CLFS}/dev/shm
     56<screen><userinput>if [ -h ${CLFS}/dev/shm ]; then
     57  link=$(readlink ${CLFS}/dev/shm)
     58  mkdir -p ${CLFS}/$link
     59  mount -f -vt tmpfs shm ${CLFS}/$link
     60  unset link
     61else
     62  mount -f -vt tmpfs shm ${CLFS}/dev/shm
     63fi
    5764mount -f -vt devpts -o gid=&gid-tty;,mode=620 devpts ${CLFS}/dev/pts</userinput></screen>
    5865

  • BOOK/chroot/common/util-linux.xml

    rec008670 r229ed25  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>./configure --prefix=/tools \
     29<screen os="b"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --disable-makeinstall-chown</userinput></screen>
     31    --disable-makeinstall-chown --disable-su --disable-login</userinput></screen>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/chroot/mips64/createfiles.xml

    rec008670 r229ed25  
    2323ln -sv /tools/lib32/libstd* /usr/lib32
    2424ln -sv /tools/lib64/libstd* /usr/lib64
    25 ln -sv bash /bin/sh</userinput></screen>
     25ln -sv bash /bin/sh
     26ln -sv /run /var/run</userinput></screen>
    2627
    2728</sect1>

  • BOOK/chroot/mips64/creatingdirs.xml

    rec008670 r229ed25  
    1616
    1717<screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
    18 mkdir -pv /{proc,media/{floppy,cdrom},sbin,srv,sys}
    19 mkdir -pv /var/{lock,log,mail,run,spool}
     18mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
     19mkdir -pv /var/{lock,log,mail,spool}
    2020mkdir -pv /var/{opt,cache,lib{,32,64}/{misc,locate},local}
    2121install -dv /root -m 0750

  • BOOK/chroot/multilib/createfiles.xml

    rec008670 r229ed25  
    2121ln -sv /tools/lib/libstd* /usr/lib
    2222ln -sv /tools/lib64/libstd* /usr/lib64
    23 ln -sv bash /bin/sh</userinput></screen>
     23ln -sv bash /bin/sh
     24ln -sv /run /var/run</userinput></screen>
    2425
    2526</sect1>

  • BOOK/chroot/multilib/creatingdirs.xml

    rec008670 r229ed25  
    1616
    1717<screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
    18 mkdir -pv /{proc,media/{floppy,cdrom},sbin,srv,sys}
    19 mkdir -pv /var/{lock,log,mail,run,spool}
     18mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
     19mkdir -pv /var/{lock,log,mail,spool}
    2020mkdir -pv /var/{opt,cache,lib{,64}/{misc,locate},local}
    2121install -dv /root -m 0750

  • BOOK/chroot/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}" ./configure --prefix=/tools \
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --disable-makeinstall-chown</userinput></screen>
     31    --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/chroot/x86/before-chroot.xml

    rec008670 r229ed25  
    3535    <command>config.guess</command>:</para>
    3636
    37 <screen><userinput>lib/config.guess</userinput></screen>
     37<screen><userinput>build-aux/config.guess</userinput></screen>
    3838
    3939    <para>If the output of that command does not equal what is in
    … …  
    5555    directory:</para>
    5656
    57 <screen><userinput>setarch linux32 lib/config.guess</userinput></screen>
     57<screen><userinput>setarch linux32 build-aux/config.guess</userinput></screen>
    5858
    5959    <para>If the output of the command above equals what is in
    … …  
    125125    directory:</para>
    126126
    127 <screen os="uui"><userinput>lib/config.guess</userinput></screen>
     127<screen os="uui"><userinput>build-aux/config.guess</userinput></screen>
    128128
    129129    <para os="uuj">The output of the above command should be the same as the
Note: See TracChangeset for help on using the changeset viewer.