Changeset 3388c22


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

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    rf18f2d6 r3388c22  
    4545    appropriate for the entry or if needed the entire day's listitem.
    4646    -->
     47
     48    <listitem>
     49      <para>2021-07-25</para>
     50      <itemizedlist>
     51        <listitem>
     52          <para>[bdubbs] - Add workaround to strip libraries
     53          correctly.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[xry111] - Add workaround to install Binutils-2.37 man pages
     57          correctly.</para>
     58        </listitem>
     59        <listitem>
     60          <para>[bdubbs] - Update to shadow-4.9. Fixes
     61          <ulink url="&lfs-ticket-root;4891">#4891</ulink>.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[bdubbs] - Update to util-linux 2.37.1. Fixes
     65          <ulink url="&lfs-ticket-root;4890">#4890</ulink>.</para>
     66        </listitem>
     67      </itemizedlist>
     68    </listitem>
     69
    4770    <listitem>
    4871      <para>2021-07-23</para>

  • chapter01/whatsnew.xml

    rf18f2d6 r3388c22  
    229229      <para>Sed-&sed-version;</para>
    230230    </listitem>-->
    231     <!--<listitem>
     231    <listitem>
    232232      <para>Shadow-&shadow-version;</para>
    233     </listitem>-->
     233    </listitem>
    234234    <listitem revision="sysv">
    235235      <para>Sysklogd-&sysklogd-version;</para>

  • chapter03/packages.xml

    rf18f2d6 r3388c22  
    751751      </listitem>
    752752    </varlistentry>
    753 
     753<!--
    754754    <varlistentry>
    755755      <term>Util-linux Man Pages - <token>&util-linux-man-size;</token>:</term>
    … …  
    765765      </listitem>
    766766    </varlistentry>
    767 
     767-->
    768768    <varlistentry>
    769769      <term>Vim (&vim-version;) - <token>&vim-size;</token>:</term>

  • chapter08/binutils.xml

    rf18f2d6 r3388c22  
    5757<screen><computeroutput>The system has no more ptys.
    5858Ask your system administrator to create more.</computeroutput></screen>
     59
     60    <para>An error in the building system causes the shipped man pages to
     61    be empty.  Workaround the issue and remove the shipped man pages, so the
     62    man pages will be regenerated correctly:</para>
     63
     64<screen><userinput remap="pre">sed -i '63d' etc/texi2pod.pl
     65find -name \*.1 -delete</userinput></screen>
    5966
    6067    <para>Now remove one test that prevents the tests from running

  • chapter08/shadow.xml

    rf18f2d6 r3388c22  
    9090<screen role="nodump"><userinput>sed -i 's:DICTPATH.*:DICTPATH\t/lib/cracklib/pw_dict:' etc/login.defs</userinput></screen>
    9191    </note>
    92 
     92<!--
    9393    <para>Make a minor change to make the first group number generated
    9494    by useradd 1000:</para>
    9595
    9696<screen><userinput remap="pre">sed -i 's/1000/999/' etc/useradd</userinput></screen>
    97 
     97-->
    9898    <para>Prepare Shadow for compilation:</para>
    9999
    … …  
    125125    <para>Compile the package:</para>
    126126
    127 <screen><userinput remap="make">make</userinput></screen>
     127    <screen><userinput remap="make">make</userinput></screen>
    128128
    129129    <para>This package does not come with a test suite.</para>
    … …  
    131131    <para>Install the package:</para>
    132132
    133 <screen><userinput remap="install">make exec_prefix=/usr install</userinput></screen>
     133    <screen><userinput remap="install">make exec_prefix=/usr install
     134make -C man install-man
     135mkdir -p /etc/default
     136useradd -D --gid 999</userinput></screen>
    134137
    135138  </sect2>

  • chapter08/strippingagain.xml

    rf18f2d6 r3388c22  
    3535<!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
    3636<screen><userinput>save_usrlib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so
    37              libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version;
     37             libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version; libz.so.&zlib-version;
    3838             libitm.so.&libitm-version; libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
    3939
    … …  
    4141for LIB in $save_usrlib; do
    4242    objcopy --only-keep-debug $LIB $LIB.dbg
    43     strip --strip-unneeded $LIB
    44     objcopy --add-gnu-debuglink=$LIB.dbg $LIB
     43    cp $LIB /tmp/$LIB
     44    strip --strip-unneeded /tmp/$LIB
     45    objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB
     46    install -vm755 /tmp/$LIB /usr/lib
     47    rm /tmp/$LIB
    4548done</userinput>
    4649<userinput arch="ml_32,ml_all">
    4750cd /usr/lib32
    4851for LIB in $save_usrlib; do
    49     objcopy --only-keep-debug $LIB $LIB.dbg
    50     strip --strip-unneeded $LIB
    51     objcopy --add-gnu-debuglink=$LIB.dbg $LIB
     52    objcopy --only-keep-debug $LIB $LIB.dbg
     53    cp $LIB /tmp/$LIB
     54    strip --strip-unneeded /tmp/$LIB
     55    objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB
     56    install -vm755 /tmp/$LIB /usr/lib32
     57    rm /tmp/$LIB
    5258done</userinput>
    5359<userinput arch="ml_x32,ml_all">
    5460cd /usr/libx32
    5561for LIB in $save_usrlib; do
    56     objcopy --only-keep-debug $LIB $LIB.dbg
    57     strip --strip-unneeded $LIB
    58     objcopy --add-gnu-debuglink=$LIB.dbg $LIB
     62    objcopy --only-keep-debug $LIB $LIB.dbg
     63    cp $LIB /tmp/$LIB
     64    strip --strip-unneeded /tmp/$LIB
     65    objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB
     66    install -vm755 /tmp/$LIB /usr/libx32
     67    rm /tmp/$LIB
    5968done</userinput><userinput>
    6069
    … …  
    7685   -exec strip --strip-debug {} ';'</userinput><userinput>
    7786
    78 find /usr/lib -type f -name \*.so* ! -name \*dbg \
     87find /usr/lib -type f -name \*.so* ! -name \*dbg ! -name libz.so* \
    7988   -exec strip --strip-unneeded {} ';'</userinput>
    80 <userinput arch="ml_32,ml_all">find /usr/lib32 -type f -name \*.so* ! -name \*dbg \
     89<userinput arch="ml_32,ml_all">find /usr/lib32 -type f -name \*.so* ! -name \*dbg ! -name libz.so* \
    8190   -exec strip --strip-unneeded {} ';'</userinput>
    82 <userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.so* ! -name \*dbg \
     91<userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.so* ! -name \*dbg ! -name libz.so* \
    8392   -exec strip --strip-unneeded {} ';'</userinput><userinput>
    8493

  • 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

  • packages.ent

    rf18f2d6 r3388c22  
    630630<!ENTITY sed-fin-sbu "0.5 SBU">
    631631
    632 <!ENTITY shadow-version "4.8.1">
    633 <!ENTITY shadow-size "1,574 KB">
    634 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
    635 <!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45">
     632<!ENTITY shadow-version "4.9">
     633<!ENTITY shadow-size "3,870 KB">
     634<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/v&shadow-version;/shadow-&shadow-version;.tar.gz">
     635<!ENTITY shadow-md5 "b3c150ebef96d46afd51ef244ef506c8">
    636636<!ENTITY shadow-home "https://shadow-maint.github.io/shadow/">
    637637<!ENTITY shadow-fin-du "45 MB">
    … …  
    716716
    717717<!ENTITY util-linux-minor "2.37">
    718 <!ENTITY util-linux-version "2.37"> <!-- 2.33.x -->
    719 <!ENTITY util-linux-size "5,390 KB">
     718<!ENTITY util-linux-version "2.37.1"> <!-- 2.33.x -->
     719<!ENTITY util-linux-size "5,497 KB">
    720720<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
    721 <!ENTITY util-linux-md5 "75eb0a648098332d4042f1646eca4069">
     721<!ENTITY util-linux-md5 "6d244f0f59247e9109f47d6e5dd0556b">
    722722<!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
    723 <!ENTITY util-linux-man-url "&anduin-sources;/util-linux-man-pages-&util-linux-version;.tar.xz">
    724 <!ENTITY util-linux-man-md5 "882fdfd411f2a8d9fdf6635458539ff4">
    725 <!ENTITY util-linux-man-size "149 KB">
    726723<!ENTITY util-linux-tmp-du "134 MB">
    727724<!ENTITY util-linux-tmp-sbu "0.7 SBU">
Note: See TracChangeset for help on using the changeset viewer.