gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-08-10 21:45:58 +01: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@12107 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2021-02-01 08:37:19 +00:00
parent 3e73c5dd3b
commit 5e06d04285
30 changed files with 257 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootscripts/ChangeLog
View File

@ -1,3 +1,6 @@
2021-01-13 Xi Ruoyao <xry111@mengyan1223.wang>
* Use /run instead of deprecated /var/run
2020-10-02 DJ Lucas <dj@linuxfromscratch.org>
* make $local_fs a Should-Stop dependency of swap to allow clean install

10
bootscripts/lfs/init.d/cleanfs
View File

@ -21,8 +21,8 @@
# Default-Start: S
# Default-Stop:
# Short-Description: Cleans temporary directories early in the boot process.
# Description: Cleans temporary directories /var/run, /var/lock, and
# optionally, /tmp. cleanfs also creates /var/run/utmp
# Description: Cleans temporary directories /run, /var/lock, and
# optionally, /tmp. cleanfs also creates /run/utmp
# and any files defined in /etc/sysconfig/createfiles.
# X-LFS-Provided-By: LFS
### END INIT INFO
@ -95,11 +95,11 @@ case "${1}" in
find . -xdev -mindepth 1 ! -name lost+found -delete || failed=1
fi
> /var/run/utmp
> /run/utmp
if grep -q '^utmp:' /etc/group ; then
chmod 664 /var/run/utmp
chgrp utmp /var/run/utmp
chmod 664 /run/utmp
chgrp utmp /run/utmp
fi
(exit ${failed})

6
bootscripts/lfs/init.d/rc
View File

@ -142,7 +142,7 @@ fi
[ "${interactive}" != "i" ] && interactive=""
# Read the state file if it exists from runlevel S
[ -r /var/run/interactive ] && source /var/run/interactive
[ -r /run/interactive ] && source /run/interactive
# Attempt to stop all services started by the previous runlevel,
# and killed in this runlevel
@ -217,9 +217,9 @@ done
# Store interactive variable on switch from runlevel S and remove if not
if [ "${runlevel}" == "S" -a "${interactive}" == "i" ]; then
echo "interactive=\"i\"" > /var/run/interactive
echo "interactive=\"i\"" > /run/interactive
else
rm -f /var/run/interactive 2> /dev/null
rm -f /run/interactive 2> /dev/null
fi
# Copy the boot log on initial boot only

12
bootscripts/lfs/lib/services/init-functions
View File

@ -358,8 +358,8 @@ killproc()
prefix=`echo "${program}" | sed 's/[^/]*$//'`
progname=`echo "${program}" | sed "s@${prefix}@@"`
if [ -e "/var/run/${progname}.pid" ]; then
rm -f "/var/run/${progname}.pid" 2> /dev/null
if [ -e "/run/${progname}.pid" ]; then
rm -f "/run/${progname}.pid" 2> /dev/null
fi
else
if [ -e "${pidfile}" ]; then rm -f "${pidfile}" 2> /dev/null; fi
@ -434,8 +434,8 @@ pidofproc()
fi
# If a PID file exists with that name, assume that is it.
if [ -e "/var/run/${progname}.pid" ]; then
pidfile="/var/run/${progname}.pid"
if [ -e "/run/${progname}.pid" ]; then
pidfile="/run/${progname}.pid"
fi
fi
@ -528,9 +528,9 @@ statusproc()
/bin/echo -e "${INFO}${base} is running with Process" \
"ID(s) ${pidlist}.${NORMAL}"
else
if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
if [ -n "${base}" -a -e "/run/${base}.pid" ]; then
/bin/echo -e "${WARNING}${1} is not running but" \
"/var/run/${base}.pid exists.${NORMAL}"
"/run/${base}.pid exists.${NORMAL}"
else
if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
/bin/echo -e "${WARNING}${1} is not running" \

96
chapter01/changelog.xml
View File

