From 69357ef7e8507fe674f0aa0b9f086004017a8651 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 09:55:56 -0500 Subject: Use package version for versioned patch/directories. --- chapter5/glibc.sh | 2 +- chapter6/xz.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter5/glibc.sh b/chapter5/glibc.sh index 37dbd2b..8997613 100644 --- a/chapter5/glibc.sh +++ b/chapter5/glibc.sh @@ -8,7 +8,7 @@ case $(uname -m) in ;; esac -patch -Np1 -i ../glibc-2.33-fhs-1.patch && +patch -Np1 -i ../glibc-"${VERSION}"-fhs-1.patch && mkdir -v build cd build || exit 1 diff --git a/chapter6/xz.sh b/chapter6/xz.sh index 12a43ce..6766de1 100644 --- a/chapter6/xz.sh +++ b/chapter6/xz.sh @@ -4,7 +4,7 @@ --host="${LFS_TGT}" \ --build="$(build-aux/config.guess)" \ --disable-static \ - --docdir=/usr/share/doc/xz-5.2.5 && + --docdir=/usr/share/doc/xz-"${VERSION}" && make && make DESTDIR="${LFS}" -j1 install mv -v "${LFS}"/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat} "${LFS}"/bin && -- cgit v1.2.3-54-g00ecf From af55a0c0b55086338ab72421bafabe234106c0a3 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 10:01:50 -0500 Subject: Download acl xz archive instead of gzipped to match xz md5sum. --- packages.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.csv b/packages.csv index a80088d..6576b5c 100644 --- a/packages.csv +++ b/packages.csv @@ -1,4 +1,4 @@ -acl,2.3.1,http://download.savannah.gnu.org/releases/acl/acl-@.tar.gz,95ce715fe09acca7c12d3306d0f076b2 +acl,2.3.1,http://download.savannah.gnu.org/releases/acl/acl-@.tar.xz,95ce715fe09acca7c12d3306d0f076b2 attr,2.5.1,http://download.savannah.gnu.org/releases/attr/attr-@.tar.gz,ac1c5a7a084f0f83b8cace34211f64d8 autoconf,2.71,http://ftp.gnu.org/gnu/autoconf/autoconf-@.tar.xz,12cfa1687ffa2606337efe1a64416106 automake,1.16.3,http://ftp.gnu.org/gnu/automake/automake-@.tar.xz,c27f608a4e1f302ec7ce42f1251c184e -- cgit v1.2.3-54-g00ecf