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-28 15:43:47 +02:00
commit 00e8b5325a
12 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
chapter01/changelog.xml
View File

@ -45,6 +45,27 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2021-07-27</para>
<itemizedlist>
<listitem>
<para>[xry111] - Update to GCC-11.2.0. Fixes
<ulink url="&lfs-ticket-root;4883">#4883</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to inetutils-2.1. Fixes
<ulink url="&lfs-ticket-root;4892">#4892</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to automake-1.16.4. Fixes
<ulink url="&lfs-ticket-root;4894">#4894</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Always use --strip-unneeded for stripping.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-07-27</para>
<itemizedlist>

3
chapter03/packages.xml
View File

@ -47,6 +47,7 @@
<para>Home page: <ulink url="&automake-home;"/></para>
<para>Download: <ulink url="&automake-url;"/></para>
<para>MD5 sum: <literal>&automake-md5;</literal></para>
<para>SHA256 sum: <literal>&automake-sha256;</literal></para>
</listitem>
</varlistentry>
@ -226,6 +227,7 @@
<para>Home page: <ulink url="&gcc-home;"/></para>
<para>Download: <ulink url="&gcc-url;"/></para>
<para>MD5 sum: <literal>&gcc-md5;</literal></para>
<para>SHA256 sum: <literal>&gcc-sha256;</literal></para>
</listitem>
</varlistentry>
@ -325,6 +327,7 @@
<para>Home page: <ulink url="&inetutils-home;"/></para>
<para>Download: <ulink url="&inetutils-url;"/></para>
<para>MD5 sum: <literal>&inetutils-md5;</literal></para>
<para>SHA256 sum: <literal>&inetutils-sha256;</literal></para>
</listitem>
</varlistentry>

8
chapter03/patches.xml
View File

@ -68,14 +68,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term>GCC Upstream Fixes Patch - <token>&gcc-upstream-fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&gcc-upstream-fixes-patch;"/></para>
<para>MD5 sum: <literal>&gcc-upstream-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
<varlistentry>
<term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
<listitem>

1
chapter06/coreutils.xml
View File

@ -46,7 +46,6 @@
<para>Prepare Coreutils for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
--libexecdir=/usr/lib \
--host=$LFS_TGT \
--build=$(build-aux/config.guess) \
--enable-install-program=hostname \

13
chapter07/python.xml
View File

@ -80,6 +80,19 @@
<screen><userinput remap="make">make</userinput></screen>
<note>
<para>
Some Python 3 modules can't be built now because the dependencies
are not installed yet. The building system still attempts to build
them however, so the compilation of some files will fail and the
compiler message may seem to indicate <quote>fatal error</quote>.
The message should be ignored. Just make sure the toplevel
<command>make</command> command has not failed. The optional
modules are not needed now and they will be built in
<xref linkend="chapter-building-system"/>.
</para>
</note>
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>

29
chapter07/stripping.xml
View File

