gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream changes

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2021-07-26 09:13:05 +02:00
commit 3388c22918
8 changed files with 74 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chapter01/changelog.xml
View File

@ -44,6 +44,29 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2021-07-25</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Add workaround to strip libraries
correctly.</para>
</listitem>
<listitem>
<para>[xry111] - Add workaround to install Binutils-2.37 man pages
correctly.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to shadow-4.9. Fixes
<ulink url="&lfs-ticket-root;4891">#4891</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to util-linux 2.37.1. Fixes
<ulink url="&lfs-ticket-root;4890">#4890</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-07-23</para>
<itemizedlist>

4
chapter01/whatsnew.xml
View File

@ -228,9 +228,9 @@
<!--<listitem>
<para>Sed-&sed-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Shadow-&shadow-version;</para>
</listitem>-->
</listitem>
<listitem revision="sysv">
<para>Sysklogd-&sysklogd-version;</para>
</listitem>

4
chapter03/packages.xml
View File

@ -750,7 +750,7 @@
<para>MD5 sum: <literal>&util-linux-md5;</literal></para>
</listitem>
</varlistentry>
<!--
<varlistentry>
<term>Util-linux Man Pages - <token>&util-linux-man-size;</token>:</term>
<listitem>
@ -764,7 +764,7 @@
</note>
</listitem>
</varlistentry>
-->
<varlistentry>
<term>Vim (&vim-version;) - <token>&vim-size;</token>:</term>
<listitem>

7
chapter08/binutils.xml
View File

@ -57,6 +57,13 @@
<screen><computeroutput>The system has no more ptys.
Ask your system administrator to create more.</computeroutput></screen>
<para>An error in the building system causes the shipped man pages to
be empty. Workaround the issue and remove the shipped man pages, so the
man pages will be regenerated correctly:</para>
<screen><userinput remap="pre">sed -i '63d' etc/texi2pod.pl
find -name \*.1 -delete</userinput></screen>
<para>Now remove one test that prevents the tests from running
to completion:</para>

11
chapter08/shadow.xml
View File

@ -89,12 +89,12 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;</userinput></s
<screen role="nodump"><userinput>sed -i 's:DICTPATH.*:DICTPATH\t/lib/cracklib/pw_dict:' etc/login.defs</userinput></screen>
</note>
<!--
<para>Make a minor change to make the first group number generated
by useradd 1000:</para>
<screen><userinput remap="pre">sed -i 's/1000/999/' etc/useradd</userinput></screen>
-->
<para>Prepare Shadow for compilation:</para>
<screen><userinput remap="configure">touch /usr/bin/passwd
@ -124,13 +124,16 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;</userinput></s
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>
<screen><userinput remap="make">make</userinput></screen>
<para>This package does not come with a test suite.</para>
<para>Install the package:</para>
<screen><userinput remap="install">make exec_prefix=/usr install</userinput></screen>
<screen><userinput remap="install">make exec_prefix=/usr install
make -C man install-man
mkdir -p /etc/default
useradd -D --gid 999</userinput></screen>
</sect2>

33
chapter08/strippingagain.xml
View File

