From 62478febd1e6c86e10c51ed032dfefe4166e1942 Mon Sep 17 00:00:00 2001 From: Kyle Glaws Date: Sat, 18 Feb 2023 23:22:36 -0500 Subject: [PATCH] update phase 4 packages --- config.sh | 4 ++-- mylfs.sh | 2 +- packages.sh | 6 +++--- phase3/build_order.txt | 1 - phase3/libstdcpp.sh | 17 ----------------- phase4/automake.sh | 2 +- phase4/bash.sh | 2 +- phase4/bc.sh | 2 +- phase4/binutils.sh | 11 +++++++---- phase4/build_order.txt | 1 + phase4/coreutils.sh | 3 +-- phase4/expat.sh | 4 ++-- phase4/gcc.sh | 10 +++------- phase4/iproute2.sh | 6 +++--- phase4/kbd.sh | 4 ++-- phase4/mandb.sh | 2 +- phase4/meson.sh | 5 ++--- phase4/ncurses.sh | 5 +++-- phase4/openssl.sh | 4 ++-- phase4/perl.sh | 13 ++++++------- phase4/procps.sh | 2 +- phase4/python.sh | 7 +++---- phase4/tcl.sh | 3 +-- phase4/texinfo.sh | 3 --- phase4/utillinux.sh | 2 +- phase4/vim.sh | 3 +-- phase4/wheel.sh | 3 +++ phase4/xz.sh | 2 +- phase4/zstd.sh | 6 ++++-- static/etc__ld.so.conf | 3 +++ static/etc__pip.conf | 4 ++++ 31 files changed, 64 insertions(+), 78 deletions(-) delete mode 100644 phase3/libstdcpp.sh create mode 100644 phase4/wheel.sh create mode 100644 static/etc__pip.conf diff --git a/config.sh b/config.sh index cd8ce0a..6124e05 100644 --- a/config.sh +++ b/config.sh @@ -4,8 +4,8 @@ FULLPATH=$(cd $(dirname $0) && pwd) -export LFS_VERSION=11.1 -export KERNELVERS=5.16.9 +export LFS_VERSION=11.2 +export KERNELVERS=5.19.2 export PACKAGE_LIST=$FULLPATH/packages.sh export PACKAGE_DIR=$FULLPATH/packages export LOG_DIR=$FULLPATH/logs diff --git a/mylfs.sh b/mylfs.sh index f580a8c..9b9fbcb 100755 --- a/mylfs.sh +++ b/mylfs.sh @@ -233,7 +233,7 @@ function init_image { mkdir -p $LFS/{boot,dev,etc,home,lib64,media,mnt,opt,proc,run,srv,sys,tools,usr,var} mkdir -p $LFS/boot/grub - mkdir -p $LFS/etc/{modprobe.d,opt,sysconfig} + mkdir -p $LFS/etc/{modprobe.d,opt,sysconfig,ld.so.conf.d} mkdir -p $LFS/media/{cdrom,floppy} mkdir -p $LFS/usr/{bin,lib/{,firmware},sbin} mkdir -p $LFS/usr/local/{bin,include,lib,sbin,share,src} diff --git a/packages.sh b/packages.sh index e552597..29dbf42 100644 --- a/packages.sh +++ b/packages.sh @@ -14,7 +14,7 @@ export PKG_DIFFUTILS=https://ftp.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz export PKG_E2FSPROGS=https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v1.46.5/e2fsprogs-1.46.5.tar.gz export PKG_ELFUTILS=https://sourceware.org/ftp/elfutils/0.187/elfutils-0.187.tar.bz2 export PKG_EUDEV=https://github.com/eudev-project/eudev/releases/download/v3.2.11/eudev-3.2.11.tar.gz -export PKG_EXPAT=https://prdownloads.sourceforge.net/expat/expat-2.4.8.tar.xz +export PKG_EXPAT=https://prdownloads.sourceforge.net/expat/expat-2.5.0.tar.xz export PKG_EXPECT=https://prdownloads.sourceforge.net/expect/expect5.45.4.tar.gz export PKG_FILE=https://astron.com/pub/file/file-5.42.tar.gz export PKG_FINDUTILS=https://ftp.gnu.org/gnu/findutils/findutils-4.9.0.tar.xz @@ -76,10 +76,10 @@ export PKG_VIM=https://anduin.linuxfromscratch.org/LFS/vim-9.0.0228.tar.gz export PKG_WHEEL=https://anduin.linuxfromscratch.org/LFS/wheel-0.37.1.tar.gz export PKG_XMLPARSER=https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz export PKG_XZ=https://tukaani.org/xz/xz-5.2.6.tar.xz -export PKG_ZLIB=https://zlib.net/zlib-1.2.12.tar.xz +export PKG_ZLIB=https://zlib.net/zlib-1.2.13.tar.xz export PKG_ZSTD=https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz export PATCH_BZIP2=https://www.linuxfromscratch.org/patches/lfs/11.2/bzip2-1.0.8-install_docs-1.patch -export PATCH_COREUTILS=https://www.linuxfromscratch.org/patches/lfs/11.2/bzip2-1.0.8-install_docs-1.patch +export PATCH_COREUTILS=https://www.linuxfromscratch.org/patches/lfs/11.2/coreutils-9.1-i18n-1.patch export PATCH_GLIBC=https://www.linuxfromscratch.org/patches/lfs/11.2/glibc-2.36-fhs-1.patch export PATCH_KBD=https://www.linuxfromscratch.org/patches/lfs/11.2/kbd-2.5.1-backspace-1.patch export PATCH_SYSVINIT=https://www.linuxfromscratch.org/patches/lfs/11.2/sysvinit-3.04-consolidated-1.patch diff --git a/phase3/build_order.txt b/phase3/build_order.txt index ee54a5e..bfd9dbd 100644 --- a/phase3/build_order.txt +++ b/phase3/build_order.txt @@ -1,4 +1,3 @@ -libstdcpp GCC gettext bison perl diff --git a/phase3/libstdcpp.sh b/phase3/libstdcpp.sh deleted file mode 100644 index dca71a4..0000000 --- a/phase3/libstdcpp.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Libstdc++ Phase 3 -ln -s gthr-posix.h libgcc/gthr-default.h - -mkdir build -cd build - -../libstdc++-v3/configure \ - CXXFLAGS="-g -O2 -D_GNU_SOURCE" \ - --prefix=/usr \ - --disable-multilib \ - --disable-nls \ - --host=$LFS_TGT \ - --disable-libstdcxx-pch - -make -make install - diff --git a/phase4/automake.sh b/phase4/automake.sh index 7400bec..4aa13ae 100644 --- a/phase4/automake.sh +++ b/phase4/automake.sh @@ -6,7 +6,7 @@ make if $RUN_TESTS then set +e - make check + make -j4 check set -e fi diff --git a/phase4/bash.sh b/phase4/bash.sh index 80bb3a5..d2fb6bb 100644 --- a/phase4/bash.sh +++ b/phase4/bash.sh @@ -6,11 +6,11 @@ make -chown -R tester . if $RUN_TESTS then set +e +chown -R tester . su -s /usr/bin/expect tester << EOF set timeout -1 spawn make tests diff --git a/phase4/bc.sh b/phase4/bc.sh index e94a1ee..17e93af 100644 --- a/phase4/bc.sh +++ b/phase4/bc.sh @@ -1,5 +1,5 @@ # Bc Phase 4 -CC=gcc ./configure --prefix=/usr -G -O3 +CC=gcc ./configure --prefix=/usr -G -O3 -r make diff --git a/phase4/binutils.sh b/phase4/binutils.sh index d5e499d..2b888c7 100644 --- a/phase4/binutils.sh +++ b/phase4/binutils.sh @@ -1,13 +1,16 @@ # Binutils Phase 4 -patch -Np1 -i ../$(basename $PATCH_BINUTILS) - -sed -e '/R_386_TLS_LE /i \ || (TYPE) == R_386_TLS_IE \\' \ - -i ./bfd/elfxx-x86.h +EXPECTOUT=$(expect -c 'spawn ls') +if [ "$EXPECTOUT" != "$(echo -ne 'spawn ls\r\n')" ] +then + echo $EXPECTOUT + exit 1 +fi mkdir build cd build ../configure --prefix=/usr \ + --sysconfdir=/etc \ --enable-gold \ --enable-ld=default \ --enable-plugins \ diff --git a/phase4/build_order.txt b/phase4/build_order.txt index 3cf20e6..b91f605 100644 --- a/phase4/build_order.txt +++ b/phase4/build_order.txt @@ -46,6 +46,7 @@ kmod elfutils libffi python +wheel ninja meson coreutils diff --git a/phase4/coreutils.sh b/phase4/coreutils.sh index 0acb68b..363c18a 100644 --- a/phase4/coreutils.sh +++ b/phase4/coreutils.sh @@ -1,8 +1,7 @@ # Coreutils Phase 4 patch -Np1 -i ../$(basename $PATCH_COREUTILS) -patch -Np1 -i ../$(basename $PATCH_COREUTILS_CHMOD) -autoreconf -fi +autoreconf -fiv FORCE_UNSAFE_CONFIGURE=1 ./configure \ --prefix=/usr \ --enable-no-install-program=kill,uptime diff --git a/phase4/expat.sh b/phase4/expat.sh index f254c47..b6bf95f 100644 --- a/phase4/expat.sh +++ b/phase4/expat.sh @@ -1,7 +1,7 @@ # Expat Phase 4 ./configure --prefix=/usr \ --disable-static \ - --docdir=/usr/share/doc/expat-2.4.6 + --docdir=/usr/share/doc/expat-2.5.0 make @@ -14,5 +14,5 @@ fi make install -install -m644 doc/*.{html,css} /usr/share/doc/expat-2.4.6 +install -m644 doc/*.{html,css} /usr/share/doc/expat-2.5.0 diff --git a/phase4/gcc.sh b/phase4/gcc.sh index 4b8bfb0..c5156c0 100644 --- a/phase4/gcc.sh +++ b/phase4/gcc.sh @@ -1,7 +1,4 @@ # GCC Phase 4 -sed -e '/static.*SIGSTKSZ/d' \ - -e 's/return kAltStackSize/return SIGSTKSZ * 4/' \ - -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp case $(uname -m) in x86_64) @@ -27,21 +24,20 @@ ulimit -s 32768 if $RUN_TESTS then set +e - chown -R tester . + chown -Rv tester . su tester -c "PATH=$PATH make -k check" ../contrib/test_summary set -e fi make install -rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/11.2.0/include-fixed/bits/ chown -R root:root \ - /usr/lib/gcc/*linux-gnu/11.2.0/include{,-fixed} + /usr/lib/gcc/*linux-gnu/12.2.0/include{,-fixed} ln -sr /usr/bin/cpp /usr/lib -ln -sf ../../libexec/gcc/$(gcc -dumpmachine)/11.2.0/liblto_plugin.so \ +ln -sf ../../libexec/gcc/$(gcc -dumpmachine)/12.2.0/liblto_plugin.so \ /usr/lib/bfd-plugins/ mkdir -p /usr/share/gdb/auto-load/usr/lib diff --git a/phase4/iproute2.sh b/phase4/iproute2.sh index 6024a29..2e5c7ee 100644 --- a/phase4/iproute2.sh +++ b/phase4/iproute2.sh @@ -2,10 +2,10 @@ sed -i /ARPD/d Makefile rm -f man/man8/arpd.8 -make +make NETNS_RUN_DIR=/run/netns make SBINDIR=/usr/sbin install -mkdir -p /usr/share/doc/iproute2-5.16.0 -cp COPYING README* /usr/share/doc/iproute2-5.16.0 +mkdir -p /usr/share/doc/iproute2-5.19.0 +cp COPYING README* /usr/share/doc/iproute2-5.19.0 diff --git a/phase4/kbd.sh b/phase4/kbd.sh index 6073049..5889c57 100644 --- a/phase4/kbd.sh +++ b/phase4/kbd.sh @@ -17,6 +17,6 @@ fi make install -mkdir -pv /usr/share/doc/kbd-2.4.0 -cp -R -v docs/doc/* /usr/share/doc/kbd-2.4.0 +mkdir -pv /usr/share/doc/kbd-2.5.1 +cp -R -v docs/doc/* /usr/share/doc/kbd-2.5.1 diff --git a/phase4/mandb.sh b/phase4/mandb.sh index e5cb9d2..a9ef2b2 100644 --- a/phase4/mandb.sh +++ b/phase4/mandb.sh @@ -1,6 +1,6 @@ # Man-DB Phase 4 ./configure --prefix=/usr \ - --docdir=/usr/share/doc/man-db-2.10.1 \ + --docdir=/usr/share/doc/man-db-2.10.2 \ --sysconfdir=/etc \ --disable-setuid \ --enable-cache-owner=bin \ diff --git a/phase4/meson.sh b/phase4/meson.sh index 6278aff..9917eff 100644 --- a/phase4/meson.sh +++ b/phase4/meson.sh @@ -1,8 +1,7 @@ # Meson Phase 4 -python3 setup.py build +pip3 wheel -w dist --no-build-isolation --no-deps $PWD -python3 setup.py install --root=dest -cp -r dest/* / +pip3 install --no-index --find-links dist meson install -Dm644 data/shell-completions/bash/meson /usr/share/bash-completion/completions/meson install -Dm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/_meson diff --git a/phase4/ncurses.sh b/phase4/ncurses.sh index d142a57..f296535 100644 --- a/phase4/ncurses.sh +++ b/phase4/ncurses.sh @@ -4,6 +4,7 @@ --with-shared \ --without-debug \ --without-normal \ + --with-cxx-shared \ --enable-pc-files \ --enable-widec \ --with-pkg-config-libdir=/usr/lib/pkgconfig @@ -12,8 +13,8 @@ make make DESTDIR=$PWD/dest install install -m755 dest/usr/lib/libncursesw.so.6.3 /usr/lib -rm dest/usr/lib/{libncursesw.so.6.3,libncurses++w.a} -cp -a dest/* / +rm dest/usr/lib/libncursesw.so.6.3 +cp -av dest/* / for lib in ncurses form panel menu ; do rm -f /usr/lib/lib${lib}.so diff --git a/phase4/openssl.sh b/phase4/openssl.sh index b50fdc9..d046177 100644 --- a/phase4/openssl.sh +++ b/phase4/openssl.sh @@ -17,7 +17,7 @@ fi sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile make MANSUFFIX=ssl install -mv /usr/share/doc/openssl /usr/share/doc/openssl-3.0.1 +mv /usr/share/doc/openssl /usr/share/doc/openssl-3.0.5 -cp -fr doc/* /usr/share/doc/openssl-3.0.1 +cp -fr doc/* /usr/share/doc/openssl-3.0.5 diff --git a/phase4/perl.sh b/phase4/perl.sh index 41293d8..d377bae 100644 --- a/phase4/perl.sh +++ b/phase4/perl.sh @@ -1,5 +1,4 @@ # Perl Phase 4 -patch -Np1 -i ../$(basename $PATCH_PERL) export BUILD_ZLIB=False export BUILD_BZIP2=0 @@ -7,12 +6,12 @@ export BUILD_BZIP2=0 sh Configure -des \ -Dprefix=/usr \ -Dvendorprefix=/usr \ - -Dprivlib=/usr/lib/perl5/5.34/core_perl \ - -Darchlib=/usr/lib/perl5/5.34/core_perl \ - -Dsitelib=/usr/lib/perl5/5.34/site_perl \ - -Dsitearch=/usr/lib/perl5/5.34/site_perl \ - -Dvendorlib=/usr/lib/perl5/5.34/vendor_perl \ - -Dvendorarch=/usr/lib/perl5/5.34/vendor_perl \ + -Dprivlib=/usr/lib/perl5/5.36/core_perl \ + -Darchlib=/usr/lib/perl5/5.36/core_perl \ + -Dsitelib=/usr/lib/perl5/5.36/site_perl \ + -Dsitearch=/usr/lib/perl5/5.36/site_perl \ + -Dvendorlib=/usr/lib/perl5/5.36/vendor_perl \ + -Dvendorarch=/usr/lib/perl5/5.36/vendor_perl \ -Dman1dir=/usr/share/man/man1 \ -Dman3dir=/usr/share/man/man3 \ -Dpager="/usr/bin/less -isR" \ diff --git a/phase4/procps.sh b/phase4/procps.sh index e8ecce7..0b532b6 100644 --- a/phase4/procps.sh +++ b/phase4/procps.sh @@ -1,6 +1,6 @@ # Procps-ng Phase 4 ./configure --prefix=/usr \ - --docdir=/usr/share/doc/procps-ng-3.3.17 \ + --docdir=/usr/share/doc/procps-ng-4.0.0 \ --disable-static \ --disable-kill diff --git a/phase4/python.sh b/phase4/python.sh index 9033c75..6f706c9 100644 --- a/phase4/python.sh +++ b/phase4/python.sh @@ -3,18 +3,17 @@ --enable-shared \ --with-system-expat \ --with-system-ffi \ - --with-ensurepip=yes \ --enable-optimizations make make install -install -dm755 /usr/share/doc/python-3.10.2/html +install -dm755 /usr/share/doc/python-3.10.6/html tar --strip-components=1 \ --no-same-owner \ --no-same-permissions \ - -C /usr/share/doc/python-3.10.2/html \ - -xvf ../python-3.10.2-docs-html.tar.bz2 + -C /usr/share/doc/python-3.10.6/html \ + -xvf ../$(basename $PKG_PYTHONDOCS) diff --git a/phase4/tcl.sh b/phase4/tcl.sh index c774410..d55b18e 100644 --- a/phase4/tcl.sh +++ b/phase4/tcl.sh @@ -3,8 +3,7 @@ tar -xf ../$(basename $PKG_TCLDOCS) --strip-components=1 SRCDIR=$(pwd) cd unix ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - $([ "$(uname -m)" = x86_64 ] && echo --enable-64bit) + --mandir=/usr/share/man make diff --git a/phase4/texinfo.sh b/phase4/texinfo.sh index c16ab39..046a402 100644 --- a/phase4/texinfo.sh +++ b/phase4/texinfo.sh @@ -1,9 +1,6 @@ # Texinfo Phase 4 ./configure --prefix=/usr -sed -e 's/__attribute_nonnull__/__nonnull/' \ - -i gnulib/lib/malloc/dynarray-skeleton.c - make if $RUN_TESTS diff --git a/phase4/utillinux.sh b/phase4/utillinux.sh index e328903..d65e15a 100644 --- a/phase4/utillinux.sh +++ b/phase4/utillinux.sh @@ -3,7 +3,7 @@ --bindir=/usr/bin \ --libdir=/usr/lib \ --sbindir=/usr/sbin \ - --docdir=/usr/share/doc/util-linux-2.37.4 \ + --docdir=/usr/share/doc/util-linux-2.38.1 \ --disable-chfn-chsh \ --disable-login \ --disable-nologin \ diff --git a/phase4/vim.sh b/phase4/vim.sh index e121489..dc978fa 100644 --- a/phase4/vim.sh +++ b/phase4/vim.sh @@ -15,5 +15,4 @@ fi make install -ln -sv ../vim/vim82/doc /usr/share/doc/vim-8.2.4383 - +ln -sv ../vim/vim90/doc /usr/share/doc/vim-9.0.0228 diff --git a/phase4/wheel.sh b/phase4/wheel.sh new file mode 100644 index 0000000..fafb140 --- /dev/null +++ b/phase4/wheel.sh @@ -0,0 +1,3 @@ +# Wheel +pip3 install --no-index $PWD + diff --git a/phase4/xz.sh b/phase4/xz.sh index 6320590..1b40faf 100644 --- a/phase4/xz.sh +++ b/phase4/xz.sh @@ -1,7 +1,7 @@ # Xz Phase 4 ./configure --prefix=/usr \ --disable-static \ - --docdir=/usr/share/doc/xz-5.2.5 + --docdir=/usr/share/doc/xz-5.2.6 make diff --git a/phase4/zstd.sh b/phase4/zstd.sh index 4249707..8ee8028 100644 --- a/phase4/zstd.sh +++ b/phase4/zstd.sh @@ -1,5 +1,7 @@ # Zstd Phase 4 -make +patch -Np1 -i ../$(basename $PATCH_ZSTD) + +make prefix=/usr if $RUN_TESTS then @@ -8,6 +10,6 @@ then set -e fi -make PREFIX=/usr install +make prefix=/usr install rm /usr/lib/libzstd.a diff --git a/static/etc__ld.so.conf b/static/etc__ld.so.conf index 1849f06..f7dc4ae 100644 --- a/static/etc__ld.so.conf +++ b/static/etc__ld.so.conf @@ -1,2 +1,5 @@ /usr/local/lib /opt/lib + +include /etc/ld.so.conf.d/*.conf + diff --git a/static/etc__pip.conf b/static/etc__pip.conf new file mode 100644 index 0000000..728edf2 --- /dev/null +++ b/static/etc__pip.conf @@ -0,0 +1,4 @@ +[global] +root-user-action = ignore +disable-pip-version-check = true +