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

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2023-02-20 00:30:12 +01:00
commit 4096cdff24
7 changed files with 108 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
appendices/dependencies.xml
View File

@ -464,7 +464,9 @@
<segmentedlist id="coreutils-before"> <segmentedlist id="coreutils-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, Diffutils, Eudev, Findutils, and Man-DB</seg> <seg>Bash, Diffutils, <phrase revision="sysv">Eudev, </phrase>
Findutils, <phrase revision="sysv">and </phrase>Man-DB<phrase
revision="systemd">, and Systemd</phrase></seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -480,42 +482,45 @@
</segmentedlist> </segmentedlist>
<!-- Begin D-Bus dependency info --> <!-- Begin D-Bus dependency info -->
<!--
<bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
<segmentedlist> <bridgehead renderas="sect2" id="dbus-dep" revision="systemd">D-Bus</bridgehead>
<segmentedlist id="dbus-depends" revision="systemd">
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
Make, Sed, and Util-linux</seg> Make, Sed, Systemd, and Util-linux</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist> <segmentedlist id="dbus-rundeps" revision="systemd">
<segtitle>&runtime;</segtitle>
<seglistitem>
<seg>Glibc and Systemd</seg>
</seglistitem>
</segmentedlist>
<segmentedlist id="dbus-testdeps" revision="systemd">
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>Several packages in BLFS</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist> <segmentedlist id="dbus-before" revision="systemd">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist> <segmentedlist id="dbus-optdeps" revision="systemd">
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>Xorg Libs</seg> <seg><ulink url="&blfs-book;x/x7lib.html">Xorg Libraries</ulink></seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
-->
<!-- Begin DejaGNU dependency info --> <!-- Begin DejaGNU dependency info -->
<bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead> <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
@ -634,9 +639,9 @@
</segmentedlist> </segmentedlist>
<!-- Begin Eudev dependency info --> <!-- Begin Eudev dependency info -->
<bridgehead renderas="sect2" id="eudev-dep">Eudev</bridgehead> <bridgehead renderas="sect2" id="eudev-dep" revision="sysv">Eudev</bridgehead>
<segmentedlist id="eudev-depends"> <segmentedlist id="eudev-depends" revision="sysv">
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, Make, <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, Make,
@ -644,28 +649,28 @@
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="eudev-rundeps"> <segmentedlist id="eudev-rundeps" revision="sysv">
<segtitle>&runtime;</segtitle> <segtitle>&runtime;</segtitle>
<seglistitem> <seglistitem>
<seg>Glibc, Kmod, Xz, Util-linux, and Zlib.</seg> <seg>Glibc, Kmod, Xz, Util-linux, and Zlib.</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="eudev-testdeps"> <segmentedlist id="eudev-testdeps" revision="sysv">
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="eudev-before"> <segmentedlist id="eudev-before" revision="sysv">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="eudev-optdeps"> <segmentedlist id="eudev-optdeps" revision="sysv">
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
@ -1579,7 +1584,8 @@
<segmentedlist id="kmod-before"> <segmentedlist id="kmod-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Eudev</seg> <seg><phrase revision="sysv">Eudev</phrase>
<phrase revision="systemd">Systemd</phrase></seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1626,6 +1632,7 @@
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg> <seg>
<ulink url="&blfs-book;general/pcre2.html">PCRE2</ulink> or
<ulink url="&blfs-book;general/pcre.html">PCRE</ulink> <ulink url="&blfs-book;general/pcre.html">PCRE</ulink>
</seg> </seg>
</seglistitem> </seglistitem>
@ -2437,7 +2444,7 @@
<segmentedlist id="pkgconfig-depends"> <segmentedlist id="pkgconfig-depends">
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Popt, <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
and Sed</seg> and Sed</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -2716,37 +2723,37 @@
</segmentedlist> </segmentedlist>
<!-- Begin Sysklogd dependency info --> <!-- Begin Sysklogd dependency info -->
<bridgehead renderas="sect2" id="sysklogd-dep">Sysklogd</bridgehead> <bridgehead renderas="sect2" id="sysklogd-dep" revision="sysv">Sysklogd</bridgehead>
<segmentedlist id="sysklogd-depends"> <segmentedlist id="sysklogd-depends" revision="sysv">
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Binutils, Coreutils, GCC, Glibc, Make, and Patch</seg> <seg>Binutils, Coreutils, GCC, Glibc, Make, and Patch</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="sysklogd-rundeps"> <segmentedlist id="sysklogd-rundeps" revision="sysv">
<segtitle>&runtime;</segtitle> <segtitle>&runtime;</segtitle>
<seglistitem> <seglistitem>
<seg>Glibc</seg> <seg>Glibc</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="sysklogd-testdeps"> <segmentedlist id="sysklogd-testdeps" revision="sysv">
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>No test suite available</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="sysklogd-before"> <segmentedlist id="sysklogd-before" revision="sysv">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="sysklogd-optdeps"> <segmentedlist id="sysklogd-optdeps" revision="sysv">
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
@ -2830,7 +2837,8 @@
<ulink url="https://sourceforge.net/projects/linuxquota/"> <ulink url="https://sourceforge.net/projects/linuxquota/">
quota-tools</ulink>, quota-tools</ulink>,
<ulink url="&blfs-book;basicnet/rsync.html">rsync</ulink>, <ulink url="&blfs-book;basicnet/rsync.html">rsync</ulink>,
<ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>, <ulink url="&blfs-book;general/python-modules.html#sphinx">
Sphinx</ulink>,
<ulink url="https://tpm2-tss.readthedocs.io/en/latest/"> <ulink url="https://tpm2-tss.readthedocs.io/en/latest/">
tpm2-tss</ulink>, tpm2-tss</ulink>,
<ulink url="&blfs-book;general/valgrind.html">Valgrind</ulink>, <ulink url="&blfs-book;general/valgrind.html">Valgrind</ulink>,
@ -3002,8 +3010,10 @@
<segmentedlist id="util-linux-depends"> <segmentedlist id="util-linux-depends">
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk, <seg>Bash, Binutils, Coreutils, Diffutils,
GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, and Zlib</seg> <phrase revision="sysv">Eudev, </phrase>Findutils, Gawk,
GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed,
<phrase revision="systemd">Systemd, </phrase>and Zlib</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -3194,7 +3204,9 @@
<segmentedlist id="xz-before"> <segmentedlist id="xz-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Eudev, File, GRUB, Kmod, and Man-DB</seg> <seg><phrase revision="sysv">Eudev, </phrase>File, GRUB, Kmod,
<phrase revision="sysv">and </phrase>Man-DB<phrase
revision="systemd">, and Systemd</phrase></seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>

