gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-07 13:00:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

MultiLib: Merge changes from trunk

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11792 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2020-03-19 10:18:54 +00:00
parent 6989d33e7f
commit 997d961a84
7 changed files with 66 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appendices/dependencies.xml
View File

@ -2364,7 +2364,7 @@
<segtitle>&external;</segtitle>
<seglistitem>
<seg>Cracklib, and PAM</seg>
<seg>Cracklib and PAM</seg>
</seglistitem>
</segmentedlist>

13
chapter01/changelog.xml
View File

@ -43,7 +43,18 @@
Note: If a change is only specific to sysv or systemd, then use
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
-->
<listitem revision="systemd">
<para>2020-03-18</para>
<itemizedlist>
<listitem>
<para>[renodr] - Make minor modifications to the kernel configuration
in order to match the configuration options to there current positions
in Linux-5.5</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2020-03-15</para>
<itemizedlist>

97
chapter05/gcc-pass2.xml
View File

@ -43,29 +43,28 @@
<sect2 role="installation">
<title>Installation of GCC</title>
<para>Our first build of GCC has installed a couple of internal system
headers. Normally one of them, <filename>limits.h</filename>, will in turn
include the corresponding system <filename>limits.h</filename> header, in
this case, <filename>/tools/include/limits.h</filename>. However, at the
time of the first build of gcc <filename>/tools/include/limits.h</filename>
did not exist, so the internal header that GCC installed is a partial,
self-contained file and does not include the extended features of the
system header. This was adequate for building the temporary libc, but this
build of GCC now requires the full internal header. Create a full version
of the internal header using a command that is identical to what the GCC
build system does in normal circumstances:</para>
<para arch="default">As in the first build of GCC, the GMP, MPFR, and MPC packages are
required. Unpack the tarballs and move them into the required directory
names:</para>
<para arch="ml_32,ml_x32,ml_all">As in the first build of GCC, the GMP, MPFR, MPC and ISL packages are
required. Unpack the tarballs and move them into the required directory
names:</para>
<screen><userinput remap="pre">cat gcc/limitx.h gcc/glimits.h gcc/limity.h &gt; \
`dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h</userinput></screen>
<!--
<para>For x86 machines, the limited number of registers is a bottleneck
for the system. Free one up by not using a frame pointer that is not
needed:</para>
<screen arch="default"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
mv -v mpfr-&mpfr-version; mpfr
tar -xf ../gmp-&gmp-version;.tar.xz
mv -v gmp-&gmp-version; gmp
tar -xf ../mpc-&mpc-version;.tar.gz
mv -v mpc-&mpc-version; mpc</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
mv -v mpfr-&mpfr-version; mpfr
tar -xf ../gmp-&gmp-version;.tar.xz
mv -v gmp-&gmp-version; gmp
tar -xf ../mpc-&mpc-version;.tar.gz
mv -v mpc-&mpc-version; mpc
tar -xf ../isl-&isl-version;.tar.xz
mv -v isl-&isl-version; isl</userinput></screen>
<screen><userinput remap="pre">case `uname -m` in
i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
esac</userinput></screen>
-->
<para>Once again, change the location of GCC's default dynamic linker to
use the one installed in <filename
class="directory">/tools</filename>.</para>
@ -91,43 +90,29 @@ sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/
;;
esac</userinput></screen>
<para arch="ml_32,ml_x32,ml_all">Change the default directory name for 64-bit
libraries to <quote>lib</quote>:</para>
<para>Our first build of GCC has installed a couple of internal system
headers. Normally one of them, <filename>limits.h</filename>, will in turn
include the corresponding system <filename>limits.h</filename> header, in
this case, <filename>/tools/include/limits.h</filename>. However, at the
time of the first build of gcc <filename>/tools/include/limits.h</filename>
did not exist, so the internal header that GCC installed is a partial,
self-contained file and does not include the extended features of the
system header. This was adequate for building the temporary libc, but this
build of GCC now requires the full internal header. Create a full version
of the internal header using a command that is identical to what the GCC
build system does in normal circumstances:</para>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
-i.orig gcc/config/i386/t-linux64</userinput></screen>
<para arch="default">As in the first build of GCC it requires the GMP,
MPFR, and MPC packages. Unpack the tarballs and move them into the
required directory names:</para>
<para arch="ml_32,ml_x32,ml_all">As in the first build of GCC it requires the GMP,
ISL, MPFR, and MPC packages. Unpack the tarballs and move them into the
required directory names:</para>
<screen arch="default"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
mv -v mpfr-&mpfr-version; mpfr
tar -xf ../gmp-&gmp-version;.tar.xz
mv -v gmp-&gmp-version; gmp
tar -xf ../mpc-&mpc-version;.tar.gz
mv -v mpc-&mpc-version; mpc</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
mv -v mpfr-&mpfr-version; mpfr
tar -xf ../gmp-&gmp-version;.tar.xz
mv -v gmp-&gmp-version; gmp
tar -xf ../mpc-&mpc-version;.tar.gz
mv -v mpc-&mpc-version; mpc
tar -xf ../isl-&isl-version;.tar.xz
mv -v isl-&isl-version; isl</userinput></screen>
<para>
Now fix a problem introduced by Glibc-2.31:
</para>
<screen><userinput remap="pre">sed -e '1161 s|^|//|' \
-i libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc</userinput></screen>
<screen><userinput remap="pre">cat gcc/limitx.h gcc/glimits.h gcc/limity.h &gt; \
`dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h</userinput></screen>
<!--
<para>For x86 machines, the limited number of registers is a bottleneck
for the system. Free one up by not using a frame pointer that is not
needed:</para>
<screen><userinput remap="pre">case `uname -m` in
i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
esac</userinput></screen>
-->
<para>Create a separate build directory again:</para>
<screen><userinput remap="pre">mkdir -v build