@ -44,6 +44,102 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<itemizedlist>
<para>2021-02-01</para>
<listitem>
<para>[bdubbs] - Update to vim-8.2.2433. Addresses
<ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iana-etc-20210115. Addresses
<ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bc-3.2.5. Fixes
<ulink url="&lfs-ticket-root;4797">#4797</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to e2fsprogs-1.46.0. Fixes
<ulink url="&lfs-ticket-root;4796">#4796</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to autoconf-2.71. Fixes
<ulink url="&lfs-ticket-root;4795">#4795</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to tzdata-2021a. Fixes
<ulink url="&lfs-ticket-root;4793">#4793</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to perl-5.32.1. Fixes
<ulink url="&lfs-ticket-root;4792">#4792</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to libcap-2.47. Fixes
<ulink url="&lfs-ticket-root;4791">#4791</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bison-3.7.5. Fixes
<ulink url="&lfs-ticket-root;4790">#4790</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to binutils-2.36. Fixes
<ulink url="&lfs-ticket-root;4789">#4789</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.10.12. Fixes
<ulink url="&lfs-ticket-root;4786">#4786</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2020-01-16</para>
<itemizedlist>
<listitem>
<para>[renodr] - Update to findutils-4.8.0. Fixes
<ulink url="&lfs-ticket-root;4785">#4785</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to kmod-28. Fixes
<ulink url="&lfs-ticket-root;4784">#4784</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to tar-1.33. Fixes
<ulink url="&lfs-ticket-root;4783">#4783</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to linux-5.10.7. Fixes
<ulink url="&lfs-ticket-root;4782">#4782</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to meson-0.56.2. Fixes
<ulink url="&lfs-ticket-root;4781">#4781</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to tcl-8.6.11. Fixes
<ulink url="&lfs-ticket-root;4780">#4780</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-01-13</para>
<itemizedlist>
<listitem>
<para>[xry111] - Fix util-linux uuidd socket path.</para>
</listitem>
<listitem>
<para>[xry111] - Remove various references to deprecated
/var/run, use /run instead.</para>
</listitem>
<listitem revision="sysv">
<para>[xry111] - Update to lfs-bootscripts-20210113.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<itemizedlist>
<para>2021-01-01</para>

28
chapter01/whatsnew.xml
View File

@ -72,9 +72,9 @@
<!--<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>-->
@ -87,9 +87,9 @@
<!--<listitem>
<para>File-&file-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Findutils-&findutils-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Flex-&flex-version;</para>
</listitem>-->
@ -141,9 +141,9 @@
<listitem>
<para>Kbd-&kbd-version;</para>
</listitem>
<!--<listitem>
<listitem>
<para>Kmod-&kmod-version;</para>
</listitem>-->
</listitem>
<listitem>
<para>Less-&less-version;</para>
</listitem>
@ -201,9 +201,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>-->
@ -234,12 +234,12 @@
<listitem revision="sysv">
<para>SysVinit-&sysvinit-version;</para>
</listitem>
<!--<listitem>
<listitem>
<para>Tar-&tar-version;</para>
</listitem>-->
<!--<listitem>
</listitem>
<listitem>
<para>Tcl-&tcl-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Texinfo-&texinfo-version;</para>
</listitem>-->
@ -278,9 +278,9 @@
<itemizedlist>
<title>Added:</title>
<listitem><para></para></listitem> <!-- satisfy build -->
<listitem>
<!--<listitem>
<para>meson-0.56.0-upstream_fix-1.patch</para>
</listitem>
</listitem>-->
<listitem>
<para>systemd-247-upstream_fixes-1.patch</para>
</listitem>

3
chapter03/patches.xml
View File

@ -84,6 +84,7 @@
</listitem>
</varlistentry>
<!--
<varlistentry>
<term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term>
<listitem>
@ -91,7 +92,7 @@
<para>MD5 sum: <literal>&meson-fix-patch-md5;</literal></para>
</listitem>
</varlistentry>
-->
<!--
<varlistentry>
<term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term>

2
chapter06/chapter06.xml
View File

@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
<!-- xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/ -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>

21
chapter06/zlib.xml
View File

@ -5,7 +5,7 @@
%general-entities;
]>
<sect1 id="ch-tools-zlib" role="wrap" arch="ml_32,ml_x32,ml_all">
<sect1 id="ch-tools-zlib" role="wrap">
<?dbhtml filename="zlib.html"?>
<sect1info condition="script">
@ -49,20 +49,10 @@
<screen><userinput remap="make">make</userinput></screen>
<para>To test the results, issue:</para>
<screen><userinput remap="test">make check</userinput></screen>
<para>Install the package:</para>
<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
<para>The shared library needs to 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 $LFS/usr/lib/libz.so.* $LFS/lib
<screen><userinput remap="install">make DESTDIR=$LFS install
mv -v $LFS/usr/lib/libz.so.* $LFS/lib
ln -sfv ../../lib/$(readlink $LFS/usr/lib/libz.so) $LFS/usr/lib/libz.so</userinput></screen>
</sect2>
@ -124,8 +114,9 @@ rm -rf DESTDIR</userinput></screen>
</sect2><!-- mx32 -->
<sect2 role="content">
<title/>
<para>Details on this package are located in <xref linkend="contents-zlib" role="."/></para>
<title/>
<para>Details on this package are located in <xref linkend="contents-zlib" role="."/></para>
</sect2>
</sect1>

