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-05-07 17:20:22 +02:00
commit 2d59260641
12 changed files with 111 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
chapter01/changelog.xml
View File

@ -39,6 +39,44 @@
<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>2025-05-01</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to vim-9.1.1353. Addresses
<ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to setuptools-80.0.1. Fixes
<ulink url='&lfs-ticket-root;5710'>#5710</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to packaging-25.0. Fixes
<ulink url='&lfs-ticket-root;5706'>#5706</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to meson-1.8.0. Fixes
<ulink url='&lfs-ticket-root;5713'>#5713</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-6.14.4. Fixes
<ulink url='&lfs-ticket-root;5709'>#5709</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iana-etc-20250407. Addresses
<ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to gperf-3.3. Fixes
<ulink url='&lfs-ticket-root;5708'>#5708</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to elfutils-0.193. Fixes
<ulink url='&lfs-ticket-root;5711'>#5711</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2025-04-15</para> <para>2025-04-15</para>
<itemizedlist> <itemizedlist>

4
chapter01/whatsnew.xml
View File

@ -149,9 +149,9 @@
<listitem> <listitem>
<para>Libcap-&libcap-version;</para> <para>Libcap-&libcap-version;</para>
</listitem> </listitem>
<!--<listitem> <listitem>
<para>Libelf from Elfutils-&elfutils-version;</para> <para>Libelf from Elfutils-&elfutils-version;</para>
</listitem>--> </listitem>
<listitem> <listitem>
<para>Libffi-&libffi-version;</para> <para>Libffi-&libffi-version;</para>
</listitem> </listitem>

34
chapter06/gcc-pass2.xml
View File

@ -97,23 +97,23 @@ cd build</userinput></screen>
<para>Now prepare GCC for compilation:</para> <para>Now prepare GCC for compilation:</para>
<screen arch="default"><userinput remap="configure">../configure \ <screen arch="default"><userinput remap="configure">../configure \
--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 \ 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 \
--enable-default-ssp \ --enable-default-ssp \
--disable-nls \ --disable-nls \
--disable-multilib \ --disable-multilib \
--disable-libatomic \ --disable-libatomic \
--disable-libgomp \ --disable-libgomp \
--disable-libquadmath \ --disable-libquadmath \
--disable-libsanitizer \ --disable-libsanitizer \
--disable-libssp \ --disable-libssp \
--disable-libvtv \ --disable-libvtv \
--enable-languages=c,c++</userinput></screen> --enable-languages=c,c++</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure" <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure"
arch="ml_32">mlist=m64,m32</userinput><userinput remap="configure" arch="ml_32">mlist=m64,m32</userinput><userinput remap="configure"

4
chapter06/tar.xml
View File

@ -45,8 +45,8 @@
<para>Prepare Tar for compilation:</para> <para>Prepare Tar for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr \
--host=$LFS_TGT \ --host=$LFS_TGT \
--build=$(build-aux/config.guess)</userinput></screen> --build=$(build-aux/config.guess)</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

4
chapter08/acl.xml
View File

@ -44,8 +44,8 @@
<para>Prepare Acl for compilation:</para> <para>Prepare Acl for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr \
--disable-static \ --disable-static \
--docdir=/usr/share/doc/acl-&acl-version;</userinput></screen> --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

12
chapter08/e2fsprogs.xml
View File

@ -52,12 +52,12 @@ cd build</userinput></screen>
<para>Prepare E2fsprogs for compilation:</para> <para>Prepare E2fsprogs for compilation:</para>
<screen><userinput remap="configure">../configure --prefix=/usr \ <screen><userinput remap="configure">../configure --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--enable-elf-shlibs \ --enable-elf-shlibs \
--disable-libblkid \ --disable-libblkid \
--disable-libuuid \ --disable-libuuid \
--disable-uuidd \ --disable-uuidd \
--disable-fsck</userinput></screen> --disable-fsck</userinput></screen>
<variablelist> <variablelist>

12
chapter08/glibc.xml
View File

@ -68,12 +68,12 @@ cd build</userinput></screen>
<para>Prepare Glibc for compilation:</para> <para>Prepare Glibc for compilation:</para>
<screen><userinput remap="configure">../configure --prefix=/usr \ <screen><userinput remap="configure">../configure --prefix=/usr \
--disable-werror \ --disable-werror \
--enable-kernel=&min-kernel; \ --disable-nscd \
--enable-stack-protector=strong \ --enable-kernel=&min-kernel;\
--disable-nscd \ libc_cv_slibdir=/usr/lib \
libc_cv_slibdir=/usr/lib</userinput></screen> --enable-stack-protector=strong</userinput></screen>
<variablelist> <variablelist>
<title>The meaning of the configure options:</title> <title>The meaning of the configure options:</title>

6
chapter08/grub.xml
View File

@ -71,9 +71,9 @@
<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 \
--sysconfdir=/etc \ --sysconfdir=/etc \
--disable-efiemu \ --disable-efiemu \
--disable-werror</userinput></screen> --disable-werror</userinput></screen>
<variablelist> <variablelist>

