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 changes from trunk to multilib

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12176 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2021-03-30 08:47:28 +00:00 committed by Xℹ Ruoyao
parent eef83eaa05
commit ceebda5df5
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
24 changed files with 322 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appendices/dependencies.xml
View File

@ -718,7 +718,9 @@
<segtitle>&external;</segtitle>
<seglistitem>
<seg>None</seg>
<seg>
<ulink url="&blfs-root;/view/stable/general/libseccomp.html">Libseccomp</ulink>
</seg>
</seglistitem>
</segmentedlist>
@ -1116,7 +1118,7 @@
<segtitle>&external;</segtitle>
<seglistitem>
<seg>Ghostscript</seg>
<seg>Ghostscript and uchardet</seg>
</seglistitem>
</segmentedlist>

128
chapter01/changelog.xml
View File

@ -44,6 +44,134 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2021-03-26</para>
<itemizedlist>
<listitem>
<para>[renodr] - Update to openssl-1.1.1k (Security Update). Fixes
<ulink url="&lfs-ticket-root;4838">#4838</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to attr-2.5.1. Fixes
<ulink url="&lfs-ticket-root;4833">#4833</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to linux-5.11.10. Fixes
<ulink url="&lfs-ticket-root;4834">#4834</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to bc-3.3.4. Fixes
<ulink url="&lfs-ticket-root;4835">#4835</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to man-pages-5.11. Fixes
<ulink url="&lfs-ticket-root;4836">#4836</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to expat-2.3.0. Fixes
<ulink url="&lfs-ticket-root;4837">#4837</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to acl-2.3.1. Fixes
<ulink url="&lfs-ticket-root;4832">#4832</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-03-17</para>
<itemizedlist>
<listitem>
<para>[xry111] - Use <option>-j1</option> for Binutils
installation. Thanks report from Hans Meier.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-03-15</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to vim-8.2.2604. Addreses
<ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iana-etc-20210304. Addreses
<ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to zstd-1.4.9. Fixes
<ulink url="&lfs-ticket-root;4827">#4827</ulink>.</para>
</listitem>
<listitem revision="sysv">
<para>[bdubbs] - Update to sysvinit-2.99. Fixes
<ulink url="&lfs-ticket-root;4822">#4822</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.11.6. Fixes
<ulink url="&lfs-ticket-root;4824">#4824</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to libcap-2.49. Fixes
<ulink url="&lfs-ticket-root;4831">#4831</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iproute2-5.11.0. Fixes
<ulink url="&lfs-ticket-root;4823">#4823</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to e2fsprogs-1.46.2. Fixes
<ulink url="&lfs-ticket-root;4826">#4826</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bison-3.7.6. Fixes
<ulink url="&lfs-ticket-root;4828">#4828</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bc-3.3.3. Fixes
<ulink url="&lfs-ticket-root;4825">#4825</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to attr-2.5.0. Fixes
<ulink url="&lfs-ticket-root;4830">#4830</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to acl-2.3.0. Fixes
<ulink url="&lfs-ticket-root;4829">#4829</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem revision="systemd">
<para>2021-03-05</para>
<itemizedlist>
<listitem>
<para>[xry111] - Simplify the installation of systemd man pages.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem revision="systemd">
<para>2021-03-04</para>
<itemizedlist>
<listitem>
<para>[renodr] - Patch systemd-247 so that it will function with
Linux-5.11 API headers.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-03-02</para>
<itemizedlist>
<listitem>
<para>[pierre] - Fix a header file for python, so that
<command>#include &lt;python&python-minor;/Python.h&gt;</command>
works.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-03-01</para>

75
chapter01/whatsnew.xml
View File

