gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-18 19:29:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Thomas Trepl 2025-06-02 06:39:54 +02:00
commit b137e61a15
8 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chapter01/changelog.xml
View File

@ -42,9 +42,21 @@
<listitem> <listitem>
<para>2025-06-01</para> <para>2025-06-01</para>
<itemizedlist> <itemizedlist>
<listitem>
<para>[bdubbs] - Update to iana-etc-20250519. Addresses
<ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to vim-9.1.1418. Addresses
<ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to kbd-2.8.0. Fixes
<ulink url='&lfs-ticket-root;5736'>#5736</ulink>.</para>
</listitem>
<listitem> <listitem>
<para>[bdubbs] - Update to systemd-257.6. Fixes <para>[bdubbs] - Update to systemd-257.6. Fixes
<ulink url='&lfs-ticket-root;5774'>#5774</ulink>.</para> <ulink url='&lfs-ticket-root;5674'>#5674</ulink>.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>[bdubbs] - Update to setuptools-80.9.0. Fixes <para>[bdubbs] - Update to setuptools-80.9.0. Fixes
@ -81,7 +93,7 @@
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem> <listitem>
<para>2025-05-15</para> <para>2025-05-15</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>

4
chapter01/whatsnew.xml
View File

@ -134,9 +134,9 @@
<listitem> <listitem>
<para>Jinja2-&jinja2-version;</para> <para>Jinja2-&jinja2-version;</para>
</listitem> </listitem>
<!--<listitem> <listitem>
<para>Kbd-&kbd-version;</para> <para>Kbd-&kbd-version;</para>
</listitem>--> </listitem>
<listitem> <listitem>
<para>Kmod-&kmod-version;</para> <para>Kmod-&kmod-version;</para>
</listitem> </listitem>

4
chapter06/gcc-pass2.xml
View File

@ -123,7 +123,6 @@ cd build</userinput></screen>
--build=$(../config.guess) \ --build=$(../config.guess) \
--host=$LFS_TGT \ --host=$LFS_TGT \
--target=$LFS_TGT \ --target=$LFS_TGT \
LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc \
--prefix=/usr \ --prefix=/usr \
--with-build-sysroot=$LFS \ --with-build-sysroot=$LFS \
--enable-default-pie \ --enable-default-pie \
@ -137,8 +136,7 @@ cd build</userinput></screen>
--disable-libssp \ --disable-libssp \
--disable-libvtv \ --disable-libvtv \
--enable-languages=c,c++ \ --enable-languages=c,c++ \
LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc</userinput></screen>
</userinput></screen>
<variablelist> <variablelist>
<title>The meaning of the new configure options:</title><!-- WIP --> <title>The meaning of the new configure options:</title><!-- WIP -->

2
chapter07/changingowner.xml
View File

@ -33,7 +33,7 @@
user <systemitem class="username">root</systemitem> by running the following user <systemitem class="username">root</systemitem> by running the following
command:</para> command:</para>
<screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools} <screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,var,etc,tools}
case $(uname -m) in case $(uname -m) in
x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;; x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;;
esac</userinput></screen> esac</userinput></screen>

2
chapter08/glibc.xml
View File

