From 64ba00afc7d9bd36fcce41108ef11b3774f0fbfe Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 1 Jun 2021 10:48:31 -0500 Subject: Use bash fixes-2 patch. --- chapter6/bash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter6') diff --git a/chapter6/bash.sh b/chapter6/bash.sh index 9251a89..7d080f2 100644 --- a/chapter6/bash.sh +++ b/chapter6/bash.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && +patch -Np1 -i ../bash-"${VERSION}"-fixes-2.patch && ./configure --prefix=/usr \ --build="$(support/config.guess)" \ --host="${LFS_TGT}" \ -- cgit v1.2.3-54-g00ecf From 500db32e9c5f680a7e1b4fb96e0ed7fa17a81899 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 1 Jun 2021 15:52:37 -0500 Subject: Adjust libmagic link command for ch6 file. --- chapter6/file.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter6') diff --git a/chapter6/file.sh b/chapter6/file.sh index f73bc18..2992f65 100644 --- a/chapter6/file.sh +++ b/chapter6/file.sh @@ -18,4 +18,4 @@ make FILE_COMPILE="$(pwd)"/build/src/file && make DESTDIR="${LFS}" -j1 install && mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib && -ln -sfv ../../lib/"$(readlink /usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so +ln -sfv ../../lib/"$(readlink /mnt/lfs/usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so -- cgit v1.2.3-54-g00ecf From 2d7505db2262a275b9dbf0d020afd6bed2fbd753 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 1 Jun 2021 16:03:26 -0500 Subject: Use LFS environment variable instead of hard coded /mnt/lfs. --- chapter6/file.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter6') diff --git a/chapter6/file.sh b/chapter6/file.sh index 2992f65..9b2ab19 100644 --- a/chapter6/file.sh +++ b/chapter6/file.sh @@ -18,4 +18,4 @@ make FILE_COMPILE="$(pwd)"/build/src/file && make DESTDIR="${LFS}" -j1 install && mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib && -ln -sfv ../../lib/"$(readlink /mnt/lfs/usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so +ln -sfv ../../lib/"$(readlink "${LFS}"/usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so -- cgit v1.2.3-54-g00ecf