10
chapter07/createfiles.xml
View File

@ -19,7 +19,7 @@
</indexterm>
<indexterm zone="ch-tools-createfiles">
<primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
<primary sortas="e-/run/utmp">/run/utmp</primary>
</indexterm>
<indexterm zone="ch-tools-createfiles">
@ -61,7 +61,8 @@
<literal>root:x:0:0:root:/root:/bin/bash
bin:x:1:1:bin:/dev/null:/bin/false
daemon:x:6:6:Daemon User:/dev/null:/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/bin/false
uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/bin/false
nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
EOF</userinput></screen>
@ -69,7 +70,7 @@ EOF</userinput></screen>
<literal>root:x:0:0:root:/root:/bin/bash
bin:x:1:1:bin:/dev/null:/bin/false
daemon:x:6:6:Daemon User:/dev/null:/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/bin/false
systemd-bus-proxy:x:72:72:systemd Bus Proxy:/:/bin/false
systemd-journal-gateway:x:73:73:systemd Journal Gateway:/:/bin/false
systemd-journal-remote:x:74:74:systemd Journal Remote:/:/bin/false
@ -78,6 +79,7 @@ systemd-network:x:76:76:systemd Network Management:/:/bin/false
systemd-resolve:x:77:77:systemd Resolver:/:/bin/false
systemd-timesync:x:78:78:systemd Time Synchronization:/:/bin/false
systemd-coredump:x:79:79:systemd Core Dumper:/:/bin/false
uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/bin/false
nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
EOF</userinput></screen>
@ -109,6 +111,7 @@ messagebus:x:18:
input:x:24:
mail:x:34:
kvm:x:61:
uuidd:x:80:
wheel:x:97:
nogroup:x:99:
users:x:999:</literal>
@ -145,6 +148,7 @@ systemd-network:x:76:
systemd-resolve:x:77:
systemd-timesync:x:78:
systemd-coredump:x:79:
uuidd:x:80:
wheel:x:97:
nogroup:x:99:
users:x:999:</literal>

12
chapter07/util-linux.xml
View File

@ -58,7 +58,8 @@
--disable-runuser \
--disable-pylibmount \
--disable-static \
--without-python</userinput></screen>
--without-python \
runstatedir=/run</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@ -90,6 +91,15 @@
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>runstatedir=/run</parameter></term>
<listitem>
<para>This switch sets the location of the socket used by
<command>uuidd</command> and
<filename class="libraryfile">libuuid</filename> correctly.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Compile the package:</para>

10
chapter08/bc.xml
View File

@ -41,17 +41,21 @@
<sect2 role="installation">
<title>Installation of Bc</title>
<para>First, fix an error in the configure script::</para>
<screen><userinput remap="pre">sed -i '612d' configure.sh</userinput></screen>
<para>Prepare Bc for compilation:</para>
<screen><userinput remap="configure">PREFIX=/usr CC=gcc CFLAGS="-std=c99" ./configure.sh -G -O3</userinput></screen>
<screen><userinput remap="configure">PREFIX=/usr CC=gcc ./configure.sh -G -O3</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
<term><parameter>CC=gcc CFLAGS="-std=c99"</parameter></term>
<term><parameter>CC=gcc"</parameter></term>
<listitem>
<para>These parameters specify the compiler and the C standard to use.</para>
<para>These parameters specify the compiler to use.</para>
</listitem>
</varlistentry>

4
chapter08/gdbm.xml
View File

@ -75,6 +75,10 @@
<screen><userinput remap="test">make check</userinput></screen>
<para>
One test, <filename>VERSION</filename>, is known to fail.
</para>
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>

3
chapter08/kmod.xml
View File

@ -48,13 +48,14 @@
--sysconfdir=/etc \
--with-rootlibdir=/lib \
--with-xz \
--with-zstd \
--with-zlib</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
<term><parameter>--with-xz, --with-zlib</parameter></term>
<term><parameter>--with-xz, --with-zlib, --with-zstd</parameter></term>
<listitem>
<para>These options enable Kmod to handle compressed kernel modules.</para>
</listitem>

15
chapter08/libcap.xml
View File

