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

Merge trunk; Add a note about kernel config to hostreqs.xml

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11584 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2019-04-22 06:40:16 +00:00 committed by Xℹ Ruoyao
parent 9b4ca9ab82
commit d82ab5da44
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
7 changed files with 111 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
chapter01/changelog.xml
View File

@ -45,6 +45,32 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem revision="systemd">
<para>2019-04-20</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to perl-5.28.2. Fixes
<ulink url="&lfs-ticket-root;4460">#4460</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to meson-0.50.1. Fixes
<ulink url="&lfs-ticket-root;4459">#4459</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.0.9. Fixes
<ulink url="&lfs-ticket-root;4458">#4458</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to libcap-2.27. Fixes
<ulink url="&lfs-ticket-root;4457">#4457</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Fix the syntax used for configuring automatic file
creation and deletion.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2019-04-15</para>
<itemizedlist>

8
chapter01/whatsnew.xml
View File

@ -146,9 +146,9 @@
<!--<listitem>
<para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Libcap-&libcap-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Libelf-&elfutils-version; (from elfutils)</para>
</listitem>-->
@ -197,9 +197,9 @@
<!-- <listitem>
<para>Patch-&patch-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Perl-&perl-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Pkg-config-&pkgconfig-version;</para>
</listitem>-->

19
chapter02/hostreqs.xml
View File

@ -234,4 +234,23 @@ bash library-check.sh</userinput></screen>
or all absent, but not only one or two present.</para>
-->
<para arch="ml_32,ml_x32,ml_all">
Building multilib support requires the kernel of the host system
to have 32-bit emulation support included.
</para>
<screen arch="ml_32,ml_x32,ml_all">Binary Emulations ---&gt;
[*] IA32 Emulation
&lt;M&gt; IA32 a.out support
[*] x32 ABI for 64-bit mode
</screen>
<para arch="ml_32,ml_x32,ml_all">The option 'IA32 a.out support' is
optional. In case your kernel does not have 'x32 ABI for 64-bit mode'
enabled but only 'IA32 Emulation', you can continue to build your
system but you have to leave out any sections showing instructions
for building x32 objects. If neither 'IA32 Emulation' nor
'x32 ABI for 64-bit mode' is enabled, you will run in errors
latest when building <application>glibc</application> in Chapter 6,
so an upgrade of your host system is required.
</para>
</sect1>

74
chapter06/glibc-32.xml
View File

@ -19,32 +19,9 @@
<indexterm zone="ch-system-glibc-32">
<primary sortas="a-Glibc-32">Glibc-32</primary>
</indexterm>
<!--
<sect2 role="package">
<title/>
<para>The Glibc package contains the main C library. This library provides
the basic routines for allocating memory, searching directories, opening and
closing files, reading and writing files, string handling, pattern matching,
arithmetic, and so on.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
<segtitle>&diskspace;</segtitle>
<seglistitem>
<seg>&glibc-ch6-sbu;</seg>
<seg>&glibc-ch6-du;</seg>
</seglistitem>
</segmentedlist>
</sect2>
-->
<!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
<sect2 arch="ml_32,ml_all" role="installation">
<title>Installation of Glibc - 32-bit</title>
<sect2 role="installation">
<title>Preparation to install of ML-Glibc</title>
<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
@ -52,6 +29,13 @@
<screen><userinput remap="pre">mv /usr/include/limits.h{,.backup} </userinput></screen>
</sect2>
<!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
<sect2 arch="ml_32,ml_all" role="installation">
<title>Installation of Glibc - 32-bit</title>
<para>The Glibc documentation recommends building Glibc
in a dedicated build directory:</para>
@ -60,8 +44,8 @@ cd build</userinput></screen>
<para>Prepare Glibc for compilation:</para>
<screen><userinput remap="configure">CC="gcc -m32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
CXX="g++ -m32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
<screen><userinput remap="configure">CC="gcc -m32 -ffile-prefix-map=/tools=/usr" \
CXX="g++ -m32 -ffile-prefix-map=/tools=/usr" \
../configure --prefix=/usr \
--disable-werror \
--enable-kernel=&min-kernel; \
@ -102,6 +86,30 @@ rm -rf build</userinput></screen>
<!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
<!--
In case the compilation ends with
...
if test -r /autolfs/sources/glibc-2.29/build/DESTDIR/usr/include/gnu/stubs-x32.h && cmp -s /autolfs/sources/glibc-2.29/build/stubs.h /autolfs/sources/glibc-2.29/build/DESTDIR/usr/include/gnu/stubs-x32.h; \
then echo 'stubs.h unchanged'; \
else /usr/bin/install -c -m 644 /autolfs/sources/glibc-2.29/build/stubs.h /autolfs/sources/glibc-2.29/build/DESTDIR/usr/include/gnu/stubs-x32.h; fi
rm -f /autolfs/sources/glibc-2.29/build/stubs.h
/autolfs/sources/glibc-2.29/build/elf/sln /autolfs/sources/glibc-2.29/build/elf/symlink.list
/autolfs/sources/glibc-2.29/build/elf/sln: /autolfs/sources/glibc-2.29/build/elf/sln: cannot execute binary file
make[1]: *** [Makefile:106: install-symbolic-link] Error 126
make[1]: Leaving directory '/autolfs/sources/glibc-2.29'
make: *** [Makefile:12: install] Error 2
it is a good sign that the actually running kernel isn't ML-enabled.
ArchLinux's kernels are configured like
CONFIG_IA32_EMULATION=y
# CONFIG_IA32_AOUT is not set
# CONFIG_X86_X32 is not set
It isn't x32-enabled ==> Error when building x32 stuff
-->
<sect2 arch="ml_x32,ml_all" role="installation">
<title>Glibc - x32-bit</title>
@ -113,8 +121,8 @@ cd build</userinput></screen>
<para>Prepare Glibc for compilation:</para>
<screen><userinput remap="configure">CC="gcc -mx32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
CXX="g++ -mx32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
<screen><userinput remap="configure">CC="gcc -mx32 -ffile-prefix-map=/tools=/usr" \
CXX="g++ -mx32 -ffile-prefix-map=/tools=/usr" \
../configure --prefix=/usr \
--disable-werror \
--enable-kernel=&min-kernel; \
@ -153,6 +161,13 @@ ldconfig</userinput></screen>
<screen><userinput>cd ..
rm -rf build</userinput></screen>
</sect2>
<!-- ~~~~~~~~~~~~~~~~~~~~ Cleanup ~~~~~~~~~~~~~~~~~~~~ -->
<sect2 role="installation">
<title>Cleanup</title>
<para>Restore the file we moved temporarily away:</para>
<screen><userinput remap="pre">mv /usr/include/limits.h{.backup,} </userinput></screen>
@ -160,4 +175,3 @@ rm -rf build</userinput></screen>
</sect2>
</sect1>

