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/final-system/common/coreutils.xml

    rec008670 r229ed25  
    3535    <para os="c">Now prepare Coreutils for compilation:</para>
    3636
    37 <screen os="d"><userinput>./configure --prefix=/usr \
     37<screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 \
     38  ./configure --prefix=/usr \
    3839    --enable-no-install-program=kill,uptime \
    3940    --enable-install-program=hostname</userinput></screen>
     41   
     42    <variablelist os="d1">
     43      <title>The meaning of the configure options:</title>
     44     
     45        <varlistentry os="d2">
     46          <term><parameter>FORCE_UNSAFE_CONFIGURE=1</parameter></term>
     47          <listitem>
     48            <para>Forces Coreutils to compile when using the root user.</para>
     49          </listitem>
     50        </varlistentry>
     51
     52      </variablelist>
    4053
    4154    <para os="e">Compile the package:</para>
     
    4558    <para os="g">The test suite of Coreutils makes several assumptions about the
    4659    presence of system users and groups that are not valid within the minimal
    47     environment that exists at the moment. Therefore, additional items need
    48     to be set up before running the tests. Skip down to <quote>Install the
    49     package</quote> if not running the test suite.</para>
    50 
    51     <para os="h">Create two <systemitem class="groupname">dummy</systemitem> groups
    52     and a <systemitem class="username">dummy</systemitem> user:</para>
    53 
    54 <screen os="i"><userinput>echo "dummy1:x:1000:" &gt;&gt; /etc/group
    55 echo "dummy2:x:1001:dummy" &gt;&gt; /etc/group
    56 echo "dummy:x:1000:1000::/root:/bin/bash" &gt;&gt; /etc/passwd</userinput></screen>
    57 
    58     <para os="j">Now the test suite is ready to be run. First, run
     60    environment that exists at the moment. Therefore, we will reuse the dummy
     61    groups and user created during Util-linux. Skip down to <quote>Install the
     62    package</quote> if not running the test suite and you did not create the
     63    dummy groups and users during Util-linux.</para>
     64
     65   <para os="h">Now the test suite is ready to be run. First, run
    5966    the tests that are meant to be run as user
    6067    <systemitem class="username">root</systemitem>:</para>
    6168
    62 <screen os="k"><userinput>make NON_ROOT_USERNAME=dummy check-root</userinput></screen>
    63 
    64     <para os="l">The testsuite will now be run as the
     69<screen os="i"><userinput remap="test">make NON_ROOT_USERNAME=dummy</userinput></screen>
     70
     71    <para os="j">The testsuite will now be run as the
    6572    <systemitem class="username">dummy</systemitem> user. Fix the permissions
    6673    for a few files to allow this:</para>
    6774
    68 <screen os="m"><userinput>chown -Rv dummy config.log {gnulib-tests,lib,src}/.deps</userinput></screen>
    69 
    70     <para os="n">Then run the remainder of the tests as the
     75<screen os="k"><userinput remap="test">chown -Rv dummy .</userinput></screen>
     76
     77    <para os="l">Then run the remainder of the tests as the
    7178    <systemitem class="username">dummy</systemitem> user:</para>
    7279
    73 <screen os="o"><userinput>src/su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
    74 
    75     <para os="p">When testing is complete, remove the
     80<screen os="m"><userinput remap="test">su dummy -s /bin/bash \
     81    -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
     82
     83    <para os="n">When testing is complete, remove the
    7684    <systemitem class="username">dummy</systemitem> user and groups:</para>
    7785
    78 <screen os="q"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
    79 
    80     <para os="r">Install the package:</para>
    81 
    82 <screen os="s"><userinput>make install</userinput></screen>
    83 
    84     <para os="t">Move programs to the locations specified by the FHS:</para>
    85 
    86 <screen os="u"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
     86<screen os="o"><userinput remap="test">sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
     87
     88    <para os="p">Install the package:</para>
     89
     90<screen os="q"><userinput>make install</userinput></screen>
     91
     92    <para os="r">Move programs to the locations specified by the FHS:</para>
     93
     94<screen os="s"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
    8795mv -v /usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} /bin
    8896mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
     
    104112        echo, env, expand, expr, factor, false, fmt, fold, groups, head,
    105113        hostid, hostname, id, install, join, link, ln, logname, ls, md5sum,
    106         mkdir, mkfifo, mknod, mktemp, mv, nice, nl, nohup, od, paste, pathchk,
    107         pinky, pr, printenv, printf, ptx, pwd, readlink, rm, rmdir, runcon, seq,
    108         sha1sum, sha224sum, sha256sum, sha384sum, sha512sum, shred, shuf,
    109         sleep, sort, split, stat, stdbuf, stty, sum, sync, tac, tail, tee, test,
    110         timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq,
    111         unlink, users, vdir, wc, who, whoami, and yes</seg>
     114        mkdir, mkfifo, mknod, mktemp, mv, nice, nl, nohup, nproc, numfmt, od, paste,
     115        pathchk, pinky, pr, printenv, printf, ptx, pwd, readlink, realpath, rm,
     116        rmdir, runcon, seq, sha1sum, sha224sum, sha256sum, sha384sum,
     117        sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum,
     118        sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort,
     119        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes</seg>
    112120        <seg>libstdbuf.so</seg>
    113121        <seg>/usr/lib/coreutils</seg>
     
    627635      </varlistentry>
    628636
     637      <varlistentry id="nproc">
     638        <term><command>nproc</command></term>
     639        <listitem>
     640          <para>Prints the number of processing units available to the current
     641          process</para>
     642          <indexterm zone="ch-system-coreutils nproc">
     643            <primary sortas="b-nproc">nproc</primary>
     644          </indexterm>
     645        </listitem>
     646      </varlistentry>
     647
     648      <varlistentry id="numfmt">
     649        <term><command>numfmt</command></term>
     650        <listitem>
     651          <para>Converts numbers to or from human-readable strings</para>
     652          <indexterm zone="ch-system-coreutils numfmt">
     653            <primary sortas="b-numfmt">numfmt</primary>
     654          </indexterm>
     655        </listitem>
     656      </varlistentry>
     657
    629658      <varlistentry id="od">
    630659        <term><command>od</command></term>
     
    727756          <indexterm zone="ch-system-coreutils readlink">
    728757            <primary sortas="b-readlink">readlink</primary>
     758          </indexterm>
     759        </listitem>
     760      </varlistentry>
     761
     762      <varlistentry id="realpath">
     763        <term><command>realpath</command></term>
     764        <listitem>
     765          <para>Prints the resolved path</para>
     766          <indexterm zone="ch-system-coreutils realpath">
     767            <primary sortas="b-realpath">realpath</primary>
    729768          </indexterm>
    730769        </listitem>
Note: See TracChangeset for help on using the changeset viewer.