@ -49,7 +49,7 @@
<para>Compile the package:</para>
<screen><userinput remap="make">make lib=lib</userinput></screen>
<screen><userinput remap="make">make prefix=/usr lib=lib</userinput></screen>
<variablelist>
<title>The meaning of the make option:</title>
@ -58,8 +58,8 @@
<term><parameter>lib=lib</parameter></term>
<listitem>
<para>This parameter sets the library directory to
<filename>/lib</filename> rather than
<filename>/lib64</filename> on x86_64. It has no effect on
<filename>/usr/lib</filename> rather than
<filename>/usr/lib64</filename> on x86_64. It has no effect on
x86.</para>
</listitem>
</varlistentry>
@ -69,13 +69,14 @@
<screen><userinput remap="test">make test</userinput></screen>
<para>Install the package and do some cleanup:</para>
<para>Install the package and make sure the essential libraries are in
the correct directory:</para>
<screen><userinput remap="install">make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install
<screen><userinput remap="install">make prefix=/usr lib=lib install
for libname in cap psx; do
chmod -v 755 /lib/lib${libname}.so.&libcap-version;
rm -v /lib/lib${libname}.so
mv -v /usr/lib/lib${libname}.so.* /lib
ln -sfv ../../lib/lib${libname}.so.2 /usr/lib/lib${libname}.so
chmod -v 755 /lib/lib${libname}.so.&libcap-version;
done</userinput></screen>
</sect2>

3
chapter08/meson.xml
View File

@ -48,11 +48,12 @@
<sect2 role="installation">
<title>Installation of Meson</title>
<!-- Applied in 0.56.2
<para>First, apply a patch that fixes an issue with pkgconfig files
for static libraries:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen>
-->
<para>Compile Meson with the following command:</para>
<screen><userinput remap="make">python3 setup.py build</userinput></screen>

6
chapter08/ninja.xml
View File

@ -58,11 +58,7 @@
<para>Using the <emphasis>optional</emphasis> procedure below allows a user to
limit the number of parallel processes via an environment variable,
NINJAJOBS. <command>For example</command>, setting:
<!--Using <command> here to make the output bold. We really don't want
users setting this now and experience shows that many users blindly
copy/paste anything in a box. -->
NINJAJOBS. <emphasis role="bold">For example</emphasis>, setting:
<screen>export NINJAJOBS=4</screen>

2
chapter08/python.xml
View File

@ -103,7 +103,7 @@ ln -sfv pip&python-minor; /usr/bin/pip3</userinput></screen>
<title>The meaning of the install commands:</title>
<!-- ====== Change 8m if Python minor version changes ======= -->
<varlistentry>
<term><command>chmod -v 755 /usr/lib/libpython3.{8.,}so</command></term>
<term><command>chmod -v 755 /usr/lib/libpython{&python-minor;,3}.so</command></term>
<listitem>
<para>Fix permissions for libraries to be consistent with other
libraries.</para>

3
chapter08/readline.xml
View File

@ -95,10 +95,9 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
<screen><userinput remap="install">make SHLIB_LIBS="-lncursesw" install</userinput></screen>
<para>Now move the dynamic libraries to a more appropriate location
and fix up some permissions and symbolic links:</para>
and fix up symbolic links:</para>
<screen><userinput remap="install">mv -v /usr/lib/lib{readline,history}.so.* /lib
chmod -v u+w /lib/lib{readline,history}.so.*
ln -sfv ../../lib/$(readlink /usr/lib/libreadline.so) /usr/lib/libreadline.so
ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</userinput></screen>

2
chapter08/revisedchroot.xml
View File

@ -77,7 +77,7 @@ find &usr-lib-mx32; -name \*.la -delete</userinput></screen>
<screen><userinput>find /usr -depth -name $(uname -m)-lfs-linux-gnu\* | xargs rm -rf</userinput></screen>
<para>The <filename class="directory">/tools</filename> directory can also
be removed to further gain some place:</para>
be removed to further gain some space:</para>
<screen><userinput>rm -rf /tools</userinput></screen>

4
chapter08/systemd.xml
View File

@ -66,7 +66,7 @@
<systemitem class="groupname">render</systemitem>, from the default udev
rules:</para>
<screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules.d/50-udev-default.rules.in</userinput></screen>
<screen><userinput remap="pre">sed -i 's/GROUP="render"/GROUP="video"/' rules.d/50-udev-default.rules.in</userinput></screen>
<para>Prepare systemd for compilation:</para>
@ -599,7 +599,7 @@ rm -f /usr/bin/xsltproc</userinput></screen>
<term><command>runlevel</command></term>
<listitem>
<para>Outputs the previous and the current run-level, as noted in the
last run-level record in <filename>/var/run/utmp</filename></para>
last run-level record in <filename>/run/utmp</filename></para>
<indexterm zone="ch-system-systemd runlevel">
<primary sortas="b-runlevel">runlevel</primary>
</indexterm>

