Ignore:
Timestamp:
07/26/2021 07:13:05 AM (3 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
85cd74c2
Parents:
f18f2d6 (diff), ff96923 (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 upstream changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • chapter08/util-linux.xml

    rf18f2d6 r3388c22  
    9595<screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
    9696    </warning>
    97 
     97<!--
    9898    <note><para>There is one test that depends on the configuration of the kernel.
    9999    If CONFIG_USER_NS or CONFIG_PID_NS are not set, the tests will hang forever.
     
    102102    <screen><userinput remap="test">rm tests/ts/lsns/ioctl_ns</userinput></screen>
    103103    </note>
    104 
     104-->
    105105<screen><userinput remap="test">chown -Rv tester .
    106106su tester -c "make -k check"</userinput></screen>
     
    109109
    110110<screen><userinput remap="install">make install</userinput></screen>
    111 
     111<!--
    112112  <para>Finally, install the man pages:</para>
    113113
    114 <screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz --directory /usr/share/man --strip-components=1</userinput></screen>
    115 
     114<screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz - -directory /usr/share/man - -strip-components=1</userinput></screen>
     115-->
    116116  </sect2>
    117117
Note: See TracChangeset for help on using the changeset viewer.