11
chapter01/changelog.xml
View File

@ -39,6 +39,17 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as <listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem. appropriate for the entry or if needed the entire day's listitem.
--> -->
<listitem>
<para>2023-02-19</para>
<itemizedlist>
<listitem>
<para>[xry111] - Apply a patch for GRUB for an issue triggered
with e2fsprogs-1.47.0. Fixes
<ulink url="&lfs-ticket-root;5219">#5219</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2023-02-13</para> <para>2023-02-13</para>
<itemizedlist> <itemizedlist>

10
chapter01/whatsnew.xml
View File

@ -109,9 +109,9 @@
<listitem> <listitem>
<para>Gettext-&gettext-version;</para> <para>Gettext-&gettext-version;</para>
</listitem> </listitem>
<!--<listitem> <listitem>
<para>Glibc-&glibc-version;</para> <para>Glibc-&glibc-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>GMP-&gmp-version;</para> <para>GMP-&gmp-version;</para>
</listitem>--> </listitem>-->
@ -291,11 +291,11 @@
<itemizedlist> <itemizedlist>
<title>Added:</title> <title>Added:</title>
<listitem><para></para></listitem> <!-- satisfy build --> <listitem><para></para></listitem> <!-- satisfy build -->
<!--
<listitem> <listitem>
<para>&bash-fixes-patch;</para> <para>&grub-upstream-fixes-patch;</para>
</listitem> </listitem>
-->
<listitem> <listitem>
<para>&readline-fixes-patch;</para> <para>&readline-fixes-patch;</para>
</listitem> </listitem>

8
chapter03/patches.xml
View File

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

27
chapter08/e2fsprogs.xml
View File

@ -134,6 +134,33 @@ install -v -m644 doc/com_err.info /usr/share/info
install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userinput></screen> install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userinput></screen>
</sect2> </sect2>
<sect2 id="conf-e2fsprogs" role="configuration">
<title>Configuring E2fsprogs</title>
<indexterm zone="conf-e2fsprogs">
<primary sortas="e-/etc/mke2fs.conf">/etc/mke2fs.conf</primary>
</indexterm>
<para>
<filename>/etc/mke2fs.conf</filename> contains the default value of
various command line options of <command>mke2fs</command>. You may
edit the file to make the default values suitable for your need.
For example, some utilities (not in LFS or BLFS) cannot recognize a
<systemitem class='filesystem'>ext4</systemitem> file system with
<literal>metadata_csum_seed</literal> feature enabled.
<emphasis role='bold'>If</emphasis> you need such an utility, you may
remove the feature from the default
<systemitem class='filesystem'>ext4</systemitem> feature list with the
command:
</para>
<screen role='nodump'><userinput>sed 's/metadata_csum_seed,//' -i /etc/mke2fs.conf</userinput></screen>
<para>
Read the man page <filename>mke2fs.conf(5)</filename> for details.
</para>
</sect2>
<sect2 id="contents-e2fsprogs" role="content"> <sect2 id="contents-e2fsprogs" role="content">
<title>Contents of E2fsprogs</title> <title>Contents of E2fsprogs</title>

9
chapter08/grub.xml
View File

@ -61,6 +61,15 @@
aggressive optimization.</para> aggressive optimization.</para>
</warning> </warning>
<para>
Fix an issue causing <command>grub-install</command> to fail when the
<filename class='directory'>/boot</filename> partition (or the root
partition if <filename class='directory'>/boot</filename> is not a
separate partition) is created by e2fsprogs-1.47.0 or later:
</para>
<screen><userinput remap='pre'>patch -Np1 -i ../grub-&grub-version;-upstream_fixes-1.patch</userinput></screen>
<para>Prepare GRUB for compilation:</para> <para>Prepare GRUB for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr \

8
patches.ent
View File

@ -50,11 +50,9 @@
<!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2"> <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
<!ENTITY glibc-fhs-patch-size "2.8 KB"> <!ENTITY glibc-fhs-patch-size "2.8 KB">
<!-- <!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch">
<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fixes-1.patch"> <!ENTITY grub-upstream-fixes-patch-md5 "da388905710bb4cbfbc7bd7346ff9174">
<!ENTITY glibc-upstream-patch-md5 "e602b6c3a332f4a06e2914e02ae2b295"> <!ENTITY grub-upstream-fixes-patch-size "8 KB">
<!ENTITY glibc-upstream-patch-size "16 KB">
-->
<!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch"> <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
<!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895"> <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">