7
chapter08/libelf.xml
View File

@ -46,8 +46,8 @@
<para>Prepare Libelf for compilation:</para> <para>Prepare Libelf for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr \
--disable-debuginfod \ --disable-debuginfod \
--enable-libdebuginfod=dummy</userinput></screen> --enable-libdebuginfod=dummy</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>
@ -58,6 +58,9 @@
<screen><userinput remap="test">make check</userinput></screen> <screen><userinput remap="test">make check</userinput></screen>
<para>Two tests are known to fail, dwarf_srclang_check and
run-backtrace-native-core.sh.</para>
<para>Install only Libelf:</para> <para>Install only Libelf:</para>
<screen><userinput remap="install">make -C libelf install <screen><userinput remap="install">make -C libelf install

4
chapter08/libffi.xml
View File

@ -63,8 +63,8 @@
<para>Prepare Libffi for compilation:</para> <para>Prepare Libffi for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr \
--disable-static \ --disable-static \
--with-gcc-arch=native</userinput></screen> --with-gcc-arch=native</userinput></screen>
<variablelist> <variablelist>

4
chapter08/pkgconf.xml
View File

@ -46,8 +46,8 @@
<para>Prepare Pkgconf for compilation:</para> <para>Prepare Pkgconf for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr \
--disable-static \ --disable-static \
--docdir=/usr/share/doc/pkgconf-&pkgconf-version;</userinput></screen> --docdir=/usr/share/doc/pkgconf-&pkgconf-version;</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

52
packages.ent
View File