2
chapter08/sysvinit.xml
View File

@ -185,7 +185,7 @@
<term><command>runlevel</command></term>
<listitem>
<para>Reports the previous and the current run-level, as noted in the
last run-level record in <filename>/var/run/utmp</filename></para>
last run-level record in <filename>/run/utmp</filename></para>
<indexterm zone="ch-system-sysvinit runlevel-sysv">
<primary sortas="b-runlevel">runlevel</primary>
</indexterm>

6
chapter08/tcl.xml
View File

@ -3,8 +3,8 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % general-entities SYSTEM "../general.ent">
%general-entities;
<!ENTITY tdbc-ver "1.1.1">
<!ENTITY itcl-ver "4.2.0">
<!ENTITY tdbc-ver "1.1.2">
<!ENTITY itcl-ver "4.2.1">
]>
<sect1 id="ch-tools-tcl" role="wrap">
@ -57,7 +57,7 @@
<para>First, unpack the documentation by issuing the following command:</para>
<screen><userinput remap="pre">tar -xf ../tcl8.6.10-html.tar.gz --strip-components=1</userinput></screen>
<screen><userinput remap="pre">tar -xf ../tcl&tcl-version;-html.tar.gz --strip-components=1</userinput></screen>
<para>Prepare Tcl for compilation:</para>

6
chapter08/util-linux.xml
View File

@ -64,7 +64,8 @@
--disable-static \
--without-python \
--without-systemd \
--without-systemdsystemunitdir</userinput></screen>
--without-systemdsystemunitdir \
runstatedir=/run</userinput></screen>
<screen revision="systemd"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
--docdir=/usr/share/doc/util-linux-&util-linux-version; \
@ -76,7 +77,8 @@
--disable-runuser \
--disable-pylibmount \
--disable-static \
--without-python</userinput></screen>
--without-python \
runstatedir=/run</userinput></screen>
<para>The --disable and --without options prevent warnings about
building components that require packages not in LFS or are

4
chapter08/zstd.xml
View File

@ -46,7 +46,9 @@
<screen><userinput remap="make">make</userinput></screen>
<para>This package does not come with a test suite.</para>
<para>To test the results, issue:</para>
<screen><userinput remap="test">make check</userinput></screen>
<para>Install the package:</para>

4
chapter09/bootscripts.xml
View File

@ -85,9 +85,9 @@
<term><command>cleanfs</command></term>
<listitem>
<para>Removes files that should not be preserved between reboots, such
as those in <filename class="directory">/var/run/</filename> and
as those in <filename class="directory">/run/</filename> and
<filename class="directory">/var/lock/</filename>; it re-creates
<filename>/var/run/utmp</filename> and removes the possibly present
<filename>/run/utmp</filename> and removes the possibly present
<filename>/etc/nologin</filename>, <filename>/fastboot</filename>, and
<filename>/forcefsck</filename> files</para>
<indexterm zone="ch-config-bootscripts cleanfs-bootscripts">

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20210101">
<!ENTITY version "SVN-20210201">
<!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 "20210101-systemd">
<!ENTITY versiond "20210201-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "January 1st, 2021">
<!ENTITY releasedate "February 1st, 2021">
<!ENTITY copyrightdate "1999-2021"><!-- jhalfs needs a literal dash, not &ndash; -->

11
lfs-latest.php
View File