@ -30,12 +30,12 @@
<!--<listitem>
<para>None</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Acl-&acl-version;</para>
</listitem>-->
<!--<listitem>
</listitem>
<listitem>
<para>Attr-&attr-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Autoconf-&autoconf-version;</para>
</listitem>-->
@ -45,15 +45,15 @@
<!--<listitem>
<para>Bash &bash-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Bc &bc-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Binutils-&binutils-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Bison-&bison-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Bzip2-&bzip2-version;</para>
</listitem>-->
@ -72,15 +72,15 @@
<!--<listitem>
<para>Diffutils-&diffutils-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>E2fsprogs-&e2fsprogs-version;</para>
</listitem>-->
</listitem>
<!--<listitem revision="sysv">
<para>Eudev-&eudev-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Expat-&expat-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Expect-&expect-version;</para>
</listitem>-->
@ -120,24 +120,24 @@
<!--<listitem>
<para>Groff-&groff-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>GRUB-&grub-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Gzip-&gzip-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>IANA-Etc-&iana-etc-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Inetutils-&inetutils-version;</para>
</listitem>-->
<!--<listitem>
<para>Intltool-&intltool-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>IPRoute2-&iproute2-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Kbd-&kbd-version;</para>
</listitem>-->
@ -150,9 +150,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>-->
@ -165,9 +165,9 @@
<!--<listitem>
<para>Libtool-&libtool-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Linux-&linux-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>M4-&m4-version;</para>
</listitem>-->
@ -177,9 +177,9 @@
<!--<listitem>
<para>Man-DB-&man-db-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Man-pages-&man-pages-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Meson-&meson-version;</para>
</listitem>-->
@ -195,9 +195,9 @@
<!--<listitem>
<para>Ninja-&ninja-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Openssl-&openssl-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Patch-&patch-version;</para>
</listitem>-->
@ -225,15 +225,15 @@
<!--<listitem>
<para>Shadow-&shadow-version;</para>
</listitem>-->
<!--<listitem revision="sysv">
<listitem revision="sysv">
<para>Sysklogd-&sysklogd-version;</para>
</listitem>-->
</listitem>
<!--<listitem revision="systemd">
<para>Systemd-&systemd-version;</para>
</listitem>-->
<!--<listitem revision="sysv">
<listitem revision="sysv">
<para>SysVinit-&sysvinit-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Tar-&tar-version;</para>
</listitem>-->
@ -249,9 +249,9 @@
<!--<listitem>
<para>Util-Linux-&util-linux-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Vim-&vim-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>XML-Parser-&xml-parser-version;</para>
</listitem>-->
@ -261,9 +261,9 @@
<!--<listitem>
<para>Zlib-&zlib-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Zstd-&zstd-version;</para>
</listitem>-->
</listitem>
</itemizedlist>
<!--<itemizedlist>
@ -281,9 +281,12 @@
<!--<listitem>
<para>meson-0.56.0-upstream_fix-1.patch</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>systemd-247-upstream_fixes-2.patch</para>
</listitem>
<listitem>
<para>systemd-247-upstream_fixes-1.patch</para>
</listitem>-->
</listitem>
</itemizedlist>

9
chapter03/packages.xml
View File

@ -190,15 +190,6 @@
<para>Home page: <ulink url="&file-home;"/></para>
<para>Download: <ulink url="&file-url;"/></para>
<para>MD5 sum: <literal>&file-md5;</literal></para>
<note>
<para>File (&file-version;) may no longer be available at the
listed location. The site administrators of the master download
location occasionally remove older versions when new ones are
released. An alternative download location that may have the correct
version available can also be found at: <ulink
url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para>
</note>
</listitem>
</varlistentry>

3
chapter04/creatingminlayout.xml
View File

@ -12,7 +12,8 @@
<para>The first task performed in the LFS partition is to create a limited
directory hierarchy so that programs compiled in <xref
linkend="chapter-temporary-tools"/> may be installed in their final
linkend="chapter-temporary-tools"/> (as well as glibc and libstdc++ in <xref
linkend="chapter-cross-tools"/>) may be installed in their final
location. This is needed so that those temporary programs be overwritten
when rebuilding them in <xref linkend="chapter-building-system"/>.</para>

15
chapter05/binutils-pass1.xml
View File