@ -90,18 +90,18 @@ umount $LFS/{sys,proc,run}</userinput></screen>
symbols.</para>
<para>Strip off debugging symbols from binaries:</para>
<screen arch="default" role="nodump"><userinput>strip --strip-debug $LFS/usr/lib/*
strip --strip-unneeded $LFS/usr/{,s}bin/*
strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<screen arch="ml_32" role="nodump"><userinput>strip --strip-debug $LFS/usr/lib{,32}/*
strip --strip-unneeded $LFS/usr/{,s}bin/*
strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<screen arch="ml_x32" role="nodump"><userinput>strip --strip-debug $LFS/usr/lib{,x32}/*
strip --strip-unneeded $LFS/usr/{,s}bin/*
strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<screen arch="ml_all" role="nodump"><userinput>strip --strip-debug $LFS/usr/lib{,{,x}32}/*
strip --strip-unneeded $LFS/usr/{,s}bin/*
strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<screen arch="default" role="nodump"><userinput>$LFS_TGT-strip --strip-unneeded $LFS/usr/lib/*
$LFS_TGT-strip --strip-unneeded $LFS/usr/{,s}bin/*
$LFS_TGT-strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<screen arch="ml_32" role="nodump"><userinput>$LFS_TGT-strip --strip-unneeded $LFS/usr/lib{,32}/*
$LFS_TGT-strip --strip-unneeded $LFS/usr/{,s}bin/*
$LFS_TGT-strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<screen arch="ml_x32" role="nodump"><userinput>$LFS_TGT-strip --strip-unneeded $LFS/usr/lib{,x32}/*
$LFS_TGT-strip --strip-unneeded $LFS/usr/{,s}bin/*
$LFS_TGT-strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<screen arch="ml_all" role="nodump"><userinput>$LFS_TGT-strip --strip-unneeded $LFS/usr/lib{,{,x}32}/*
$LFS_TGT-strip --strip-unneeded $LFS/usr/{,s}bin/*
$LFS_TGT-strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<para>These commands will skip a number of files reporting that it does not
recognize their file format. Most of these are scripts instead of binaries.
@ -109,11 +109,6 @@ strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
<quote>Binutils pass 2</quote>, since it is the one that knows how to strip
our cross-compiled programs.--></para>
<para>Take care <emphasis>NOT</emphasis> to use
<parameter>--strip-unneeded</parameter> on the libraries. The static
ones would be destroyed and the toolchain packages would need to be
built all over again.</para>
<para>At this point, you should have at least 5 GB of free space on the
chroot partition that can be used to build and install Glibc and GCC in
the next phase. If you can build and install Glibc, you can build and install

1
chapter08/coreutils.xml
View File

@ -69,7 +69,6 @@
<screen><userinput remap="configure">autoreconf -fiv
FORCE_UNSAFE_CONFIGURE=1 ./configure \
--prefix=/usr \
--libexecdir=/usr/lib \
--enable-no-install-program=kill,uptime</userinput></screen>
<variablelist>

5
chapter08/gcc.xml
View File

@ -41,11 +41,6 @@
<sect2 role="installation">
<title>Installation of GCC</title>
<para>First, apply a patch to fix some regressions and to cope
with the removal of an obsolete kernel header in linux-5.13:</para>
<screen><userinput remap="pre">patch -Np1 -i ../gcc-&gcc-version;-upstream_fixes-1.patch</userinput></screen>
<para>If building on x86_64, change the default directory name for 64-bit
libraries to <quote>lib</quote>:</para>

23
chapter08/strippingagain.xml
View File

@ -86,7 +86,7 @@ online_usrlib="libbfd-&binutils-version;.so libdl-&glibc-version;.so
for BIN in $online_usrbin; do
cp /usr/bin/$BIN /tmp/$BIN
strip --strip-all /tmp/$BIN
strip --strip-unneeded /tmp/$BIN
install -vm755 /tmp/$BIN /usr/bin
rm /tmp/$BIN
done
@ -110,11 +110,10 @@ for LIB in $online_usrlib; do
rm /tmp/$LIB
done</userinput><userinput>
find /usr/lib -type f -name \*.a \
-exec strip --strip-debug {} ';'
for i in $(find /usr/lib -type f -name \*.so* ! -name \*dbg); do
case "$online_usrlib $save_usrlib" in
for i in $(find /usr/lib -type f -name \*.so* ! -name \*dbg) \
$(find /usr/lib -type f -name \*.a) \
$(find /usr/{bin,sbin,libexec} -type f); do
case "$online_usrbin $online_usrlib $save_usrlib" in
*$(basename $i)* )
;;
* ) strip --strip-unneeded $i
@ -134,18 +133,6 @@ for i in $(find /usr/libx32 -type f -name \*.so* ! -name \*dbg); do
esac
done</userinput><userinput>
for i in $(find /usr/bin -type f); do
case "$online_usrbin" in
*$(basename $i)* )
;;
* ) strip --strip-all $i
;;
esac
done
find /usr/{sbin,libexec} -type f \
-exec strip --strip-all {} ';'
unset BIN LIB save_usrlib online_usrbin online_usrlib
</userinput></screen>

6
chapter08/util-linux.xml
View File

@ -95,9 +95,9 @@
<screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
</warning>
<note><para>There is one test that fails in the chroot envronment and
causes the tests to hang forever. The problem does not occur outside
of the chroot envronment.
<note><para>There is one test that fails if the related config options
are not enabled in the kernel of the host system. The failure
causes the tests to hang forever.
To work around the problem, delete the test:</para>
<screen><userinput remap="test">rm tests/ts/lsns/ioctl_ns</userinput></screen>

5
chapter10/grub.xml
View File

@ -112,8 +112,9 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></
<para>If the system has been booted using UEFI,
<command>grub-install</command> will try to install files for the
<emphasis>x86_64-efi</emphasis> target, but those files
have not been installed in chapter 6. If this is the case, add
<option>--target i386-pc</option> to the command above.</para>
have not been installed in <xref linkend="chapter-building-system"/>.
If this is the case, add <option>--target i386-pc</option> to the
command above.</para>
</note>
<!-- This does not seem to be true any more

21
packages.ent
View File

@ -38,11 +38,12 @@
<!ENTITY autoconf-fin-sbu-tests "7.2">
<!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
<!ENTITY automake-version "1.16.3">
<!ENTITY automake-version "1.16.4">
<!ENTITY am-minor-version "1.16">
<!ENTITY automake-size "1,554 KB">
<!ENTITY automake-size "1,564 KB">
<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
<!ENTITY automake-md5 "c27f608a4e1f302ec7ce42f1251c184e">
<!ENTITY automake-md5 "86e8e682bd74e6390a016c4d9c11267c">
<!ENTITY automake-sha256 "80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d">
<!ENTITY automake-home "&gnu-software;automake/">
<!ENTITY automake-fin-du "115 MB">
<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 9.1 SBU with tests)">
@ -217,10 +218,11 @@
<!ENTITY gawk-fin-du "45 MB">
<!ENTITY gawk-fin-sbu "0.4 SBU">
<!ENTITY gcc-version "11.1.0">
<!ENTITY gcc-size "77,032 KB">
<!ENTITY gcc-version "11.2.0">
<!ENTITY gcc-size "78,996 KB">
<!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
<!ENTITY gcc-md5 "77f6252be0861ab918042acf42bc10ff">
<!ENTITY gcc-md5 "31c86f2ced76acac66992eeedce2fce2">
<!ENTITY gcc-sha256 "d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b">
<!ENTITY gcc-home "https://gcc.gnu.org/">
<!ENTITY gcc-tmpp1-du "3.7 GB">
<!ENTITY gcc-tmpp1-sbu "11 SBU">
@ -327,10 +329,11 @@
<!ENTITY iana-etc-fin-du "4.7 MB">
<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
<!ENTITY inetutils-version "2.0">
<!ENTITY inetutils-size "1,462 KB">
<!ENTITY inetutils-version "2.1">
<!ENTITY inetutils-size "1,496 KB">
<!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.xz">
<!ENTITY inetutils-md5 "5e1018502cd131ed8e42339f6b5c98aa">
<!ENTITY inetutils-md5 "4e7676d1980e57c7df665e5c5c3c1047">
<!ENTITY inetutils-sha256 "01b9a4bc73a47e63f6e8a07b76122d9ad2a2e46ebf14870e9c91d660b5647a22">
<!ENTITY inetutils-home "&gnu-software;inetutils/">
<!ENTITY inetutils-fin-du "31 MB">
<!ENTITY inetutils-fin-sbu "0.3 SBU">