@ -327,7 +327,7 @@ install -vm755 dest/usr/lib/*.so.* /usr/lib</userinput></screen>
</para> </para>
<screen role='nodump'><userinput>DIR=$(dirname $(gcc -print-libgcc-file-name)) <screen role='nodump'><userinput>DIR=$(dirname $(gcc -print-libgcc-file-name))
[ -e $DIR/include/limits.h ] || mv $DIR/include{-fixed,}/limits.h [ -e $DIR/include/limits.h ] || mv $DIR/include{-fixed,}/limits.h
[ -e $DIR/include/syslimits.h ] || mv $DIR/include{-fixed,}/syslimits.h [ -e $DIR/include/syslimits.h ] || mv $DIR/include{-fixed,}/syslimits.h
rm -rfv $DIR/include-fixed/* rm -rfv $DIR/include-fixed/*
unset DIR</userinput></screen> unset DIR</userinput></screen>

2
chapter08/gmp.xml
View File

@ -68,8 +68,6 @@
<para>Prepare GMP for compilation:</para> <para>Prepare GMP for compilation:</para>
<screen><userinput remap="pre">sed '/long long t1;/,+1s/()/(...)/' -i configure</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr \
--enable-cxx \ --enable-cxx \
--disable-static \ --disable-static \

9
chapter08/kbd.xml
View File

@ -80,9 +80,14 @@ sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in</userinput></screen>
<screen><userinput remap="make">make</userinput></screen> <screen><userinput remap="make">make</userinput></screen>
<para>To test the results, issue:</para> <para>The tests for this package will all fail in the chroot environment
because they require <application>valgrind</application>. In addition
on a full system with <application>valgrind</application>, several
tests still fail in a graphical environment. The tests pass in
a non-graphical environment.</para>
<!--
<screen><userinput remap="test">make check</userinput></screen> <screen><userinput remap="test">make check</userinput></screen>
-->
<para>Install the package:</para> <para>Install the package:</para>

22
packages.ent
View File

@ -309,10 +309,10 @@
<!ENTITY gzip-fin-du "21 MB"> <!ENTITY gzip-fin-du "21 MB">
<!ENTITY gzip-fin-sbu "0.3 SBU"> <!ENTITY gzip-fin-sbu "0.3 SBU">
<!ENTITY iana-etc-version "20250407"> <!ENTITY iana-etc-version "20250519">
<!ENTITY iana-etc-size "592 KB"> <!ENTITY iana-etc-size "592 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-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
<!ENTITY iana-etc-md5 "3bd31fb7fd47dccd4bf74cd5ae4046d9"> <!ENTITY iana-etc-md5 "45778351c7eda633946a777cd8e24eb8">
<!ENTITY iana-etc-home "https://www.iana.org/protocols"> <!ENTITY iana-etc-home "https://www.iana.org/protocols">
<!ENTITY iana-etc-fin-du "4.8 MB"> <!ENTITY iana-etc-fin-du "4.8 MB">
<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU"> <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@ -359,10 +359,10 @@
<!ENTITY jinja2-fin-du "2.5 MB"> <!ENTITY jinja2-fin-du "2.5 MB">
<!ENTITY jinja2-fin-sbu "less than 0.1 SBU"> <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
<!ENTITY kbd-version "2.7.1"> <!ENTITY kbd-version "2.8.0">
<!ENTITY kbd-size "1,438 KB"> <!ENTITY kbd-size "1,448 KB">
<!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz"> <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz">
<!ENTITY kbd-md5 "f15673d9f748e58f82fa50cff0d0fd20"> <!ENTITY kbd-md5 "24b5d24f7483726b88f214dc6c77aa41">
<!ENTITY kbd-home "https://kbd-project.org/"> <!ENTITY kbd-home "https://kbd-project.org/">
<!ENTITY kbd-fin-du "34 MB"> <!ENTITY kbd-fin-du "34 MB">
<!ENTITY kbd-fin-sbu "0.1 SBU"> <!ENTITY kbd-fin-sbu "0.1 SBU">
@ -682,11 +682,11 @@
<!--<!ENTITY systemd-url "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">--> <!--<!ENTITY systemd-url "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
<!ENTITY systemd-md5 "458b07e140cd65d25baf7752398c5d13"> <!ENTITY systemd-md5 "458b07e140cd65d25baf7752398c5d13">
<!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/"> <!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/">
<!ENTITY systemd-man-version "257.3"> <!ENTITY systemd-man-version "257.6">
<!ENTITY systemd-man-size "733 KB"> <!ENTITY systemd-man-size "736 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;-&systemd-stable;.tar.xz">-->
<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz"> <!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
<!ENTITY systemd-man-md5 "9b77c3b066723d490cb10aed4fb05696"> <!ENTITY systemd-man-md5 "d06eb41840ab4c6138e30ba78387ef4e">
<!ENTITY systemd-fin-du "307 MB"> <!ENTITY systemd-fin-du "307 MB">
<!ENTITY systemd-fin-sbu "1.1 SBU"> <!ENTITY systemd-fin-sbu "1.1 SBU">
@ -755,10 +755,10 @@
<!ENTITY util-linux-fin-du "316 MB"> <!ENTITY util-linux-fin-du "316 MB">
<!ENTITY util-linux-fin-sbu "0.5 SBU"> <!ENTITY util-linux-fin-sbu "0.5 SBU">
<!ENTITY vim-version "9.1.1353"> <!ENTITY vim-version "9.1.1418">
<!-- <!ENTITY vim-majmin "90"> --> <!-- <!ENTITY vim-majmin "90"> -->
<!ENTITY vim-docdir "vim/vim91"> <!ENTITY vim-docdir "vim/vim91">
<!ENTITY vim-size "18,318 KB"> <!ENTITY vim-size "18,414 KB">
<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz"> <!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
<!-- N.B. LFS 9.0 uses <!-- N.B. LFS 9.0 uses
https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz
@ -772,7 +772,7 @@
example, https://github.com/vim/vim/tags?after=v8.1.1847 will show example, https://github.com/vim/vim/tags?after=v8.1.1847 will show
us v8.1.1846. --> us v8.1.1846. -->
<!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">--> <!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">-->
<!ENTITY vim-md5 "3234f9dfc973bbfc6ce2441c9fd8ab76"> <!ENTITY vim-md5 "a39c2c90361a39f2206302bb64f51022">
<!ENTITY vim-home "https://www.vim.org"> <!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-fin-du "251 MB"> <!ENTITY vim-fin-du "251 MB">
<!ENTITY vim-fin-sbu "3.4 SBU"> <!ENTITY vim-fin-sbu "3.4 SBU">