@ -34,28 +34,37 @@
<!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
<screen><userinput>save_usrlib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so
libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version;
libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version; libz.so.&zlib-version;
libitm.so.&libitm-version; libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
cd /usr/lib
for LIB in $save_usrlib; do
objcopy --only-keep-debug $LIB $LIB.dbg
strip --strip-unneeded $LIB
objcopy --add-gnu-debuglink=$LIB.dbg $LIB
cp $LIB /tmp/$LIB
strip --strip-unneeded /tmp/$LIB
objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB
install -vm755 /tmp/$LIB /usr/lib
rm /tmp/$LIB
done</userinput>
<userinput arch="ml_32,ml_all">
cd /usr/lib32
for LIB in $save_usrlib; do
objcopy --only-keep-debug $LIB $LIB.dbg
strip --strip-unneeded $LIB
objcopy --add-gnu-debuglink=$LIB.dbg $LIB
objcopy --only-keep-debug $LIB $LIB.dbg
cp $LIB /tmp/$LIB
strip --strip-unneeded /tmp/$LIB
objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB
install -vm755 /tmp/$LIB /usr/lib32
rm /tmp/$LIB
done</userinput>
<userinput arch="ml_x32,ml_all">
cd /usr/libx32
for LIB in $save_usrlib; do
objcopy --only-keep-debug $LIB $LIB.dbg
strip --strip-unneeded $LIB
objcopy --add-gnu-debuglink=$LIB.dbg $LIB
objcopy --only-keep-debug $LIB $LIB.dbg
cp $LIB /tmp/$LIB
strip --strip-unneeded /tmp/$LIB
objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB
install -vm755 /tmp/$LIB /usr/libx32
rm /tmp/$LIB
done</userinput><userinput>
unset LIB save_usrlib</userinput></screen>
@ -75,11 +84,11 @@ unset LIB save_usrlib</userinput></screen>
<userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.a \
-exec strip --strip-debug {} ';'</userinput><userinput>
find /usr/lib -type f -name \*.so* ! -name \*dbg \
find /usr/lib -type f -name \*.so* ! -name \*dbg ! -name libz.so* \
-exec strip --strip-unneeded {} ';'</userinput>
<userinput arch="ml_32,ml_all">find /usr/lib32 -type f -name \*.so* ! -name \*dbg \
<userinput arch="ml_32,ml_all">find /usr/lib32 -type f -name \*.so* ! -name \*dbg ! -name libz.so* \
-exec strip --strip-unneeded {} ';'</userinput>
<userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.so* ! -name \*dbg \
<userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.so* ! -name \*dbg ! -name libz.so* \
-exec strip --strip-unneeded {} ';'</userinput><userinput>
find /usr/{bin,sbin,libexec} -type f \

10
chapter08/util-linux.xml
View File

@ -94,25 +94,25 @@
<screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
</warning>
<!--
<note><para>There is one test that depends on the configuration of the kernel.
If CONFIG_USER_NS or CONFIG_PID_NS are not set, the tests will hang forever.
To work around the problem, delete one test:</para>
<screen><userinput remap="test">rm tests/ts/lsns/ioctl_ns</userinput></screen>
</note>
-->
<screen><userinput remap="test">chown -Rv tester .
su tester -c "make -k check"</userinput></screen>
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
<!--
<para>Finally, install the man pages:</para>
<screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz --directory /usr/share/man --strip-components=1</userinput></screen>
<screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz - -directory /usr/share/man - -strip-components=1</userinput></screen>
-->
</sect2>
<!-- - - - - - - - - - -->

17
packages.ent
View File

@ -629,10 +629,10 @@
<!ENTITY sed-fin-du "32 MB">
<!ENTITY sed-fin-sbu "0.5 SBU">
<!ENTITY shadow-version "4.8.1">
<!ENTITY shadow-size "1,574 KB">
<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
<!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45">
<!ENTITY shadow-version "4.9">
<!ENTITY shadow-size "3,870 KB">
<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/v&shadow-version;/shadow-&shadow-version;.tar.gz">
<!ENTITY shadow-md5 "b3c150ebef96d46afd51ef244ef506c8">
<!ENTITY shadow-home "https://shadow-maint.github.io/shadow/">
<!ENTITY shadow-fin-du "45 MB">
<!ENTITY shadow-fin-sbu "0.2 SBU">
@ -715,14 +715,11 @@
<!ENTITY udev-lfs-home " ">
<!ENTITY util-linux-minor "2.37">
<!ENTITY util-linux-version "2.37"> <!-- 2.33.x -->
<!ENTITY util-linux-size "5,390 KB">
<!ENTITY util-linux-version "2.37.1"> <!-- 2.33.x -->
<!ENTITY util-linux-size "5,497 KB">
<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
<!ENTITY util-linux-md5 "75eb0a648098332d4042f1646eca4069">
<!ENTITY util-linux-md5 "6d244f0f59247e9109f47d6e5dd0556b">
<!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
<!ENTITY util-linux-man-url "&anduin-sources;/util-linux-man-pages-&util-linux-version;.tar.xz">
<!ENTITY util-linux-man-md5 "882fdfd411f2a8d9fdf6635458539ff4">
<!ENTITY util-linux-man-size "149 KB">
<!ENTITY util-linux-tmp-du "134 MB">
<!ENTITY util-linux-tmp-sbu "0.7 SBU">
<!ENTITY util-linux-fin-du "262 MB">