4
chapter07/systemd-custom.xml
View File

@ -112,8 +112,8 @@ EOF</userinput></screen>
be copied to <filename class="directory">/etc/tmpfiles.d</filename>
and edited as desired. For example:
<screen role="nodump"><userinput>mkdir -p /etc/tempfiles.d
cp /usr/lib/tmpfiles.d/tmp.conf /etc/tempfiles.d</userinput></screen>
<screen role="nodump"><userinput>mkdir -p /etc/tmpfiles.d
cp /usr/lib/tmpfiles.d/tmp.conf /etc/tmpfiles.d</userinput></screen>
</para>
</sect2>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20190415">
<!ENTITY version "SVN-20190420">
<!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 "20190415-systemd">
<!ENTITY versiond "20190420-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "April 15, 2019">
<!ENTITY releasedate "April 20, 2019">
<!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.5">

24
packages.ent
View File

@ -397,10 +397,10 @@
<!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB">
<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
<!ENTITY libcap-version "2.26">
<!ENTITY libcap-size "66 KB">
<!ENTITY libcap-version "2.27">
<!ENTITY libcap-size "67 KB">
<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
<!ENTITY libcap-md5 "968ac4d42a1a71754313527be2ab5df3">
<!ENTITY libcap-md5 "2e8f9fab32eb5ccb37969fe317fd17aa">
<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
<!ENTITY libcap-ch6-du "1.4 MB">
<!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
@ -431,12 +431,12 @@
<!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "0">
<!ENTITY linux-patch-version "7">
<!ENTITY linux-patch-version "9">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "102,779 KB">
<!ENTITY linux-size "102,789 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "e4eb618cafb57cf25b8ff28f923d0319">
<!ENTITY linux-md5 "f96df26d67d80f4359a93beead476da4">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
@ -493,10 +493,10 @@
<!ENTITY man-pages-ch6-du "28 MB">
<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
<!ENTITY meson-version "0.49.2">
<!ENTITY meson-size "1,310 KB">
<!ENTITY meson-version "0.50.1">
<!ENTITY meson-size "1,370 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
<!ENTITY meson-md5 "0267b0871266056184c484792572c682">
<!ENTITY meson-md5 "24a6527796115828d2ebc75880e18d62">
<!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-ch6-du "24 MB">
<!ENTITY meson-ch6-sbu "less than 0.1 SBU">
@ -553,10 +553,10 @@
<!ENTITY patch-ch6-du "13 MB">
<!ENTITY patch-ch6-sbu "0.2 SBU">
<!ENTITY perl-version "5.28.1">
<!ENTITY perl-size "12,083 KB">
<!ENTITY perl-version "5.28.2">
<!ENTITY perl-size "12,085 KB">
<!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
<!ENTITY perl-md5 "fbb590c305f2f88578f448581b8cf9c4">
<!ENTITY perl-md5 "6bb75770e9ba085b32bf13e4be71e4ac">
<!ENTITY perl-home "https://www.perl.org/">
<!ENTITY perl-ch5-du "275 MB">
<!ENTITY perl-ch5-sbu "1.6 SBU">