From aa90c0c5dd8236025f1b778391bac60779aa0614 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 5 Apr 2021 20:54:52 -0500 Subject: Add a block to exit if package does not exist in packages.csv. --- packageinstall.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packageinstall.sh b/packageinstall.sh index a277e6c..88876ac 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -3,16 +3,24 @@ CHAPTER="$1" PACKAGE="$2" +if ! grep "^${PACKAGE}" packages.csv; then + printf "%b" " ${IRED}PACKAGE ${IYLW}${PACKAGE} ${IRED}DOES NOT EXIST!${RST}\n" + exit 1 +fi + if [[ -f "${LFS}/sources/chapter${CHAPTER}/${PACKAGE}" ]]; then printf "%b" "${GRN}Package ${YLW}${PACKAGE} ${GRN}already built and installed${RST}\n" else grep -i "^${PACKAGE}" packages.csv | grep -i -v "\.patch;" | while read -r line; do - VERSION="$(echo "$line" | cut -d\, -f2)" - URL="$(echo "$line" | cut -d\, -f3 | sed "s/@/${VERSION}/g")" + VERSION="$(echo "${line}" | cut -d\, -f2)" + URL="$(echo "${line}" | cut -d\, -f3 | sed "s/@/${VERSION}/g")" CACHEFILE="$(basename "${URL}")" DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)" + echo $NAME + exit 1 + # Remove existing if exists rm -rf "${DIRNAME}" @@ -48,4 +56,5 @@ else popd > /dev/null || return 1 done + fi -- cgit v1.2.3-54-g00ecf From b6925ebf059d6440d2c5dd37736cbc20e5639e41 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 5 Apr 2021 20:57:48 -0500 Subject: Remove lines for testing. --- packageinstall.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/packageinstall.sh b/packageinstall.sh index 88876ac..c9689a6 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -18,9 +18,6 @@ else CACHEFILE="$(basename "${URL}")" DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)" - echo $NAME - exit 1 - # Remove existing if exists rm -rf "${DIRNAME}" -- cgit v1.2.3-54-g00ecf From e23af271ea30fd57305887e79114d0dd4f861211 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 5 Apr 2021 21:02:45 -0500 Subject: Have grep exit 0 without stdoutput when checking if a package is in packages.csv. --- insidechroot.sh | 18 ++++++++++++++++-- packageinstall.sh | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/insidechroot.sh b/insidechroot.sh index 28cf64f..b78a4a2 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -22,7 +22,21 @@ if [[ "${CHAPTER}" -eq 7 ]]; then exit 1 fi done - + +elif [[ "${CHAPTER}" -eq 8 ]]; then + + # Chapter 8 + printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 8${IWHT} \ +============${RST}\n" + + for package in man-pages iana-etc glibc zlib bzip2 xz zstd file readline m4 bc flex tcl expect dejagnu binutils gmp mpfr mpc isl attr acl libcap shadow gcc pkg-config ncurses sed psmisc gettext bison grep bash libtool gdbm gperf expat inetutils perl xml-parser intltool autoconf automake kmod libelf libffi openssl python ninja meson coreutils check diffutils gawk findutils groff grub less gzip iproute2 kbd libpipeline make patch man-db tar texinfo vim eudev procps-ng util-linux e2fsprogs sysklogd sysvinit; do + source packageinstall.sh 8 $package + retval=$? + if [[ "${retval}" -ne 0 ]]; then + exit 1 + fi + done + else - printf "%b" "Do Chapter 8, 9 and 10 stuff here.\n" + printf "%b" "Do Chapter 9 and 10 stuff here.\n" fi diff --git a/packageinstall.sh b/packageinstall.sh index c9689a6..78e2cdd 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -3,7 +3,7 @@ CHAPTER="$1" PACKAGE="$2" -if ! grep "^${PACKAGE}" packages.csv; then +if ! grep -q "^${PACKAGE}" packages.csv; then printf "%b" " ${IRED}PACKAGE ${IYLW}${PACKAGE} ${IRED}DOES NOT EXIST!${RST}\n" exit 1 fi -- cgit v1.2.3-54-g00ecf From f3dab58139b0cf95f9f2a5e3d982237b4d8aa3cf Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 08:11:52 -0500 Subject: Change man-DB to man-db. --- packages.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.csv b/packages.csv index fade162..d72430f 100644 --- a/packages.csv +++ b/packages.csv @@ -48,7 +48,7 @@ linux,5.10.27,https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,506ee2 linux-api-headers,5.10.27,cdn://www.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,506ee265062384ac1194b2ea8317ca4f m4,1.4.18,http://ftp.gnu.org/gnu/m4/m4-@.tar.xz,730bb15d96fffe47e148d1e09235af82 make,4.3,http://ftp.gnu.org/gnu/make/make-@.tar.gz,fc7a67ea86ace13195b0bce683fd4469 -man-DB,2.9.4,http://download.savannah.gnu.org/releases/man-db/man-db-@.tar.xz,6e233a555f7b9ae91ce7cd0faa322bce +man-db,2.9.4,http://download.savannah.gnu.org/releases/man-db/man-db-@.tar.xz,6e233a555f7b9ae91ce7cd0faa322bce man-pages,5.10,https://www.kernel.org/pub/linux/docs/man-pages/man-pages-@.tar.xz,4ae3f74a1beddd919936e1058642644c meson,0.57.1,https://github.com/mesonbuild/meson/releases/download/@/meson-@.tar.gz,fbd744560351491892478a36a1586815 mpc,1.2.1,https://ftp.gnu.org/gnu/mpc/mpc-@.tar.gz,9f16c976c25bb0f76b50be749cd7a3a8 -- cgit v1.2.3-54-g00ecf From 23dc6b4e526722512eff9611e353b5da1f303896 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 08:18:00 -0500 Subject: Change procps to procps-ng. --- packages.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.csv b/packages.csv index d72430f..ec8e073 100644 --- a/packages.csv +++ b/packages.csv @@ -59,7 +59,7 @@ openssl,1.1.1j,https://www.openssl.org/source/openssl-@.tar.gz,cccaa064ed860a2b4 patch,2.7.6,http://ftp.gnu.org/gnu/patch/patch-@.tar.xz,78ad9937e4caadcba1526ef1853730d5 perl,5.32.1,https://www.cpan.org/src/5.0/perl-@.tar.xz,7f104064b906ad8c7329ca5e409a32d7 pkg-config,0.29.2,https://pkg-config.freedesktop.org/releases/pkg-config-@.tar.gz,f6e931e319531b736fadc017f470e68a -procps,3.3.17,https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-@.tar.xz,d60613e88c2f442ebd462b5a75313d56 +procps-ng,3.3.17,https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-@.tar.xz,d60613e88c2f442ebd462b5a75313d56 psmisc,23.4,https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-@.tar.xz,8114cd4489b95308efe2509c3a406bbf python,3.9.4,https://www.python.org/ftp/python/@/Python-@.tar.xz,2a3dba5fc75b695c45cf1806156e1a97 pythdoc,3.9.2,https://www.python.org/ftp/python/doc/@/python-@-docs-html.tar.bz2,719cd64a4c5768b646b716df20229400 -- cgit v1.2.3-54-g00ecf