@ -69,7 +69,8 @@ function find_even_max( $lines, $regex_match, $regex_replace )
function http_get_file( $url )
{
if ( ! preg_match( "/sourceforge/", $url ) )
if ( ! preg_match( "/sourceforge/", $url ) &&
! preg_match( "/psmisc/", $url ) )
{
exec( "curl --location --silent --max-time 30 $url", $dir );
@ -105,7 +106,7 @@ function get_packages( $package, $dirpath )
global $exceptions;
global $regex;
//if ( $package != "zstd" ) return 0; // Debug
//if ( $package != "psmisc" ) return 0; // Debug
if ( $package == "bc" ) $dirpath = "https://github.com/gavinhoward/bc/releases";
if ( $package == "check" ) $dirpath = "https://github.com/libcheck/check/releases";
@ -122,9 +123,7 @@ if ( $package == "meson" ) $dirpath = "https://github.com/mesonbuild/meson/
if ( $package == "mpc" ) $dirpath = "https://ftp.gnu.org/gnu/mpc";
if ( $package == "mpfr" ) $dirpath = "http://mpfr.loria.fr/mpfr-current";
if ( $package == "ninja" ) $dirpath = "https://github.com/ninja-build/ninja/releases";
//if ( $package == "procps-ng" ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
if ( $package == "procps-ng" ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
//if ( $package == "psmisc" ) $dirpath = "http://sourceforge.net/projects/$package/files";
if ( $package == "psmisc" ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
if ( $package == "Python" ) $dirpath = "https://www.python.org/downloads/source/";
if ( $package == "shadow" ) $dirpath = "https://github.com/shadow-maint/shadow/releases";
@ -281,10 +280,10 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
}
if ( $package == "procps-ng" )
return find_max( $lines, "/v\d/", "/^.*v([\d\.]+).*$/" );
return find_max( $lines, "/v\d/", "/^.*v([\d\.]+) .*$/" );
if ( $package == "psmisc" )
return find_max( $lines, "/^v/", "/^v([\d\.]+).*$/" );
return find_max( $lines, "/v\d/", "/^.*v([\d\.]+) .*$/" );
if ( $package == "grub" )
return find_max( $lines, "/grub/", "/^.*grub-(\d\..*).tar.xz.*$/" );

102
packages.ent
View File

@ -29,10 +29,10 @@
<!ENTITY attr-fin-du "4.2 MB">
<!ENTITY attr-fin-sbu "less than 0.1 SBU">
<!ENTITY autoconf-version "2.70">
<!ENTITY autoconf-size "1,315 KB">
<!ENTITY autoconf-version "2.71">
<!ENTITY autoconf-size "1,263 KB">
<!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz">
<!ENTITY autoconf-md5 "e4453011b18da194b565bf282948f997">
<!ENTITY autoconf-md5 "12cfa1687ffa2606337efe1a64416106">
<!ENTITY autoconf-home "&gnu-software;autoconf/">
<!ENTITY autoconf-fin-du "79 MB">
<!ENTITY autoconf-fin-sbu-tests "3.5">
@ -57,18 +57,18 @@
<!ENTITY bash-fin-du "48 MB">
<!ENTITY bash-fin-sbu "2.4 SBU">
<!ENTITY bc-version "3.2.4">
<!ENTITY bc-size "221 KB">
<!ENTITY bc-version "3.2.5">
<!ENTITY bc-size "229 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
<!ENTITY bc-md5 "03d74ea465bb4181f683d1cd53d432e1">
<!ENTITY bc-md5 "44cd2eb1ad793b6d95ea5fc7b9293cd4">
<!ENTITY bc-home "https://git.yzena.com/gavin/bc">
<!ENTITY bc-fin-du "6.5 MB">
<!ENTITY bc-fin-sbu "less than 0.1 SBU">
<!ENTITY binutils-version "2.35.1">
<!ENTITY binutils-size "21,516 KB">
<!ENTITY binutils-version "2.36">
<!ENTITY binutils-size "22,227 KB">
<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz">
<!ENTITY binutils-md5 "7126f370ffbd46c08fcc5ce7aee2805d">
<!ENTITY binutils-md5 "f6114b8c40096f9aa9f64fe1ab8ba087">
<!ENTITY binutils-home "&gnu-software;binutils/">
<!ENTITY binutils-tmpp1-du "617 MB">
<!ENTITY binutils-tmpp1-sbu "1 SBU">
@ -77,10 +77,10 @@
<!ENTITY binutils-fin-du "4.8 GB">
<!ENTITY binutils-fin-sbu "6.5 SBU">
<!ENTITY bison-version "3.7.4">
<!ENTITY bison-size "2,556 KB">
<!ENTITY bison-version "3.7.5">
<!ENTITY bison-size "2,561 KB">
<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
<!ENTITY bison-md5 "bcd5f37396b061f2f00e5b1db58172ed">
<!ENTITY bison-md5 "9b762dc24a6723f86d14d957d3deeb90">
<!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.45.6">
<!ENTITY e2fsprogs-size "7,753 KB">
<!ENTITY e2fsprogs-version "1.46.0">
<!ENTITY e2fsprogs-size "9,260 KB">
<!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
<!ENTITY e2fsprogs-md5 "cccfb706d162514e4f9dbfbc9e5d65ee">
<!ENTITY e2fsprogs-md5 "8c8ff667537559be8d31da4b6128314a">
<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
<!ENTITY e2fsprogs-fin-du "106 MB">
<!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.7 SBU on an SSD">
@ -181,7 +181,7 @@
<!ENTITY file-version "5.39">
<!ENTITY file-size "932 KB">
<!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
<!ENTITY file-url "http://ftp.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 "21 MB">
@ -189,10 +189,10 @@
<!ENTITY file-fin-du "14 MB">
<!ENTITY file-fin-sbu "0.1 SBU">
<!ENTITY findutils-version "4.7.0">
<!ENTITY findutils-size "1,851 KB">
<!ENTITY findutils-version "4.8.0">
<!ENTITY findutils-size "1,940 KB">
<!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.xz">
<!ENTITY findutils-md5 "731356dec4b1109b812fecfddfead6b2">
<!ENTITY findutils-md5 "eeefe2e6380931a77dfa6d9350b43186">
<!ENTITY findutils-home "&gnu-software;findutils/">
<!ENTITY findutils-tmp-du "40 MB">
<!ENTITY findutils-tmp-sbu "0.2 SBU">
@ -319,10 +319,10 @@
<!ENTITY gzip-fin-du "19 MB">
<!ENTITY gzip-fin-sbu "0.1 SBU">
<!ENTITY iana-etc-version "20201229">
<!ENTITY iana-etc-version "20210115">
<!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 "19f35177c0bd701f4e52bfc9ce068f5d">
<!ENTITY iana-etc-md5 "da28c229070e790dee9eb234b34cec15">
<!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">
@ -367,10 +367,10 @@
<!ENTITY kbd-fin-du "32 MB">
<!ENTITY kbd-fin-sbu "0.2 SBU">
<!ENTITY kmod-version "27">
<!ENTITY kmod-size "537 KB">
<!ENTITY kmod-version "28">
<!ENTITY kmod-size "540 KB">
<!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
<!ENTITY kmod-md5 "3973a74786670d3062d89a827e266581">
<!ENTITY kmod-md5 "0a2b887b1b3dfb8c0b3f41f598203e56">
<!ENTITY kmod-home " ">
<!ENTITY kmod-fin-du "13 MB">
<!ENTITY kmod-fin-sbu "0.1 SBU">
@ -383,7 +383,7 @@
<!ENTITY less-fin-du "4.1 MB">
<!ENTITY less-fin-sbu "less than 0.1 SBU">
<!ENTITY lfs-bootscripts-version "20201019"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-version "20210113"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">
@ -391,17 +391,17 @@
<!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
<!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
<!ENTITY libcap-version "2.46">
<!ENTITY libcap-size "127 KB">
<!ENTITY libcap-version "2.47">
<!ENTITY libcap-size "129 KB">
<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
<!ENTITY libcap-md5 "58ffae7d6a3226d6648cdb5d6f389cbf">
<!ENTITY libcap-md5 "44f4a73b0eb8aca004dc1a60cae8f674">
<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
<!ENTITY libcap-fin-du "11 MB">
<!ENTITY libcap-fin-sbu "less than 0.1 SBU">
<!ENTITY libffi-version "3.3">
<!ENTITY libffi-size "1,275 KB">
<!ENTITY libffi-url "ftp://sourceware.org/pub/libffi/libffi-&libffi-version;.tar.gz">
<!ENTITY libffi-url "https://sourceware.org/pub/libffi/libffi-&libffi-version;.tar.gz">
<!ENTITY libffi-md5 "6313289e32f1d38a9df4770b014a2ca7">
<!ENTITY libffi-home "https://sourceware.org/libffi/">
<!ENTITY libffi-fin-du "10 MB">
@ -425,12 +425,12 @@
<!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "10">
<!ENTITY linux-patch-version "4">
<!ENTITY linux-patch-version "12">
<!--<!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,880 KB">
<!ENTITY linux-size "113,583 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "650f047a5fc947276ef6ae513b773c9b">
<!ENTITY linux-md5 "34c93a9e96f597872e3f2a86b87f33bf">
<!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,
@ -480,10 +480,10 @@
<!ENTITY man-pages-fin-du "31 MB">
<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
<!ENTITY meson-version "0.56.0">
<!ENTITY meson-size "1,753 KB">
<!ENTITY meson-version "0.56.2">
<!ENTITY meson-size "1,756 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
<!ENTITY meson-md5 "67ce2c0c3eab1b8ee9ddaa1c5143e7c0">
<!ENTITY meson-md5 "52b57dc223e39ae8d84f23a74296a89a">
<!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-fin-du "34 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU">
@ -542,12 +542,12 @@
<!ENTITY perl-version-major "5">
<!ENTITY perl-version-minor "32">
<!ENTITY perl-version-patch "0">
<!ENTITY perl-version-patch "1">
<!ENTITY perl-version-min "&perl-version-major;.&perl-version-minor;">
<!ENTITY perl-version "&perl-version-major;.&perl-version-minor;.&perl-version-patch;">
<!ENTITY perl-size "12,420 KB">
<!ENTITY perl-size "12,316 KB">
<!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
<!ENTITY perl-md5 "3812cd9a096a72cb27767c7e2e40441c">
<!ENTITY perl-md5 "7f104064b906ad8c7329ca5e409a32d7">
<!ENTITY perl-home "https://www.perl.org/">
<!ENTITY perl-tmp-du "267 MB">
<!ENTITY perl-tmp-sbu "1.8 SBU">
@ -653,25 +653,25 @@
<!ENTITY sysvinit-fin-du "1.4 MB">
<!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
<!ENTITY tar-version "1.32">
<!ENTITY tar-size "2,055 KB">
<!ENTITY tar-version "1.33">
<!ENTITY tar-size "2,176 KB">
<!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.xz">
<!ENTITY tar-md5 "83e38700a80a26e30b2df054e69956e5">
<!ENTITY tar-md5 "e536d6621f9ad06df65c177348bb1215">
<!ENTITY tar-home "&gnu-software;tar/">
<!ENTITY tar-tmp-du "39 MB">
<!ENTITY tar-tmp-sbu "0.2 SBU">
<!ENTITY tar-fin-du "39 MB">
<!ENTITY tar-fin-sbu "2.0 SBU">
<!ENTITY tcl-version "8.6.10">
<!ENTITY tcl-version "8.6.11">
<!ENTITY tcl-major-version "8.6">
<!ENTITY tcl-size "9,907 KB">
<!ENTITY tcl-size "10,020 KB">
<!ENTITY tcl-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz">
<!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
<!ENTITY tcl-md5 "8a4c004f48984a03a7747e9ba06e4da4">
<!ENTITY tcl-home "http://tcl.sourceforge.net/">
<!ENTITY tcl-docs-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-html.tar.gz">
<!ENTITY tcl-docs-md5 "a012711241ba3a5bd4a04e833001d489">
<!ENTITY tcl-docs-size "1,171 KB">
<!ENTITY tcl-docs-md5 "e358a9140c3a171e42f18c8a7f6a36ea">
<!ENTITY tcl-docs-size "1,172 KB">
<!ENTITY tcl-tmp-du "83 MB">
<!ENTITY tcl-tmp-sbu "4.0 SBU">
@ -685,10 +685,10 @@
<!ENTITY texinfo-fin-du "104 MB">
<!ENTITY texinfo-fin-sbu "0.8 SBU">
<!ENTITY tzdata-version "2020f">
<!ENTITY tzdata-version "2021a">
<!ENTITY tzdata-size "403 KB">
<!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
<!ENTITY tzdata-md5 "e7d618fe3fd16fdd290abc5e74cb264e">
<!ENTITY tzdata-md5 "20eae7d1da671c6eac56339c8df85bbd">
<!ENTITY tzdata-home "https://www.iana.org/time-zones">
<!ENTITY udev-lfs-version "udev-lfs-20171102">
@ -708,13 +708,13 @@
<!ENTITY util-linux-fin-du "260 MB">
<!ENTITY util-linux-fin-sbu "1.2 SBU">
<!ENTITY vim-version "8.2.2253">
<!ENTITY vim-version "8.2.2433">
<!ENTITY vim-majmin "82">
<!ENTITY vim-docdir "vim/vim82">
<!ENTITY vim-size "15,011 KB">
<!ENTITY vim-size "15,051 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 "497890e1f563a65c6f7594c0b0f5c0b9">
<!ENTITY vim-md5 "a26555c8919cf40938d2428d834bf913">
<!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-fin-du "201 MB">
<!ENTITY vim-fin-sbu "2.2 SBU">

4
patches.ent
View File

@ -53,11 +53,11 @@
<!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621">
<!ENTITY libpipeline-checks-patch-size "22 KB">
-->
<!--
<!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-1.patch">
<!ENTITY meson-fix-patch-md5 "589012d95c80f256e569598caf27c9a6">
<!ENTITY meson-fix-patch-size "2.2 KB">
-->
<!--
<!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch">
<!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">