From 9faaf2c6ac30908d479470aada4c9c8d8473789c Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 14:16:54 -0500 Subject: Add chapter9 log directory. --- lfs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lfs.sh b/lfs.sh index dc83800..a6b2abc 100755 --- a/lfs.sh +++ b/lfs.sh @@ -226,6 +226,9 @@ source mountvirtfs.sh printf "%b" "\n${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n" sleep 3 +# Create chapter9 log directory as non root user +mkdir -p "${LFS}"/sources/log/chapter9 + # Enter CHROOT for chapter 9,10 sudo chroot "${LFS}" /usr/bin/env -i \ HOME=/root \ -- cgit v1.2.3-54-g00ecf From 630b76c8033336ab7d6a3d205249151a6fdfe498 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 14:17:25 -0500 Subject: Add section for building chapter9. --- insidechroot.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/insidechroot.sh b/insidechroot.sh index 08eada0..f92e65e 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -39,6 +39,20 @@ elif [[ "${CHAPTER}" -eq 8 ]]; then fi done +elif [[ "${CHAPTER}" -eq 9 ]]; then + + # Chapter 9 + printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 9${IWHT} \ +============${RST}\n" + + for package in lfs-bootscripts; do + source packageinstall.sh 9 $package + retval=$? + if [[ "${retval}" -ne 0 ]]; then + exit 1 + fi + done + else - printf "%b" "Do Chapter 9 and 10 stuff here.\n" + printf "%b" "Do Chapter 10 stuff here.\n" fi -- cgit v1.2.3-54-g00ecf From 2656594c9366952850ae43d78f369b8016a080ac Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 14:17:37 -0500 Subject: Add lfs-bootscripts script for chapter9. --- chapter9/lfs-bootscripts.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 chapter9/lfs-bootscripts.sh diff --git a/chapter9/lfs-bootscripts.sh b/chapter9/lfs-bootscripts.sh new file mode 100644 index 0000000..db9dad4 --- /dev/null +++ b/chapter9/lfs-bootscripts.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +make -j1 install -- cgit v1.2.3-54-g00ecf From f2f32afb557e1c14fe290e9f66815a44b580d0c0 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 14:44:05 -0500 Subject: Add network to list of targets to install. --- insidechroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/insidechroot.sh b/insidechroot.sh index f92e65e..0e0e621 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -45,8 +45,8 @@ elif [[ "${CHAPTER}" -eq 9 ]]; then printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 9${IWHT} \ ============${RST}\n" - for package in lfs-bootscripts; do - source packageinstall.sh 9 $package + for package in lfs-bootscripts network; do + source packageinstall.sh network 9 $package retval=$? if [[ "${retval}" -ne 0 ]]; then exit 1 -- cgit v1.2.3-54-g00ecf From a9b426a7e809e028ade57b3046e58e65dbba583e Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 14:44:12 -0500 Subject: Add network script. --- chapter9/network.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 chapter9/network.sh diff --git a/chapter9/network.sh b/chapter9/network.sh new file mode 100644 index 0000000..6eeead9 --- /dev/null +++ b/chapter9/network.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +pushd /etc/sysconfig/ >/dev/null || exit 1 +cat > ifconfig.eth0 << "EOF" +ONBOOT=yes +IFACE=eth0 +SERVICE=ipv4-static +IP=192.168.1.196 +GATEWAY=192.168.1.1 +PREFIX=24 +BROADCAST=192.168.1.255 +EOF +popd >/dev/null || exit 1 -- cgit v1.2.3-54-g00ecf From dca0c604b4a51fc14f4469e2976937480970cc89 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 14:44:24 -0500 Subject: Add shellcheck directive. --- chapter6/findutils.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chapter6/findutils.sh b/chapter6/findutils.sh index 9d53587..0526c41 100644 --- a/chapter6/findutils.sh +++ b/chapter6/findutils.sh @@ -1,8 +1,10 @@ #!/bin/bash +# shellcheck disable=SC2016 ./configure --prefix=/usr \ --host="${LFS_TGT}" \ --build="$(build-aux/config.guess)" && + make && make DESTDIR="${LFS}" -j1 install && -- cgit v1.2.3-54-g00ecf From 7215575834db88849e6ba78de8d179b4a80bdeb6 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 15:01:59 -0500 Subject: Add to network script and source network script during build. --- chapter9/network.sh | 25 +++++++++++++++++++++++++ insidechroot.sh | 15 ++++++++------- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/chapter9/network.sh b/chapter9/network.sh index 6eeead9..e1386a4 100644 --- a/chapter9/network.sh +++ b/chapter9/network.sh @@ -11,3 +11,28 @@ PREFIX=24 BROADCAST=192.168.1.255 EOF popd >/dev/null || exit 1 + +cat > /etc/resolv.conf << "EOF" +# Begin /etc/resolv.conf + +nameserver 192.168.1.10 +domain berzerkula.org +search berzerkula.org + +# End /etc/resolv.conf +EOF + +echo "lfs" > /etc/hostname + +cat > /etc/hosts << "EOF" +# Begin /etc/hosts + +127.0.0.1 localhost.localdomain localhost +127.0.1.1 lfs.berzerkula.org lfs +192.168.1.196 lfs.berzerkula.org lfs +::1 localhost ip6-localhost ip6-loopback +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters + +# End /etc/hosts +EOF diff --git a/insidechroot.sh b/insidechroot.sh index 0e0e621..197658c 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -45,13 +45,14 @@ elif [[ "${CHAPTER}" -eq 9 ]]; then printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 9${IWHT} \ ============${RST}\n" - for package in lfs-bootscripts network; do - source packageinstall.sh network 9 $package - retval=$? - if [[ "${retval}" -ne 0 ]]; then - exit 1 - fi - done + source packageinstall.sh 9 lfs-bootscripts + retval=$? + if [[ "${retval}" -ne 0 ]]; then + exit 1 + fi + + printf "%b" "${GRN}Configuring network related files${RST}\n" + source chapter9/network.sh else printf "%b" "Do Chapter 10 stuff here.\n" -- cgit v1.2.3-54-g00ecf From bd6f662dfb7d293b8143785a7b28c9bfeccd0ee2 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 15:21:47 -0500 Subject: Add bash profile, boot script configuration, inputrc and shell configuration to chapter9. --- chapter9/bashprofile.sh | 9 ++++++++ chapter9/bootscriptconf.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++ chapter9/inputrc.sh | 45 ++++++++++++++++++++++++++++++++++++++++ chapter9/shells.sh | 10 +++++++++ insidechroot.sh | 8 ++++++++ 5 files changed, 123 insertions(+) create mode 100644 chapter9/bashprofile.sh create mode 100644 chapter9/bootscriptconf.sh create mode 100644 chapter9/inputrc.sh create mode 100644 chapter9/shells.sh diff --git a/chapter9/bashprofile.sh b/chapter9/bashprofile.sh new file mode 100644 index 0000000..9636b3a --- /dev/null +++ b/chapter9/bashprofile.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +cat > /etc/profile << "EOF" +# Begin /etc/profile + +export LANG=en_US + +# End /etc/profile +EOF diff --git a/chapter9/bootscriptconf.sh b/chapter9/bootscriptconf.sh new file mode 100644 index 0000000..3c00024 --- /dev/null +++ b/chapter9/bootscriptconf.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +cat > /etc/inittab << "EOF" +# Begin /etc/inittab + +id:3:initdefault: + +si::sysinit:/etc/rc.d/init.d/rc S + +l0:0:wait:/etc/rc.d/init.d/rc 0 +l1:S1:wait:/etc/rc.d/init.d/rc 1 +l2:2:wait:/etc/rc.d/init.d/rc 2 +l3:3:wait:/etc/rc.d/init.d/rc 3 +l4:4:wait:/etc/rc.d/init.d/rc 4 +l5:5:wait:/etc/rc.d/init.d/rc 5 +l6:6:wait:/etc/rc.d/init.d/rc 6 + +ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now + +su:S016:once:/sbin/sulogin + +1:2345:respawn:/sbin/agetty --noclear tty1 9600 +2:2345:respawn:/sbin/agetty tty2 9600 +3:2345:respawn:/sbin/agetty tty3 9600 +4:2345:respawn:/sbin/agetty tty4 9600 +5:2345:respawn:/sbin/agetty tty5 9600 +6:2345:respawn:/sbin/agetty tty6 9600 + +# End /etc/inittab +EOF + +cat > /etc/sysconfig/clock << "EOF" +# Begin /etc/sysconfig/clock + +UTC=1 + +# Set this to any options you might need to give to hwclock, +# such as machine hardware clock type for Alphas. +CLOCKPARAMS= + +# End /etc/sysconfig/clock +EOF + +#cat > /etc/sysconfig/console << "EOF" +# Begin /etc/sysconfig/console + +#KEYMAP="pl2" +#FONT="lat2a-16 -m 8859-2" + +# End /etc/sysconfig/console +#EOF diff --git a/chapter9/inputrc.sh b/chapter9/inputrc.sh new file mode 100644 index 0000000..bab2a35 --- /dev/null +++ b/chapter9/inputrc.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +cat > /etc/inputrc << "EOF" +# Begin /etc/inputrc +# Modified by Chris Lynn + +# Allow the command prompt to wrap to the next line +set horizontal-scroll-mode Off + +# Enable 8bit input +set meta-flag On +set input-meta On + +# Turns off 8th bit stripping +set convert-meta Off + +# Keep the 8th bit for display +set output-meta On + +# none, visible or audible +set bell-style none + +# All of the following map the escape sequence of the value +# contained in the 1st argument to the readline specific functions +"\eOd": backward-word +"\eOc": forward-word + +# for linux console +"\e[1~": beginning-of-line +"\e[4~": end-of-line +"\e[5~": beginning-of-history +"\e[6~": end-of-history +"\e[3~": delete-char +"\e[2~": quoted-insert + +# for xterm +"\eOH": beginning-of-line +"\eOF": end-of-line + +# for Konsole +"\e[H": beginning-of-line +"\e[F": end-of-line + +# End /etc/inputrc +EOF diff --git a/chapter9/shells.sh b/chapter9/shells.sh new file mode 100644 index 0000000..d94254c --- /dev/null +++ b/chapter9/shells.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +cat > /etc/shells << "EOF" +# Begin /etc/shells + +/bin/sh +/bin/bash + +# End /etc/shells +EOF diff --git a/insidechroot.sh b/insidechroot.sh index 197658c..35cc244 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -53,6 +53,14 @@ elif [[ "${CHAPTER}" -eq 9 ]]; then printf "%b" "${GRN}Configuring network related files${RST}\n" source chapter9/network.sh + printf "%b" "${GRN}Configuring bootscript related files${RST}\n" + source chapter9/bootscriptconf.sh + printf "%b" "${GRN}Configuring locale settings${RST}\n" + source chapter9/bashprofile.sh + printf "%b" "${GRN}Configuring inputrc${RST}\n" + source chapter9/inputrc.sh + printf "%b" "${GRN}Configuring system shells${RST}\n" + source chapter9/shells.sh else printf "%b" "Do Chapter 10 stuff here.\n" -- cgit v1.2.3-54-g00ecf From 18c493af15d67d3df3445d69d6ee48620535d8aa 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. --- chapter5/binutils.sh | 1 + chapter5/gcc.sh | 1 + chapter5/glibc.sh | 1 + chapter5/libstdc++.sh | 1 + chapter5/linux-api-headers.sh | 1 + 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 + chapter7/backup.sh | 1 + chapter7/bison.sh | 1 + chapter7/cleanup.sh | 1 + chapter7/gettext.sh | 1 + chapter7/libstdc++.sh | 1 + chapter7/perl.sh | 1 + chapter7/python.sh | 1 + chapter7/texinfo.sh | 1 + chapter7/util-linux.sh | 1 + chapter8/acl.sh | 1 + chapter8/attr.sh | 1 + chapter8/autoconf.sh | 1 + chapter8/automake.sh | 1 + chapter8/backup.sh | 1 + chapter8/bash.sh | 1 + chapter8/bc.sh | 1 + chapter8/binutils.sh | 1 + chapter8/bison.sh | 1 + chapter8/bzip2.sh | 1 + chapter8/check.sh | 1 + chapter8/cleanup.sh | 1 + chapter8/coreutils.sh | 1 + chapter8/dejagnu.sh | 1 + chapter8/diffutils.sh | 1 + chapter8/e2fsprogs.sh | 1 + chapter8/eudev.sh | 1 + chapter8/expat.sh | 1 + chapter8/expect.sh | 1 + chapter8/file.sh | 1 + chapter8/findutils.sh | 1 + chapter8/flex.sh | 1 + chapter8/gawk.sh | 1 + chapter8/gcc.sh | 1 + chapter8/gdbm.sh | 1 + chapter8/gettext.sh | 1 + chapter8/glibc.sh | 1 + chapter8/gmp.sh | 1 + chapter8/gperf.sh | 1 + chapter8/grep.sh | 1 + chapter8/groff.sh | 1 + chapter8/grub.sh | 1 + chapter8/gzip.sh | 1 + chapter8/iana-etc.sh | 1 + chapter8/inetutils.sh | 1 + chapter8/intltool.sh | 1 + chapter8/iproute2.sh | 1 + chapter8/isl.sh | 1 + chapter8/kbd.sh | 1 + chapter8/kmod.sh | 1 + chapter8/less.sh | 1 + chapter8/libcap.sh | 1 + chapter8/libelf.sh | 1 + chapter8/libffi.sh | 1 + chapter8/libpipeline.sh | 1 + chapter8/libtool.sh | 1 + chapter8/m4.sh | 1 + chapter8/make.sh | 1 + chapter8/man-db.sh | 1 + chapter8/man-pages.sh | 1 + chapter8/meson.sh | 1 + chapter8/mpc.sh | 1 + chapter8/mpfr.sh | 1 + chapter8/ncurses.sh | 1 + chapter8/ninja.sh | 1 + chapter8/openssl.sh | 1 + chapter8/patch.sh | 1 + chapter8/perl.sh | 1 + chapter8/pkg-config.sh | 1 + chapter8/procps-ng.sh | 1 + chapter8/psmisc.sh | 1 + chapter8/python.sh | 1 + chapter8/readline.sh | 1 + chapter8/sed.sh | 1 + chapter8/shadow.sh | 1 + chapter8/sysklogd.sh | 1 + chapter8/sysvinit.sh | 1 + chapter8/tar.sh | 1 + chapter8/tcl.sh | 1 + chapter8/texinfo.sh | 1 + chapter8/util-linux.sh | 1 + chapter8/vim.sh | 1 + chapter8/xml-parser.sh | 1 + chapter8/xz.sh | 1 + chapter8/zlib.sh | 1 + chapter8/zstd.sh | 1 + env.sh | 2 +- 110 files changed, 113 insertions(+), 5 deletions(-) diff --git a/chapter5/binutils.sh b/chapter5/binutils.sh index 2d9da5b..5176d0c 100644 --- a/chapter5/binutils.sh +++ b/chapter5/binutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e mkdir build cd build || exit 1 diff --git a/chapter5/gcc.sh b/chapter5/gcc.sh index 52079a4..84879c5 100644 --- a/chapter5/gcc.sh +++ b/chapter5/gcc.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e mkdir -p mpfr gmp mpc tar -xf ../mpfr-*.tar.xz -C mpfr --strip-components=1 diff --git a/chapter5/glibc.sh b/chapter5/glibc.sh index edab0d3..7f52023 100644 --- a/chapter5/glibc.sh +++ b/chapter5/glibc.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e case $(uname -m) in i?86) ln -sfv ld-linux.so.2 "${LFS}"/lib/ld-lsb.so.3 diff --git a/chapter5/libstdc++.sh b/chapter5/libstdc++.sh index d1be7dd..d8cb707 100644 --- a/chapter5/libstdc++.sh +++ b/chapter5/libstdc++.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e mkdir -v build cd build || exit 1 diff --git a/chapter5/linux-api-headers.sh b/chapter5/linux-api-headers.sh index 3111625..41d7cfc 100644 --- a/chapter5/linux-api-headers.sh +++ b/chapter5/linux-api-headers.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e make mrproper && make headers && 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}" \ diff --git a/chapter7/backup.sh b/chapter7/backup.sh index 38d626f..9418775 100644 --- a/chapter7/backup.sh +++ b/chapter7/backup.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e file="${LFS_VER}-ch7-backup.tar.xz" directories=(bin dev etc lib lib64 proc run sbin sys tools usr var) diff --git a/chapter7/bison.sh b/chapter7/bison.sh index 2385d22..9de734e 100644 --- a/chapter7/bison.sh +++ b/chapter7/bison.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --docdir=/usr/share/doc/bison-"${VERSION}" && make && diff --git a/chapter7/cleanup.sh b/chapter7/cleanup.sh index 921981b..53ad4d4 100644 --- a/chapter7/cleanup.sh +++ b/chapter7/cleanup.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e if [ -f "${LFS}/sources/chapter7/cleanup" ]; then printf "%b" " ${IGRN}Cleanup already performed${RST}\n" diff --git a/chapter7/gettext.sh b/chapter7/gettext.sh index 49fbf15..b1dca1c 100644 --- a/chapter7/gettext.sh +++ b/chapter7/gettext.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --disable-shared make && diff --git a/chapter7/libstdc++.sh b/chapter7/libstdc++.sh index c2ef63b..87c89b7 100644 --- a/chapter7/libstdc++.sh +++ b/chapter7/libstdc++.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ln -s gthr-posix.h libgcc/gthr-default.h mkdir build diff --git a/chapter7/perl.sh b/chapter7/perl.sh index 970e17c..627e3e5 100644 --- a/chapter7/perl.sh +++ b/chapter7/perl.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e MAJMIN="$(cut -d\. -f1,2 <<< "${VERSION}")" diff --git a/chapter7/python.sh b/chapter7/python.sh index daf1677..428beaa 100644 --- a/chapter7/python.sh +++ b/chapter7/python.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --enable-shared \ diff --git a/chapter7/texinfo.sh b/chapter7/texinfo.sh index 1935156..b3bba9e 100644 --- a/chapter7/texinfo.sh +++ b/chapter7/texinfo.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr && make && diff --git a/chapter7/util-linux.sh b/chapter7/util-linux.sh index 7a00c8c..e0241fa 100644 --- a/chapter7/util-linux.sh +++ b/chapter7/util-linux.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e mkdir -p /var/lib/hwclock && ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ diff --git a/chapter8/acl.sh b/chapter8/acl.sh index da4caae..a82a047 100644 --- a/chapter8/acl.sh +++ b/chapter8/acl.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --bindir=/bin \ diff --git a/chapter8/attr.sh b/chapter8/attr.sh index f68d6cb..aede208 100644 --- a/chapter8/attr.sh +++ b/chapter8/attr.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --bindir=/bin \ diff --git a/chapter8/autoconf.sh b/chapter8/autoconf.sh index c3588fd..80e5dae 100644 --- a/chapter8/autoconf.sh +++ b/chapter8/autoconf.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/automake.sh b/chapter8/automake.sh index e2b76e8..280e5fe 100644 --- a/chapter8/automake.sh +++ b/chapter8/automake.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i "s/''/etags/" t/tags-lisp-space.sh diff --git a/chapter8/backup.sh b/chapter8/backup.sh index 8d750c5..d7a29ac 100644 --- a/chapter8/backup.sh +++ b/chapter8/backup.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e file="${LFS_VER}-ch8-backup.tar.xz" directories=(bin boot dev etc home lib lib64 media mnt opt proc root run sbin srv sys tmp usr var) diff --git a/chapter8/bash.sh b/chapter8/bash.sh index b4ca0c2..6bbd448 100644 --- a/chapter8/bash.sh +++ b/chapter8/bash.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch diff --git a/chapter8/bc.sh b/chapter8/bc.sh index cfc3b3c..b6416e4 100644 --- a/chapter8/bc.sh +++ b/chapter8/bc.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e CC=gcc ./configure.sh --prefix=/usr -G -O3 diff --git a/chapter8/binutils.sh b/chapter8/binutils.sh index 41a99b1..4236b80 100644 --- a/chapter8/binutils.sh +++ b/chapter8/binutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e expect -c "spawn ls" diff --git a/chapter8/bison.sh b/chapter8/bison.sh index eb97728..b1fbc99 100644 --- a/chapter8/bison.sh +++ b/chapter8/bison.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --docdir=/usr/share/doc/bison-"${VERSION}" diff --git a/chapter8/bzip2.sh b/chapter8/bzip2.sh index 81b111e..667bd5f 100644 --- a/chapter8/bzip2.sh +++ b/chapter8/bzip2.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e patch -Np1 -i ../bzip2-"${VERSION}"-install_docs-1.patch diff --git a/chapter8/check.sh b/chapter8/check.sh index 9a4f704..4b856a3 100644 --- a/chapter8/check.sh +++ b/chapter8/check.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --disable-static diff --git a/chapter8/cleanup.sh b/chapter8/cleanup.sh index 8d78f03..ec4084f 100644 --- a/chapter8/cleanup.sh +++ b/chapter8/cleanup.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e if [ -f "${LFS}/sources/chapter8/cleanup" ]; then printf "%b" " ${IGRN}Cleanup already performed${RST}\n" diff --git a/chapter8/coreutils.sh b/chapter8/coreutils.sh index 6a41065..1bbc0f3 100644 --- a/chapter8/coreutils.sh +++ b/chapter8/coreutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e patch -Np1 -i ../coreutils-"${VERSION}"-i18n-1.patch diff --git a/chapter8/dejagnu.sh b/chapter8/dejagnu.sh index fc94545..5d66681 100644 --- a/chapter8/dejagnu.sh +++ b/chapter8/dejagnu.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi diff --git a/chapter8/diffutils.sh b/chapter8/diffutils.sh index c3588fd..80e5dae 100644 --- a/chapter8/diffutils.sh +++ b/chapter8/diffutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/e2fsprogs.sh b/chapter8/e2fsprogs.sh index b872707..2116d00 100644 --- a/chapter8/e2fsprogs.sh +++ b/chapter8/e2fsprogs.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e mkdir -v build cd build || exit 1 diff --git a/chapter8/eudev.sh b/chapter8/eudev.sh index a15e189..29d0ae2 100644 --- a/chapter8/eudev.sh +++ b/chapter8/eudev.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --bindir=/sbin \ diff --git a/chapter8/expat.sh b/chapter8/expat.sh index 1e21feb..d01da34 100644 --- a/chapter8/expat.sh +++ b/chapter8/expat.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/expect.sh b/chapter8/expect.sh index 1b7ccdc..55d1137 100644 --- a/chapter8/expect.sh +++ b/chapter8/expect.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --with-tcl=/usr/lib \ diff --git a/chapter8/file.sh b/chapter8/file.sh index 343b08b..56e9aab 100644 --- a/chapter8/file.sh +++ b/chapter8/file.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr make diff --git a/chapter8/findutils.sh b/chapter8/findutils.sh index 8203619..8f6f583 100644 --- a/chapter8/findutils.sh +++ b/chapter8/findutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --localstatedir=/var/lib/locate diff --git a/chapter8/flex.sh b/chapter8/flex.sh index 58d7b29..94ca651 100644 --- a/chapter8/flex.sh +++ b/chapter8/flex.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --docdir=/usr/share/doc/flex-"${VERSION}" \ diff --git a/chapter8/gawk.sh b/chapter8/gawk.sh index eb7c111..f30bea4 100644 --- a/chapter8/gawk.sh +++ b/chapter8/gawk.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i 's/extras//' Makefile.in diff --git a/chapter8/gcc.sh b/chapter8/gcc.sh index 7b4df3b..2eb8329 100644 --- a/chapter8/gcc.sh +++ b/chapter8/gcc.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e case $(uname -m) in x86_64) diff --git a/chapter8/gdbm.sh b/chapter8/gdbm.sh index adf3947..4053f4a 100644 --- a/chapter8/gdbm.sh +++ b/chapter8/gdbm.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/gettext.sh b/chapter8/gettext.sh index 1ff6c97..ff604b8 100644 --- a/chapter8/gettext.sh +++ b/chapter8/gettext.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/glibc.sh b/chapter8/glibc.sh index 6f6289c..520d42b 100644 --- a/chapter8/glibc.sh +++ b/chapter8/glibc.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e patch -Np1 -i ../glibc-"${VERSION}"-fhs-1.patch diff --git a/chapter8/gmp.sh b/chapter8/gmp.sh index f853d52..4c346c1 100644 --- a/chapter8/gmp.sh +++ b/chapter8/gmp.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e # Uncomment for generic libraries # cp -v configfsf.guess config.guess diff --git a/chapter8/gperf.sh b/chapter8/gperf.sh index 66c6e76..c2b8a9f 100644 --- a/chapter8/gperf.sh +++ b/chapter8/gperf.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-"${VERSION}" diff --git a/chapter8/grep.sh b/chapter8/grep.sh index 3c82a41..b0ba921 100644 --- a/chapter8/grep.sh +++ b/chapter8/grep.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --bindir=/bin diff --git a/chapter8/groff.sh b/chapter8/groff.sh index ec6b15c..ef920a5 100644 --- a/chapter8/groff.sh +++ b/chapter8/groff.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e PAGE=letter ./configure --prefix=/usr diff --git a/chapter8/grub.sh b/chapter8/grub.sh index edb7b3b..9c2917b 100644 --- a/chapter8/grub.sh +++ b/chapter8/grub.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed "s/gold-version/& -R .note.gnu.property/" \ -i Makefile.in grub-core/Makefile.in diff --git a/chapter8/gzip.sh b/chapter8/gzip.sh index dbf30a3..02c7101 100644 --- a/chapter8/gzip.sh +++ b/chapter8/gzip.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/iana-etc.sh b/chapter8/iana-etc.sh index 8576a80..be58311 100644 --- a/chapter8/iana-etc.sh +++ b/chapter8/iana-etc.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e cp -v services protocols /etc diff --git a/chapter8/inetutils.sh b/chapter8/inetutils.sh index 3999fb7..f96f5f4 100644 --- a/chapter8/inetutils.sh +++ b/chapter8/inetutils.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --localstatedir=/var \ diff --git a/chapter8/intltool.sh b/chapter8/intltool.sh index 0ab53c5..7023410 100644 --- a/chapter8/intltool.sh +++ b/chapter8/intltool.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i 's:\\\${:\\\$\\{:' intltool-update.in diff --git a/chapter8/iproute2.sh b/chapter8/iproute2.sh index efa8e3f..4ac6a65 100644 --- a/chapter8/iproute2.sh +++ b/chapter8/iproute2.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i /ARPD/d Makefile rm -fv man/man8/arpd.8 diff --git a/chapter8/isl.sh b/chapter8/isl.sh index 3a98da1..1187a4d 100644 --- a/chapter8/isl.sh +++ b/chapter8/isl.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/kbd.sh b/chapter8/kbd.sh index 81b369c..3a79d3c 100644 --- a/chapter8/kbd.sh +++ b/chapter8/kbd.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e patch -Np1 -i ../kbd-"${VERSION}"-backspace-1.patch diff --git a/chapter8/kmod.sh b/chapter8/kmod.sh index 65e3a5f..010f7cb 100644 --- a/chapter8/kmod.sh +++ b/chapter8/kmod.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --bindir=/bin \ diff --git a/chapter8/less.sh b/chapter8/less.sh index 8bdbea9..5cf9900 100644 --- a/chapter8/less.sh +++ b/chapter8/less.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --sysconfdir=/etc diff --git a/chapter8/libcap.sh b/chapter8/libcap.sh index 2925c8b..c19667e 100644 --- a/chapter8/libcap.sh +++ b/chapter8/libcap.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i '/install -m.*STA/d' libcap/Makefile diff --git a/chapter8/libelf.sh b/chapter8/libelf.sh index ef91c85..ce85e4a 100644 --- a/chapter8/libelf.sh +++ b/chapter8/libelf.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --disable-debuginfod \ diff --git a/chapter8/libffi.sh b/chapter8/libffi.sh index 51846d6..f45bb19 100644 --- a/chapter8/libffi.sh +++ b/chapter8/libffi.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --disable-static --with-gcc-arch=native diff --git a/chapter8/libpipeline.sh b/chapter8/libpipeline.sh index c3588fd..80e5dae 100644 --- a/chapter8/libpipeline.sh +++ b/chapter8/libpipeline.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/libtool.sh b/chapter8/libtool.sh index 819a697..0457b70 100644 --- a/chapter8/libtool.sh +++ b/chapter8/libtool.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/m4.sh b/chapter8/m4.sh index 1ccef8e..1c24928 100644 --- a/chapter8/m4.sh +++ b/chapter8/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/chapter8/make.sh b/chapter8/make.sh index c3588fd..80e5dae 100644 --- a/chapter8/make.sh +++ b/chapter8/make.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/man-db.sh b/chapter8/man-db.sh index be0d139..981435c 100644 --- a/chapter8/man-db.sh +++ b/chapter8/man-db.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --docdir=/usr/share/doc/man-db-"${VERSION}" \ diff --git a/chapter8/man-pages.sh b/chapter8/man-pages.sh index db9dad4..c019094 100644 --- a/chapter8/man-pages.sh +++ b/chapter8/man-pages.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e make -j1 install diff --git a/chapter8/meson.sh b/chapter8/meson.sh index dc30b07..63d16c4 100644 --- a/chapter8/meson.sh +++ b/chapter8/meson.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e python3 setup.py build diff --git a/chapter8/mpc.sh b/chapter8/mpc.sh index 8093f46..87d194d 100644 --- a/chapter8/mpc.sh +++ b/chapter8/mpc.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/mpfr.sh b/chapter8/mpfr.sh index f73b287..3d1d6b4 100644 --- a/chapter8/mpfr.sh +++ b/chapter8/mpfr.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/ncurses.sh b/chapter8/ncurses.sh index 918c829..8e26211 100644 --- a/chapter8/ncurses.sh +++ b/chapter8/ncurses.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --mandir=/usr/share/man \ diff --git a/chapter8/ninja.sh b/chapter8/ninja.sh index 744dffc..173a6ba 100644 --- a/chapter8/ninja.sh +++ b/chapter8/ninja.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e export NINJAJOBS=4 diff --git a/chapter8/openssl.sh b/chapter8/openssl.sh index d7b5e9b..a0341f9 100644 --- a/chapter8/openssl.sh +++ b/chapter8/openssl.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./config --prefix=/usr \ --openssldir=/etc/ssl \ diff --git a/chapter8/patch.sh b/chapter8/patch.sh index c3588fd..80e5dae 100644 --- a/chapter8/patch.sh +++ b/chapter8/patch.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/perl.sh b/chapter8/perl.sh index c7afaaf..040d01f 100644 --- a/chapter8/perl.sh +++ b/chapter8/perl.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e MAJMIN="$(cut -d\. -f1,2 <<< "${VERSION}")" diff --git a/chapter8/pkg-config.sh b/chapter8/pkg-config.sh index 395d190..4856af9 100644 --- a/chapter8/pkg-config.sh +++ b/chapter8/pkg-config.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --with-internal-glib \ diff --git a/chapter8/procps-ng.sh b/chapter8/procps-ng.sh index a21e6e4..49e2cb9 100644 --- a/chapter8/procps-ng.sh +++ b/chapter8/procps-ng.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ --exec-prefix= \ diff --git a/chapter8/psmisc.sh b/chapter8/psmisc.sh index b57d459..ec79d2a 100644 --- a/chapter8/psmisc.sh +++ b/chapter8/psmisc.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/python.sh b/chapter8/python.sh index f78b41b..f1ff5ec 100644 --- a/chapter8/python.sh +++ b/chapter8/python.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed 's|cpython/||' -i Include/cpython/pystate.h diff --git a/chapter8/readline.sh b/chapter8/readline.sh index be3dcc0..d97b521 100644 --- a/chapter8/readline.sh +++ b/chapter8/readline.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i '/MV.*old/d' Makefile.in sed -i '/{OLDSUFF}/c:' support/shlib-install diff --git a/chapter8/sed.sh b/chapter8/sed.sh index 97e8197..e0226a9 100644 --- a/chapter8/sed.sh +++ b/chapter8/sed.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr --bindir=/bin diff --git a/chapter8/shadow.sh b/chapter8/shadow.sh index 3e2bdd5..68d1b44 100644 --- a/chapter8/shadow.sh +++ b/chapter8/shadow.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e # shellcheck disable=SC2016 ROOTPW='$1$5RPAAd$oejpw8ErihLIB7vmGE4SV1' diff --git a/chapter8/sysklogd.sh b/chapter8/sysklogd.sh index 7d28f51..b29802b 100644 --- a/chapter8/sysklogd.sh +++ b/chapter8/sysklogd.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c sed -i 's/union wait/int/' syslogd.c diff --git a/chapter8/sysvinit.sh b/chapter8/sysvinit.sh index 563a21a..9c12163 100644 --- a/chapter8/sysvinit.sh +++ b/chapter8/sysvinit.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e patch -Np1 -i ../sysvinit-"${VERSION}"-consolidated-1.patch diff --git a/chapter8/tar.sh b/chapter8/tar.sh index 312a500..826011f 100644 --- a/chapter8/tar.sh +++ b/chapter8/tar.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e FORCE_UNSAFE_CONFIGURE=1 \ ./configure --prefix=/usr \ diff --git a/chapter8/tcl.sh b/chapter8/tcl.sh index 688dc5e..a02aa61 100644 --- a/chapter8/tcl.sh +++ b/chapter8/tcl.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e tar -xf ../tcl"${VERSION}"-html.tar.gz --strip-components=1 diff --git a/chapter8/texinfo.sh b/chapter8/texinfo.sh index bfd324f..dd58780 100644 --- a/chapter8/texinfo.sh +++ b/chapter8/texinfo.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr diff --git a/chapter8/util-linux.sh b/chapter8/util-linux.sh index f44bb38..c27f22e 100644 --- a/chapter8/util-linux.sh +++ b/chapter8/util-linux.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ --docdir=/usr/share/doc/util-linux-"${VERSION}" \ diff --git a/chapter8/vim.sh b/chapter8/vim.sh index 6543279..a8ae1d5 100644 --- a/chapter8/vim.sh +++ b/chapter8/vim.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h diff --git a/chapter8/xml-parser.sh b/chapter8/xml-parser.sh index 468c6f1..d281962 100644 --- a/chapter8/xml-parser.sh +++ b/chapter8/xml-parser.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e perl Makefile.PL diff --git a/chapter8/xz.sh b/chapter8/xz.sh index 5204163..82d01d1 100644 --- a/chapter8/xz.sh +++ b/chapter8/xz.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr \ diff --git a/chapter8/zlib.sh b/chapter8/zlib.sh index 47dfba2..d807c7e 100644 --- a/chapter8/zlib.sh +++ b/chapter8/zlib.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./configure --prefix=/usr make diff --git a/chapter8/zstd.sh b/chapter8/zstd.sh index 56b5ddb..5ca874f 100644 --- a/chapter8/zstd.sh +++ b/chapter8/zstd.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e make make prefix=/usr -j1 install diff --git a/env.sh b/env.sh index 7587c1e..9666e97 100644 --- a/env.sh +++ b/env.sh @@ -34,7 +34,7 @@ LFS_PWD="lfs" NUMPROCS="$(getconf _NPROCESSORS_ONLN)" numjobs="$((NUMPROCS * 2 - 1))" # Make flags for multiple jobs -MAKEFLAGS="-j ${numjobs}" +MAKEFLAGS="-j${numjobs}" NINJAJOBS="${NUMPROCS}" # Set spinner type (0-12 in funtions.sh) -- cgit v1.2.3-54-g00ecf From 12cd3ceafb35ec95a834f3a2a1ec0a7f701e5699 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 13 Apr 2021 13:00:40 -0500 Subject: Upgrade URL for sysvinit patch. --- patches.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches.csv b/patches.csv index 780ca92..af94101 100644 --- a/patches.csv +++ b/patches.csv @@ -3,4 +3,4 @@ bzip2,1.0.8,http://www.linuxfromscratch.org/patches/lfs/10.1/bzip2-1.0.8-install coreutils,8.32,http://www.linuxfromscratch.org/patches/lfs/10.1/coreutils-8.32-i18n-1.patch,cd8ebed2a67fff2e231026df91af6776 glibc,2.33,http://www.linuxfromscratch.org/patches/lfs/10.1/glibc-2.33-fhs-1.patch,9a5997c3452909b1769918c759eff8a2 kbd,2.4.0,http://www.linuxfromscratch.org/patches/lfs/10.1/kbd-2.4.0-backspace-1.patch,f75cca16a38da6caa7d52151f7136895 -sysvinit,2.99,http://www.linuxfromscratch.org/patches/lfs/10.1/sysvinit-2.98-consolidated-1.patch,4900322141d493e74020c9cf437b2cdc +sysvinit,2.99,http://www.linuxfromscratch.org/patches/lfs/development/sysvinit-2.99-consolidated-1.patch,4900322141d493e74020c9cf437b2cdc -- cgit v1.2.3-54-g00ecf