@ -144,7 +144,20 @@ cd build</userinput></screen>
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
<screen><userinput remap="install">make install -j1</userinput></screen>
<variablelist>
<title>The meaning of the make parameter:</title>
<varlistentry>
<term><parameter>-j1</parameter></term>
<listitem>
<para>An issue in the building system may cause the installation
to fail with <option>-j N</option> in <envar>MAKEFLAGS</envar>.
Override it to workaround this issue.</para>
</listitem>
</varlistentry>
</variablelist>
</sect2>

16
chapter05/glibc.xml
View File

@ -43,7 +43,7 @@
<sect2 role="installation">
<title>Installation of Glibc</title>
<para arch="default">First, create a symbolic link for LSB compliance. Additionally,
<para>First, create a symbolic link for LSB compliance. Additionally,
for x86_64, create a compatibility symbolic link required for proper
operation of the dynamic library loader:</para>
@ -54,15 +54,19 @@
ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3
;;
esac</userinput></screen>
<para arch="ml_32,ml_x32,ml_all">First, create symbolic links for LSB compliance
and compatibility symbolic links required for proper
operation of the dynamic library loader:</para>
<!-- no ld-linux.so.2 here as multilib is based on x86_64, not on i686 -->
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3</userinput></screen>
<note>
<para>
The above command is correct. The <command>ln</command> command has
a few syntactic versions, so be sure to check
<command>info coreutils ln</command> and <filename>ln(1)</filename>
before reporting what you may think is an error.
</para>
</note>
<para>Some of the Glibc programs use the non-FHS compliant
<filename class="directory">/var/db</filename> directory to store their
runtime data. Apply the following patch to make such programs store their

5
chapter05/libstdc++.xml
View File

@ -75,8 +75,9 @@ cd build</userinput></screen>
<varlistentry>
<term><parameter>--host=...</parameter></term>
<listitem>
<para>Specifies the use the cross compiler we have just built
instead of the one in <filename>/usr/bin</filename>.</para>
<para>Specifies that the cross compiler we have just built
should be used instead of the one in
<filename>/usr/bin</filename>.</para>
</listitem>
</varlistentry>

10
chapter06/binutils-pass2.xml
View File

@ -106,17 +106,9 @@ cd build</userinput></screen>
<filename class="libraryfile">libctf.so</filename>
to link against zlib from the host distribution:</para>
<screen><userinput remap="install">make DESTDIR=$LFS install
<screen><userinput remap="install">make DESTDIR=$LFS install -j1
install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
<para>
Workaround an issue causing
<filename class="libraryfile">libctf.so</filename>
to link against zlib from the host distribution:
</para>
<screen><userinput remap="install">install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
</sect2>
<sect2 role="content">

6
chapter06/file.xml
View File

@ -90,6 +90,12 @@ popd</userinput></screen>
<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
<para>Move a shared library into its final location in the LFS system,
and recreate the symlink for it:</para>
<screen><userinput remap="install">mv -v $LFS/usr/lib/libmagic.so.* $LFS/lib
ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) $LFS/usr/lib/libmagic.so</userinput></screen>
</sect2>
<sect2 role="content">

4
chapter08/autoconf.xml
View File

@ -65,13 +65,13 @@
several tests are skipped that use Automake. For full test coverage,
Autoconf can be re-tested after Automake has been installed. In addition,
two tests fail due to changes in libtool-2.4.3 and later.</para>
-->
<note><para>The test time for autoconf can be reduced significantly on a
system with multiple cores. To do this, append
<command>TESTSUITEFLAGS=-j&lt;N&gt;</command> to the line above. For
instance, using -j4 can reduce the test time by over 60
percent.</para></note>
-->
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>

6
chapter08/bc.xml
View File

@ -43,15 +43,15 @@
<para>Prepare Bc for compilation:</para>
<screen><userinput remap="configure">PREFIX=/usr CC=gcc ./configure.sh -G -O3</userinput></screen>
<screen><userinput remap="configure">CC=gcc ./configure --prefix=/usr -G -O3</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
<term><parameter>CC=gcc"</parameter></term>
<term><parameter>CC=gcc</parameter></term>
<listitem>
<para>These parameters specify the compiler to use.</para>
<para>This parameter specifies the compiler to use.</para>
</listitem>
</varlistentry>