4
chapter08/grub.xml
View File

@ -45,9 +45,9 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></
previous section. However, LFS can be booted using GRUB2 without such
an addition. To do this, the UEFI Mode and Secure Boot capabilities in
the host system's BIOS need to be turned off. For details, see <ulink
url="http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt">
url="&hints-root;lfs-uefi.txt">
the lfs-uefi.txt hint</ulink> at
http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt.
&hints-root;lfs-uefi.txt.
</para>
</note>

9
chapter08/kernel.xml
View File

@ -86,11 +86,11 @@ Kernel hacking ---&gt;
<screen role="nodump" revision="systemd">
General setup -->
[*] Control Group support [CONFIG_CGROUPS]
[ ] Enable deprecated sysfs features to support old userspace tools [CONFIG_SYSFS_DEPRECATED]
[*] Configure standard kernel features (expert users) [CONFIG_EXPERT] ---&gt;
[*] open by fhandle syscalls [CONFIG_FHANDLE]
[ ] Auditing support [CONFIG_AUDIT]
[*] Control Group support [CONFIG_CGROUPS]
Processor type and features ---&gt;
[*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
Firmware Drivers ---&gt;
@ -109,10 +109,7 @@ File systems ---&gt;
&lt;*&gt; Kernel automounter support (supports v3, v4, and v5) [CONFIG_AUTOFS_FS]
Pseudo filesystems ---&gt;
[*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]
[*] Tmpfs extended attributes [CONFIG_TMPFS_XATTR]
Kernel hacking ---&gt;
x86 Debugging ---&gt;
Choose kernel unwinder (Frame pointer unwinder) ---&gt; [CONFIG_UNWINDER_FRAME_POINTER]</screen>
[*] Tmpfs extended attributes [CONFIG_TMPFS_XATTR]</screen>
</note>
@ -142,7 +139,7 @@ Kernel hacking ---&gt;
<para>A fuller description of managing UEFI environments from within LFS
is covered by the lfs-uefi.txt hint at
<ulink
url="http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt"/>.
url="&hints-root;lfs-uefi.txt"/>.
</para>
</note>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20200315">
<!ENTITY version "SVN-20200318">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY versiond "20200315-systemd">
<!ENTITY versiond "20200318-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "March 15th, 2020">
<!ENTITY releasedate "March 18th, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->

8
packages.ent
View File

@ -51,9 +51,9 @@
<!ENTITY bash-ch6-sbu "1.9 SBU">
<!ENTITY bc-version "2.6.0">
<!ENTITY bc-size "247 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/archive/&bc-version;/bc-&bc-version;.tar.gz">
<!ENTITY bc-md5 "cf466ccf1114efa3352985d210e5f255">
<!ENTITY bc-size "159 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
<!ENTITY bc-md5 "aa507206cef5e135b60ed82b24060447">
<!ENTITY bc-home "https://github.com/gavinhoward/bc">
<!ENTITY bc-ch6-du "2.9 MB">
<!ENTITY bc-ch6-sbu "0.1 SBU">
@ -234,7 +234,7 @@
<!ENTITY gcc-ch6-du "4.2 GB ">
<!ENTITY gcc-ch6-sbu "88 SBU (with tests)">
<!ENTITY libquadmath-version "0.0.0">
<!ENTITY libstdcpp-version "6.0.27">
<!ENTITY libstdcpp-version "6.0.28">
<!ENTITY libitm-version "1.0.0">
<!ENTITY libatomic-version "1.2.0">
<!ENTITY libmpx-version "2.0.1">