From e07be520145730eb14cef2845c7d906298cdf1b7 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 13 Apr 2021 12:59:10 -0500 Subject: Add set -e to top of scripts and remove space between -j and value in MAKEFLAGS. --- chapter6/backup.sh | 1 + chapter6/bash.sh | 1 + chapter6/binutils.sh | 1 + chapter6/cleanup.sh | 8 ++++---- chapter6/coreutils.sh | 1 + chapter6/diffutils.sh | 1 + chapter6/file.sh | 1 + chapter6/findutils.sh | 1 + chapter6/gawk.sh | 1 + chapter6/gcc.sh | 1 + chapter6/grep.sh | 1 + chapter6/gzip.sh | 1 + chapter6/m4.sh | 1 + chapter6/make.sh | 1 + chapter6/ncurses.sh | 1 + chapter6/patch.sh | 1 + chapter6/sed.sh | 1 + chapter6/tar.sh | 1 + chapter6/xz.sh | 1 + 19 files changed, 22 insertions(+), 4 deletions(-) (limited to 'chapter6') diff --git a/chapter6/backup.sh b/chapter6/backup.sh index 43e8b18..837c44c 100644 --- a/chapter6/backup.sh +++ b/chapter6/backup.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e file="${LFS_VER}-ch6-backup.tar.xz" directories=(bin etc lib lib64 sbin tools usr var) diff --git a/chapter6/bash.sh b/chapter6/bash.sh index c920026..9251a89 100644 --- a/chapter6/bash.sh +++ b/chapter6/bash.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && ./configure --prefix=/usr \ diff --git a/chapter6/binutils.sh b/chapter6/binutils.sh index 9b97c4b..3e4af1d 100644 --- a/chapter6/binutils.sh +++ b/chapter6/binutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e mkdir -v build cd build || exit 1 diff --git a/chapter6/cleanup.sh b/chapter6/cleanup.sh index f0b9ce3..0eb80a2 100644 --- a/chapter6/cleanup.sh +++ b/chapter6/cleanup.sh @@ -14,10 +14,10 @@ else rm -rfv "${LFS}"/usr/share/info rm -rfv "${LFS}"/usr/share/man - strip --strip-debug "${LFS}"/usr/lib/* - strip --strip-unneeded "${LFS}"/usr/bin/* - strip --strip-unneeded "${LFS}"/usr/sbin/* - strip --strip-unneeded "${LFS}"/tools/bin/* + strip --strip-debug "${LFS}"/usr/lib/* + strip --strip-unneeded "${LFS}"/usr/bin/* + strip --strip-unneeded "${LFS}"/usr/sbin/* + strip --strip-unneeded "${LFS}"/tools/bin/* } >"${LFS}"/sources/log/chapter6/cleanup.log 2>&1 diff --git a/chapter6/coreutils.sh b/chapter6/coreutils.sh index 536fa52..5231b45 100644 --- a/chapter6/coreutils.sh +++ b/chapter6/coreutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/diffutils.sh b/chapter6/diffutils.sh index f6c45af..580d795 100644 --- a/chapter6/diffutils.sh +++ b/chapter6/diffutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed 's/help2man -i/help2man --no-discard-stderr -i /' -i man/Makefile.in HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr \ diff --git a/chapter6/file.sh b/chapter6/file.sh index 4f1f294..69c17d8 100644 --- a/chapter6/file.sh +++ b/chapter6/file.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e mkdir build pushd build > /dev/null || exit 1 diff --git a/chapter6/findutils.sh b/chapter6/findutils.sh index 0526c41..5617c10 100644 --- a/chapter6/findutils.sh +++ b/chapter6/findutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e # shellcheck disable=SC2016 ./configure --prefix=/usr \ diff --git a/chapter6/gawk.sh b/chapter6/gawk.sh index 29d7a8b..1d18cdc 100644 --- a/chapter6/gawk.sh +++ b/chapter6/gawk.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i 's/extras//' Makefile.in && ./configure --prefix=/usr \ diff --git a/chapter6/gcc.sh b/chapter6/gcc.sh index 881d200..7806d3a 100644 --- a/chapter6/gcc.sh +++ b/chapter6/gcc.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e mkdir -p isl mpfr gmp mpc tar -xf ../isl-*.tar.xz -C isl --strip-components=1 diff --git a/chapter6/grep.sh b/chapter6/grep.sh index 9aab0f4..7aaa38a 100644 --- a/chapter6/grep.sh +++ b/chapter6/grep.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/gzip.sh b/chapter6/gzip.sh index f894df6..d8a45c7 100644 --- a/chapter6/gzip.sh +++ b/chapter6/gzip.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" && diff --git a/chapter6/m4.sh b/chapter6/m4.sh index 2f67ebe..aeb1024 100644 --- a/chapter6/m4.sh +++ b/chapter6/m4.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c && echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h && diff --git a/chapter6/make.sh b/chapter6/make.sh index 4de06b6..0b2ace4 100644 --- a/chapter6/make.sh +++ b/chapter6/make.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --without-guile \ diff --git a/chapter6/ncurses.sh b/chapter6/ncurses.sh index 6320a9f..1bf8824 100644 --- a/chapter6/ncurses.sh +++ b/chapter6/ncurses.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i s/mawk// configure && diff --git a/chapter6/patch.sh b/chapter6/patch.sh index fa1dac9..42add5e 100644 --- a/chapter6/patch.sh +++ b/chapter6/patch.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/sed.sh b/chapter6/sed.sh index 9aab0f4..7aaa38a 100644 --- a/chapter6/sed.sh +++ b/chapter6/sed.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/tar.sh b/chapter6/tar.sh index 730d108..28aea9c 100644 --- a/chapter6/tar.sh +++ b/chapter6/tar.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/xz.sh b/chapter6/xz.sh index 6766de1..a519ebd 100644 --- a/chapter6/xz.sh +++ b/chapter6/xz.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ -- cgit v1.2.3-54-g00ecf