@ -140,10 +140,10 @@
<!ENTITY e2fsprogs-fin-du "99 MB"> <!ENTITY e2fsprogs-fin-du "99 MB">
<!ENTITY e2fsprogs-fin-sbu "2.4 SBU on a spinning disk, 0.5 SBU on an SSD"> <!ENTITY e2fsprogs-fin-sbu "2.4 SBU on a spinning disk, 0.5 SBU on an SSD">
<!ENTITY elfutils-version "0.192"> <!-- libelf --> <!ENTITY elfutils-version "0.193"> <!-- libelf -->
<!ENTITY elfutils-size "11,635 KB"> <!ENTITY elfutils-size "11,695 KB">
<!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2"> <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
<!ENTITY elfutils-md5 "a6bb1efc147302cfc15b5c2b827f186a"> <!ENTITY elfutils-md5 "ceefa052ded950a4c523688799193a44">
<!ENTITY elfutils-home "https://sourceware.org/elfutils/"> <!ENTITY elfutils-home "https://sourceware.org/elfutils/">
<!ENTITY elfutils-fin-du "135 MB"> <!ENTITY elfutils-fin-du "135 MB">
<!ENTITY elfutils-fin-sbu "0.3 SBU"> <!ENTITY elfutils-fin-sbu "0.3 SBU">
@ -265,10 +265,10 @@
<!ENTITY gmp-fin-du "54 MB"> <!ENTITY gmp-fin-du "54 MB">
<!ENTITY gmp-fin-sbu "0.3 SBU"> <!ENTITY gmp-fin-sbu "0.3 SBU">
<!ENTITY gperf-version "3.2.1"> <!ENTITY gperf-version "3.3">
<!ENTITY gperf-size "1,240 KB"> <!ENTITY gperf-size "1,789 KB">
<!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz"> <!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
<!ENTITY gperf-md5 "06212b91bdc53526cffb346916c854d6"> <!ENTITY gperf-md5 "31753b021ea78a21f154bf9eecb8b079">
<!ENTITY gperf-home "&gnu-software;gperf/"> <!ENTITY gperf-home "&gnu-software;gperf/">
<!ENTITY gperf-fin-du "6.1 MB"> <!ENTITY gperf-fin-du "6.1 MB">
<!ENTITY gperf-fin-sbu "less than 0.1 SBU"> <!ENTITY gperf-fin-sbu "less than 0.1 SBU">
@ -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 "20250328"> <!ENTITY iana-etc-version "20250407">
<!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 "c1ac238c282feee8e4f4e44a7e490615"> <!ENTITY iana-etc-md5 "3bd31fb7fd47dccd4bf74cd5ae4046d9">
<!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">
@ -433,12 +433,12 @@
<!ENTITY linux-major-version "6"> <!ENTITY linux-major-version "6">
<!ENTITY linux-minor-version "14"> <!ENTITY linux-minor-version "14">
<!ENTITY linux-patch-version "2"> <!ENTITY linux-patch-version "4">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "145,911 KB"> <!ENTITY linux-size "145,933 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "7f305d1d40d8ca9393c58071f01453ed"> <!ENTITY linux-md5 "c8e750100a5fc02bb856539ff9b9a41f">
<!ENTITY linux-home "https://www.kernel.org/"> <!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 : <!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 :
minimum is allnoconfig minimum is allnoconfig
@ -505,10 +505,10 @@
<!ENTITY markupsafe-fin-du "500 KB"> <!ENTITY markupsafe-fin-du "500 KB">
<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU"> <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
<!ENTITY meson-version "1.7.2"> <!ENTITY meson-version "1.8.0">
<!ENTITY meson-size "4,892 KB"> <!ENTITY meson-size "2,281 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz"> <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
<!ENTITY meson-md5 "caec869e85ba1046f22972fbd5d2c497"> <!ENTITY meson-md5 "74664d20851d29bc3e491d502d66e1f7">
<!ENTITY meson-home "https://mesonbuild.com"> <!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-fin-du "44 MB"> <!ENTITY meson-fin-du "44 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU"> <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@ -530,9 +530,9 @@
<!ENTITY mpfr-fin-sbu "0.2 SBU"> <!ENTITY mpfr-fin-sbu "0.2 SBU">
<!ENTITY ncurses-version "6.5"> <!ENTITY ncurses-version "6.5">
<!ENTITY ncurses-size "2,156 KB"> <!ENTITY ncurses-size "3,699 KB">
<!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/current/ncurses-&ncurses-version;-20250419.tgz"> <!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/current/ncurses-&ncurses-version;-20250503.tgz">
<!ENTITY ncurses-md5 "6ceb0f9f2389fea01d6ed7ab8a41c3a7"> <!ENTITY ncurses-md5 "d76fe944c5c24cdeabeb6fce0acbf94b">
<!ENTITY ncurses-home "&gnu-software;ncurses/"> <!ENTITY ncurses-home "&gnu-software;ncurses/">
<!ENTITY ncurses-tmp-du "53 MB"> <!ENTITY ncurses-tmp-du "53 MB">
<!ENTITY ncurses-tmp-sbu "0.4 SBU"> <!ENTITY ncurses-tmp-sbu "0.4 SBU">
@ -555,10 +555,10 @@
<!ENTITY openssl-fin-du "920 MB"> <!ENTITY openssl-fin-du "920 MB">
<!ENTITY openssl-fin-sbu "1.8 SBU"> <!ENTITY openssl-fin-sbu "1.8 SBU">
<!ENTITY packaging-version "24.2"> <!ENTITY packaging-version "25.0">
<!ENTITY packaging-size "164 KB"> <!ENTITY packaging-size "162 KB">
<!ENTITY packaging-url "https://files.pythonhosted.org/packages/source/p/packaging/packaging-&packaging-version;.tar.gz"> <!ENTITY packaging-url "https://files.pythonhosted.org/packages/source/p/packaging/packaging-&packaging-version;.tar.gz">
<!ENTITY packaging-md5 "97dbaca91e00d6b9fd86866e8c7897ae"> <!ENTITY packaging-md5 "ab0ef21ddebe09d1803575120d3f99f8">
<!ENTITY packaging-home "&pypi-home;/packaging/"> <!ENTITY packaging-home "&pypi-home;/packaging/">
<!ENTITY packaging-fin-du "2.7 MB"> <!ENTITY packaging-fin-du "2.7 MB">
<!ENTITY packaging-fin-sbu "less than 0.1 SBU"> <!ENTITY packaging-fin-sbu "less than 0.1 SBU">
@ -647,10 +647,10 @@
<!ENTITY sed-fin-du "30 MB"> <!ENTITY sed-fin-du "30 MB">
<!ENTITY sed-fin-sbu "0.3 SBU"> <!ENTITY sed-fin-sbu "0.3 SBU">
<!ENTITY setuptools-version "78.1.0"> <!ENTITY setuptools-version "80.0.1">
<!ENTITY setuptools-size "1,336 KB"> <!ENTITY setuptools-size "1,323 KB">
<!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz"> <!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz">
<!ENTITY setuptools-md5 "c20bf3068cdb26629854bec1ba8d2374"> <!ENTITY setuptools-md5 "3a734f967ed017563da6f0233592373b">
<!ENTITY setuptools-home "&pypi-home;/setuptools/"> <!ENTITY setuptools-home "&pypi-home;/setuptools/">
<!ENTITY setuptools-fin-du "26 MB"> <!ENTITY setuptools-fin-du "26 MB">
<!ENTITY setuptools-fin-sbu "less than 0.1 SBU"> <!ENTITY setuptools-fin-sbu "less than 0.1 SBU">
@ -754,10 +754,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.1263"> <!ENTITY vim-version "9.1.1353">
<!-- <!ENTITY vim-majmin "90"> --> <!-- <!ENTITY vim-majmin "90"> -->
<!ENTITY vim-docdir "vim/vim91"> <!ENTITY vim-docdir "vim/vim91">
<!ENTITY vim-size "18,260 KB"> <!ENTITY vim-size "18,318 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
@ -771,7 +771,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 "75b86835e6e55910f4c14502f7ce0bc4"> <!ENTITY vim-md5 "3234f9dfc973bbfc6ce2441c9fd8ab76">
<!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">