4
chapter08/binutils.xml
View File

@ -153,7 +153,7 @@ cd build</userinput></screen>
ultimately be located) is set to <filename
class="directory">$(exec_prefix)/$(target_alias)</filename>. For
example, x86_64 machines would expand that to <filename
class="directory">/usr/x86_64-unknown-linux-gnu</filename>. Because this is
class="directory">/usr/x86_64-pc-linux-gnu</filename>. Because this is
a custom system, this target-specific directory in <filename
class="directory">/usr</filename> is not required. <filename
class="directory">$(exec_prefix)/$(target_alias)</filename> would be
@ -179,7 +179,7 @@ cd build</userinput></screen>
<para>Install the package:</para>
<screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
<screen><userinput remap="install">make tooldir=/usr install -j1</userinput></screen>
<para>Remove useless static libraries:</para>

2
chapter08/coreutils.xml
View File

@ -194,7 +194,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<term><command>[</command></term>
<listitem>
<para>Is an actual command, /usr/bin/[, that is a synonym
for the <command>test</command> command.</para>
for the <command>test</command> command</para>
<indexterm zone="ch-system-coreutils lbracket">
<primary sortas="b-111">[</primary>
</indexterm>

10
chapter08/file.xml
View File

@ -57,6 +57,16 @@
<screen><userinput remap="install">make install</userinput></screen>
<para><command>/bin/more</command> from util-linux will link to
<filename class="libraryfile">libmagic.so</filename>, so the shared
library should be moved to <filename class="directory">/lib</filename>,
and as a result the
<filename class="extension">.so</filename> file in
<filename class="directory">/usr/lib</filename> will need to be recreated:</para>
<screen><userinput remap="install">mv -v /usr/lib/libmagic.so.* /lib
ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) /usr/lib/libmagic.so</userinput></screen>
</sect2>
<!-- - - - - - - - - - -->

2
chapter08/gmp.xml
View File

@ -106,7 +106,7 @@ make html</userinput></screen>
the system capabilities and there will be errors in the tests or other
applications using the gmp libraries with the message "Illegal
instruction". In this case, gmp should be reconfigured with the option
--build=x86_64-unknown-linux-gnu and rebuilt.</para></caution>
--build=x86_64-pc-linux-gnu and rebuilt.</para></caution>
<para>Ensure that all 197 tests in the test suite passed.
Check the results by issuing the following command:</para>

9
chapter08/grub.xml
View File

@ -40,11 +40,6 @@
<sect2 role="installation">
<title>Installation of GRUB</title>
<para>First, fix an issue introduced by binutils-2.36:</para>
<screen><userinput remap="pre">sed "s/gold-version/&amp; -R .note.gnu.property/" \
-i Makefile.in grub-core/Makefile.in</userinput></screen>
<para>Prepare GRUB for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
@ -78,7 +73,9 @@
<screen><userinput remap="make">make</userinput></screen>
<para>This package does not come with a test suite.</para>
<para>The test suite for this packages is not recommended. Most of
the tests depend on packages that are not available in the limited
LFS environment. To run the tests anyway, run <command>make check</command>.</para>
<para>Install the package:</para>

4
chapter08/meson.xml
View File

@ -63,7 +63,9 @@
<para>Install the package:</para>
<screen><userinput remap="install">python3 setup.py install --root=dest
cp -rv dest/* /</userinput></screen>
cp -rv dest/* /
install -vDm644 data/shell-completions/bash/meson /usr/share/bash-completion/completions/meson
install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/_meson</userinput></screen>
<variablelist>
<title>The meaning of the install parameters:</title>

4
chapter08/python.xml
View File

@ -42,6 +42,10 @@
<sect2 role="installation">
<title>Installation of Python 3</title>
<para>First, a header file needs to be fixed:</para>
<screen><userinput remap="pre">sed 's|cpython/||' -i Include/cpython/pystate.h</userinput></screen>
<para>Prepare Python for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \

29
chapter08/systemd.xml
View File

@ -46,17 +46,11 @@
<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
-->
<para>First, apply a patch to fix some regressions:</para>
<!-- For linux-5.11's API headers changing the rfkill_event structure -->
<para>First, apply a patch to fix some regressions and fix functionality
with future versions of the kernel:</para>
<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
<para>Create a symlink to work around the xsltproc command not being installed:</para>
<screen><userinput remap="pre">ln -sf /bin/true /usr/bin/xsltproc</userinput></screen>
<para>Set up the man pages:</para>
<screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch</userinput></screen>
<para>Remove tests that cannot be built in chroot:</para>
@ -95,7 +89,7 @@ meson --prefix=/usr \
-Drpmmacrosdir=no \
-Dhomed=false \
-Duserdb=false \
-Dman=true \
-Dman=false \
-Dmode=release \
-Ddocdir=/usr/share/doc/systemd-&systemd-version; \
..</userinput></screen>
@ -190,6 +184,15 @@ meson --prefix=/usr \
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Dman=false</parameter></term>
<listitem>
<para>Prevent the generation of man pages to avoid extra
dependencies. We will install pre-generated man pages for systemd
from a tarball later.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Dmode=release</parameter></term>
<listitem>
@ -208,9 +211,9 @@ meson --prefix=/usr \
<screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
<para>Remove an unnecessary symbolic link:</para>
<para>Install the man pages:</para>
<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
<para>Remove a useless directory:</para>

13
chapter09/networkd.xml
View File

@ -167,12 +167,13 @@ EOF</userinput></screen>
<sect3 id="resolv-conf-systemd-resolved">
<title>systemd-resolved Configuration</title>
<note><para>If using another means to configure your network
interfaces (ex: ppp, network-manager, etc.), or if using any type of
local resolver (ex: bind, dnsmasq, unbound, etc.), or any other software
that generates an <filename>/etc/resolv.conf</filename> (ex: resolvconf),
the <command>systemd-resolved</command> service should not be
used.</para></note>
<note><para>If using methods incompatible with systemd-resolved to
configure your network interfaces (ex: ppp, etc.), or if using any
type of local resolver (ex: bind, dnsmasq, unbound, etc.),
or any other software that generates an <filename>/etc/resolv.conf</filename>
(ex: a <command>resolvconf</command> program other than the one
provided by systemd), the <command>systemd-resolved</command> service
should not be used.</para></note>
<para>When using <command>systemd-resolved</command> for DNS
configuration, it creates the file

7
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20210301">
<!ENTITY version "SVN-20210326">
<!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 "20210301-systemd">
<!ENTITY versiond "20210326-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "March 1st, 2021">
<!ENTITY releasedate "March 26th, 2021">
<!ENTITY copyrightdate "1999-2021"><!-- jhalfs needs a literal dash, not &ndash; -->
@ -42,6 +42,7 @@
<!ENTITY gnu "https://ftp.gnu.org/gnu/">
<!ENTITY gnu-software "https://www.gnu.org/software/">
<!ENTITY alpha-gnu "https://alpha.gnu.org/gnu/">
<!ENTITY kernel "https://www.kernel.org/pub/">
<!ENTITY sourceforge "https://prdownloads.sourceforge.net/">
<!ENTITY savannah "https://download.savannah.gnu.org">

110
packages.ent
View File

@ -13,18 +13,18 @@
*-knl-* Package info for Kernel stuff
-->
<!ENTITY acl-version "2.2.53">
<!ENTITY acl-size "513 KB">
<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.gz">
<!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
<!ENTITY acl-version "2.3.1">
<!ENTITY acl-size "348 KB">
<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.xz">
<!ENTITY acl-md5 "95ce715fe09acca7c12d3306d0f076b2">
<!ENTITY acl-home "&savannah-nongnu;/projects/acl">
<!ENTITY acl-fin-du "2.8 MB">
<!ENTITY acl-fin-sbu "0.1 SBU">
<!ENTITY attr-version "2.4.48">
<!ENTITY attr-size "457 KB">
<!ENTITY attr-version "2.5.1">
<!ENTITY attr-size "456 KB">
<!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.tar.gz">
<!ENTITY attr-md5 "bc1e5cb5c96d99b24886f1f527d3bb3d">
<!ENTITY attr-md5 "ac1c5a7a084f0f83b8cace34211f64d8">
<!ENTITY attr-home "&savannah-nongnu;/projects/attr">
<!ENTITY attr-fin-du "4.2 MB">
<!ENTITY attr-fin-sbu "less than 0.1 SBU">
@ -57,10 +57,10 @@
<!ENTITY bash-fin-du "51 MB">
<!ENTITY bash-fin-sbu "1.6 SBU">
<!ENTITY bc-version "3.3.0">
<!ENTITY bc-size "225 KB">
<!ENTITY bc-version "3.3.4">
<!ENTITY bc-size "228 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
<!ENTITY bc-md5 "452ae2d467b1d7212bb7896c0c689825">
<!ENTITY bc-md5 "1b6dd492cc1f04e3df4d83493f362768">
<!ENTITY bc-home "https://git.yzena.com/gavin/bc">
<!ENTITY bc-fin-du "6.7 MB">
<!ENTITY bc-fin-sbu "less than 0.1 SBU">
@ -77,10 +77,10 @@
<!ENTITY binutils-fin-du "4.9 GB">
<!ENTITY binutils-fin-sbu "6.2 SBU">
<!ENTITY bison-version "3.7.5">
<!ENTITY bison-size "2,561 KB">
<!ENTITY bison-version "3.7.6">
<!ENTITY bison-size "2,566 KB">
<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
<!ENTITY bison-md5 "9b762dc24a6723f86d14d957d3deeb90">
<!ENTITY bison-md5 "d61aa92e3562cb7292b004ce96173cf7">
<!ENTITY bison-home "&gnu-software;bison/">
<!ENTITY bison-tmp-du "52 MB">
<!ENTITY bison-tmp-sbu "0.3 SBU">
@ -139,10 +139,10 @@
<!ENTITY diffutils-fin-du "33 MB">
<!ENTITY diffutils-fin-sbu "0.4 SBU">
<!ENTITY e2fsprogs-version "1.46.1">
<!ENTITY e2fsprogs-size "9,269 KB">
<!ENTITY e2fsprogs-version "1.46.2">
<!ENTITY e2fsprogs-size "9,2675 KB">
<!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
<!ENTITY e2fsprogs-md5 "8c52585522b7ca6bdae2bdecba27b3a4">
<!ENTITY e2fsprogs-md5 "e8ef5fa3b72557be5e9fe564a25da6eb">
<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
<!ENTITY e2fsprogs-fin-du "102 MB">
<!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.5 SBU on an SSD">
@ -162,10 +162,10 @@
<!ENTITY eudev-fin-du "82 MB">
<!ENTITY eudev-fin-sbu "0.2 SBU">
<!ENTITY expat-version "2.2.10">
<!ENTITY expat-size "416 KB">
<!ENTITY expat-version "2.3.0">
<!ENTITY expat-size "424 KB">
<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
<!ENTITY expat-md5 "e0fe49a6b3480827c9455e4cfc799133">
<!ENTITY expat-md5 "1c1b523a8d917e6d9f7af4f8881d8ec5">
<!ENTITY expat-home "https://libexpat.github.io/">
<!ENTITY expat-fin-du "14 MB">
<!ENTITY expat-fin-sbu "0.1 SBU">
@ -181,7 +181,7 @@
<!ENTITY file-version "5.39">
<!ENTITY file-size "932 KB">
<!ENTITY file-url "http://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
<!ENTITY file-url "https://astron.com/pub/file/file-&file-version;.tar.gz">
<!ENTITY file-md5 "1c450306053622803a25647d88f80f25">
<!ENTITY file-home "https://www.darwinsys.com/file/">
<!ENTITY file-tmp-du "31 MB">
@ -301,10 +301,11 @@
<!ENTITY groff-fin-du "96 MB">
<!ENTITY groff-fin-sbu "0.5 SBU">
<!ENTITY grub-version "2.04">
<!ENTITY grub-size "6,245 KB">
<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
<!ENTITY grub-md5 "5aaca6713b47ca2456d8324a58755ac7">
<!ENTITY grub-version "2.06~rc1">
<!ENTITY grub-size "6,391 KB">
<!--<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">-->
<!ENTITY grub-url "https://alpha.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
<!ENTITY grub-md5 "3c222b51347c182d655f9b94d5b56582">
<!ENTITY grub-home "&gnu-software;grub/">
<!ENTITY grub-fin-du "154 MB">
<!ENTITY grub-fin-sbu "0.7 SBU">
@ -319,10 +320,10 @@
<!ENTITY gzip-fin-du "19 MB">
<!ENTITY gzip-fin-sbu "0.1 SBU">
<!ENTITY iana-etc-version "20210202">
<!ENTITY iana-etc-version "20210304">
<!ENTITY iana-etc-size "578 KB">
<!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
<!ENTITY iana-etc-md5 "1c193a4d6ca36274570d1505140a7bee">
<!ENTITY iana-etc-md5 "db2d94cf0d1115c0107ae2aed966dbee">
<!ENTITY iana-etc-home "https://www.iana.org/protocols">
<!ENTITY iana-etc-fin-du "4.7 MB">
<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@ -343,10 +344,10 @@
<!ENTITY intltool-fin-du "1.5 MB">
<!ENTITY intltool-fin-sbu "less than 0.1 SBU">
<!ENTITY iproute2-version "5.10.0">
<!ENTITY iproute2-size "781 KB">
<!ENTITY iproute2-version "5.11.0">
<!ENTITY iproute2-size "803 KB">
<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
<!ENTITY iproute2-md5 "19ffea480a21e600453776b7225f3319">
<!ENTITY iproute2-md5 "a3c6b09590c0bd120f0ab0b6e36187a8">
<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
<!ENTITY iproute2-fin-du "15 MB">
<!ENTITY iproute2-fin-sbu "0.2 SBU">
@ -391,10 +392,10 @@
<!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
<!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
<!ENTITY libcap-version "2.48">
<!ENTITY libcap-size "130 KB">
<!ENTITY libcap-version "2.49">
<!ENTITY libcap-size "137 KB">
<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
<!ENTITY libcap-md5 "ca71693a9abe4e0ad9cc33a755ee47e0">
<!ENTITY libcap-md5 "b43ae3690fe4d2cb32e4d25c0983ecd3">
<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
<!ENTITY libcap-fin-du "45 MB">
<!ENTITY libcap-fin-sbu "less than 0.1 SBU">
@ -424,13 +425,13 @@
<!ENTITY libtool-fin-sbu "1.6 SBU">
<!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "10">
<!ENTITY linux-patch-version "17">
<!ENTITY linux-minor-version "11">
<!ENTITY linux-patch-version "10">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "113,548 KB">
<!ENTITY linux-size "114,888 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "4908707ed841923d8d1814130d5c380f">
<!ENTITY linux-md5 "a74b23a7d91e3d155062c71573d5381b">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
@ -472,10 +473,10 @@
<!ENTITY man-db-fin-du "40 MB">
<!ENTITY man-db-fin-sbu "0.4 SBU">
<!ENTITY man-pages-version "5.10">
<!ENTITY man-pages-size "1,707 KB">
<!ENTITY man-pages-version "5.11">
<!ENTITY man-pages-size "1,720 KB">
<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
<!ENTITY man-pages-md5 "4ae3f74a1beddd919936e1058642644c">
<!ENTITY man-pages-md5 "9f40e8fff6766563837d98d7d7c6e19b">
<!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
<!ENTITY man-pages-fin-du "4.7 MB">
<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
@ -522,10 +523,10 @@
<!ENTITY ninja-fin-du "79 MB">
<!ENTITY ninja-fin-sbu "0.2 SBU">
<!ENTITY openssl-version "1.1.1j">
<!ENTITY openssl-size "9,593 KB">
<!ENTITY openssl-version "1.1.1k">
<!ENTITY openssl-size "9,596 KB">
<!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
<!ENTITY openssl-md5 "cccaa064ed860a2b4d1303811bf5c682">
<!ENTITY openssl-md5 "c4e7d95f782b08116afa27b30393dd27">
<!ENTITY openssl-home "https://www.openssl.org/">
<!ENTITY openssl-fin-du "154 MB">
<!ENTITY openssl-fin-sbu "2.2 SBU">
@ -638,17 +639,18 @@
<!--<!ENTITY systemd-url "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
<!ENTITY systemd-md5 "b0d6e603b814908acc69db29bbfb023c">
<!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/">
<!ENTITY systemd-man-version "247-2">
<!ENTITY systemd-man-size "612 KB">
<!--<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
<!ENTITY systemd-man-md5 "438c98be200e1c3b308e58a3399d4465">
<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
<!ENTITY systemd-man-md5 "7d8a53105b7a205f2863e360d9a23f95">
<!ENTITY systemd-fin-du "264 MB">
<!ENTITY systemd-fin-sbu "1.8 SBU">
<!ENTITY sysvinit-version "2.98">
<!ENTITY sysvinit-size "125 KB">
<!ENTITY sysvinit-version "2.99">
<!ENTITY sysvinit-size "124 KB">
<!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
<!ENTITY sysvinit-md5 "e3254f7622ea5cf2322b1b386a98ba59">
<!ENTITY sysvinit-md5 "6abc0ea61b8dd4a41b4e931a43b1bb90">
<!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
<!ENTITY sysvinit-fin-du "1.4 MB">
<!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
@ -702,19 +704,19 @@
<!ENTITY util-linux-size "5,223 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 "f78419af679ac9678190ad961eb3cf27">
<!ENTITY util-linux-home "http://freshmeat.sourceforge.net/projects/util-linux">
<!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
<!ENTITY util-linux-tmp-du "134 MB">
<!ENTITY util-linux-tmp-sbu "0.7 SBU">
<!ENTITY util-linux-fin-du "262 MB">
<!ENTITY util-linux-fin-sbu "1.1 SBU">
<!ENTITY vim-version "8.2.2433">
<!ENTITY vim-version "8.2.2604">
<!ENTITY vim-majmin "82">
<!ENTITY vim-docdir "vim/vim82">
<!ENTITY vim-size "15,051 KB">
<!ENTITY vim-size "15,084 KB">
<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
<!ENTITY vim-md5 "a26555c8919cf40938d2428d834bf913">
<!ENTITY vim-md5 "b9b50ddd0327cef5f1985b0222b8473f">
<!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-fin-du "208 MB">
<!ENTITY vim-fin-sbu "2.0 SBU">
@ -745,10 +747,10 @@
<!ENTITY zlib-fin-du "5.0 MB">
<!ENTITY zlib-fin-sbu "less than 0.1 SBU">
<!ENTITY zstd-version "1.4.8">
<!ENTITY zstd-size "1,762 KB">
<!ENTITY zstd-version "1.4.9">
<!ENTITY zstd-size "1,779 KB">
<!ENTITY zstd-url "https://github.com/facebook/zstd/releases/download/v&zstd-version;/zstd-&zstd-version;.tar.gz">
<!ENTITY zstd-md5 "e873db7cfa5ef05832e6d55a5a572840">
<!ENTITY zstd-md5 "eb718b8aae0302cabe20f968e500534d">
<!ENTITY zstd-home "https://facebook.github.io/zstd/">
<!ENTITY zstd-fin-du "59 MB">
<!ENTITY zstd-fin-sbu "1.1 SBU">

6
patches.ent
View File

@ -67,6 +67,6 @@
<!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
<!ENTITY systemd-upstream-fixes-patch-md5 "573a166f3620875208f78bf4dc431c8b">
<!ENTITY systemd-upstream-fixes-patch-size "8 KB">
<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-2.patch">
<!ENTITY systemd-upstream-fixes-patch-md5 "7afe3d13464ae7d20dbe5e6f0fb8ccd3">
<!ENTITY systemd-upstream-fixes-patch-size "12 KB">