From 75830a5018d98c55dd7157507cc18fc3c2aa774d 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 7092d5d0f8467dc5736de1ef393740e822276718 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 eb687642db67caf1ae9658f3cc2ab31582f0e2a2 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 5 Apr 2021 21:02:08 -0500 Subject: Have grep exit 0 without stdoutput when checking if a package is in packages.csv. --- packageinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packageinstall.sh b/packageinstall.sh index c9689a6..48d93e4 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -3,7 +3,7 @@ CHAPTER="$1" PACKAGE="$2" -if ! grep "^${PACKAGE}" packages.csv; then +if ! grep "^${PACKAGE}" packages.csv >/dev/null 2>&1; then printf "%b" " ${IRED}PACKAGE ${IYLW}${PACKAGE} ${IRED}DOES NOT EXIST!${RST}\n" exit 1 fi -- cgit v1.2.3-54-g00ecf From ed77f4657d7575dc770fdc9e05db6908d46062fa 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. --- packageinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packageinstall.sh b/packageinstall.sh index 48d93e4..78e2cdd 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -3,7 +3,7 @@ CHAPTER="$1" PACKAGE="$2" -if ! grep "^${PACKAGE}" packages.csv >/dev/null 2>&1; 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 26c2a8cca75e9eb100b80a3442283fc2e1b64dad Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 5 Apr 2021 21:13:16 -0500 Subject: Add test block to check if package exists in packages.csv and exit if it doesn't. --- packageinstall.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packageinstall.sh b/packageinstall.sh index 88876ac..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 @@ -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 9dcfdfa38ad67d643004dbe436fa25973b58c5bf 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 013bdb2d82202aae37a117cce9c594a09eb441a0 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 08:21:37 -0500 Subject: Add chapter 8 package list. --- insidechroot.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/insidechroot.sh b/insidechroot.sh index b78a4a2..b6cb78e 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -29,7 +29,8 @@ elif [[ "${CHAPTER}" -eq 8 ]]; then 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 + #Add elfutils after kmod + 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 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 -- cgit v1.2.3-54-g00ecf From b4a12e6b52329f396378c81addaa59465161c2a3 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 08:29:00 -0500 Subject: Add chapter8 scripts. Still need to add contents. --- chapter8/acl.sh | 3 +++ chapter8/attr.sh | 3 +++ chapter8/autoconf.sh | 3 +++ chapter8/automake.sh | 3 +++ chapter8/bash.sh | 3 +++ chapter8/bc.sh | 3 +++ chapter8/binutils.sh | 3 +++ chapter8/bison.sh | 3 +++ chapter8/bzip2.sh | 3 +++ chapter8/check.sh | 3 +++ chapter8/coreutils.sh | 3 +++ chapter8/dejagnu.sh | 3 +++ chapter8/diffutils.sh | 3 +++ chapter8/e2fsprogs.sh | 3 +++ chapter8/eudev.sh | 3 +++ chapter8/expat.sh | 3 +++ chapter8/expect.sh | 3 +++ chapter8/file.sh | 3 +++ chapter8/findutils.sh | 3 +++ chapter8/flex.sh | 3 +++ chapter8/gawk.sh | 3 +++ chapter8/gcc.sh | 3 +++ chapter8/gdbm.sh | 3 +++ chapter8/gettext.sh | 3 +++ chapter8/glibc.sh | 3 +++ chapter8/gmp.sh | 3 +++ chapter8/gperf.sh | 3 +++ chapter8/grep.sh | 3 +++ chapter8/groff.sh | 3 +++ chapter8/grub.sh | 3 +++ chapter8/gzip.sh | 3 +++ chapter8/iana-etc.sh | 3 +++ chapter8/inetutils.sh | 3 +++ chapter8/intltool.sh | 3 +++ chapter8/iproute2.sh | 3 +++ chapter8/isl.sh | 3 +++ chapter8/kbd.sh | 3 +++ chapter8/kmod.sh | 3 +++ chapter8/less.sh | 3 +++ chapter8/libcap.sh | 3 +++ chapter8/libelf.sh | 3 +++ chapter8/libffi.sh | 3 +++ chapter8/libpipeline.sh | 3 +++ chapter8/libtool.sh | 3 +++ chapter8/m4.sh | 3 +++ chapter8/make.sh | 3 +++ chapter8/man-db.sh | 3 +++ chapter8/man-pages.sh | 3 +++ chapter8/meson.sh | 3 +++ chapter8/mpc.sh | 3 +++ chapter8/mpfr.sh | 3 +++ chapter8/ncurses.sh | 3 +++ chapter8/ninja.sh | 3 +++ chapter8/openssl.sh | 3 +++ chapter8/patch.sh | 3 +++ chapter8/perl.sh | 3 +++ chapter8/pkg-config.sh | 3 +++ chapter8/procps-ng.sh | 3 +++ chapter8/psmisc.sh | 3 +++ chapter8/python.sh | 3 +++ chapter8/readline.sh | 3 +++ chapter8/sed.sh | 3 +++ chapter8/shadow.sh | 3 +++ chapter8/sysklogd.sh | 3 +++ chapter8/sysvinit.sh | 3 +++ chapter8/tar.sh | 3 +++ chapter8/tcl.sh | 3 +++ chapter8/texinfo.sh | 3 +++ chapter8/util-linux.sh | 3 +++ chapter8/vim.sh | 3 +++ chapter8/xml-parser.sh | 3 +++ chapter8/xz.sh | 3 +++ chapter8/zlib.sh | 3 +++ chapter8/zstd.sh | 3 +++ 74 files changed, 222 insertions(+) create mode 100644 chapter8/acl.sh create mode 100644 chapter8/attr.sh create mode 100644 chapter8/autoconf.sh create mode 100644 chapter8/automake.sh create mode 100644 chapter8/bash.sh create mode 100644 chapter8/bc.sh create mode 100644 chapter8/binutils.sh create mode 100644 chapter8/bison.sh create mode 100644 chapter8/bzip2.sh create mode 100644 chapter8/check.sh create mode 100644 chapter8/coreutils.sh create mode 100644 chapter8/dejagnu.sh create mode 100644 chapter8/diffutils.sh create mode 100644 chapter8/e2fsprogs.sh create mode 100644 chapter8/eudev.sh create mode 100644 chapter8/expat.sh create mode 100644 chapter8/expect.sh create mode 100644 chapter8/file.sh create mode 100644 chapter8/findutils.sh create mode 100644 chapter8/flex.sh create mode 100644 chapter8/gawk.sh create mode 100644 chapter8/gcc.sh create mode 100644 chapter8/gdbm.sh create mode 100644 chapter8/gettext.sh create mode 100644 chapter8/glibc.sh create mode 100644 chapter8/gmp.sh create mode 100644 chapter8/gperf.sh create mode 100644 chapter8/grep.sh create mode 100644 chapter8/groff.sh create mode 100644 chapter8/grub.sh create mode 100644 chapter8/gzip.sh create mode 100644 chapter8/iana-etc.sh create mode 100644 chapter8/inetutils.sh create mode 100644 chapter8/intltool.sh create mode 100644 chapter8/iproute2.sh create mode 100644 chapter8/isl.sh create mode 100644 chapter8/kbd.sh create mode 100644 chapter8/kmod.sh create mode 100644 chapter8/less.sh create mode 100644 chapter8/libcap.sh create mode 100644 chapter8/libelf.sh create mode 100644 chapter8/libffi.sh create mode 100644 chapter8/libpipeline.sh create mode 100644 chapter8/libtool.sh create mode 100644 chapter8/m4.sh create mode 100644 chapter8/make.sh create mode 100644 chapter8/man-db.sh create mode 100644 chapter8/man-pages.sh create mode 100644 chapter8/meson.sh create mode 100644 chapter8/mpc.sh create mode 100644 chapter8/mpfr.sh create mode 100644 chapter8/ncurses.sh create mode 100644 chapter8/ninja.sh create mode 100644 chapter8/openssl.sh create mode 100644 chapter8/patch.sh create mode 100644 chapter8/perl.sh create mode 100644 chapter8/pkg-config.sh create mode 100644 chapter8/procps-ng.sh create mode 100644 chapter8/psmisc.sh create mode 100644 chapter8/python.sh create mode 100644 chapter8/readline.sh create mode 100644 chapter8/sed.sh create mode 100644 chapter8/shadow.sh create mode 100644 chapter8/sysklogd.sh create mode 100644 chapter8/sysvinit.sh create mode 100644 chapter8/tar.sh create mode 100644 chapter8/tcl.sh create mode 100644 chapter8/texinfo.sh create mode 100644 chapter8/util-linux.sh create mode 100644 chapter8/vim.sh create mode 100644 chapter8/xml-parser.sh create mode 100644 chapter8/xz.sh create mode 100644 chapter8/zlib.sh create mode 100644 chapter8/zstd.sh diff --git a/chapter8/acl.sh b/chapter8/acl.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/acl.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/attr.sh b/chapter8/attr.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/attr.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/autoconf.sh b/chapter8/autoconf.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/autoconf.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/automake.sh b/chapter8/automake.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/automake.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/bash.sh b/chapter8/bash.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/bash.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/bc.sh b/chapter8/bc.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/bc.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/binutils.sh b/chapter8/binutils.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/binutils.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/bison.sh b/chapter8/bison.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/bison.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/bzip2.sh b/chapter8/bzip2.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/bzip2.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/check.sh b/chapter8/check.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/check.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/coreutils.sh b/chapter8/coreutils.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/coreutils.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/dejagnu.sh b/chapter8/dejagnu.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/dejagnu.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/diffutils.sh b/chapter8/diffutils.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/diffutils.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/e2fsprogs.sh b/chapter8/e2fsprogs.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/e2fsprogs.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/eudev.sh b/chapter8/eudev.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/eudev.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/expat.sh b/chapter8/expat.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/expat.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/expect.sh b/chapter8/expect.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/expect.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/file.sh b/chapter8/file.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/file.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/findutils.sh b/chapter8/findutils.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/findutils.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/flex.sh b/chapter8/flex.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/flex.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/gawk.sh b/chapter8/gawk.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/gawk.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/gcc.sh b/chapter8/gcc.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/gcc.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/gdbm.sh b/chapter8/gdbm.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/gdbm.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/gettext.sh b/chapter8/gettext.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/gettext.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/glibc.sh b/chapter8/glibc.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/glibc.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/gmp.sh b/chapter8/gmp.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/gmp.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/gperf.sh b/chapter8/gperf.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/gperf.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/grep.sh b/chapter8/grep.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/grep.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/groff.sh b/chapter8/groff.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/groff.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/grub.sh b/chapter8/grub.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/grub.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/gzip.sh b/chapter8/gzip.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/gzip.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/iana-etc.sh b/chapter8/iana-etc.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/iana-etc.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/inetutils.sh b/chapter8/inetutils.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/inetutils.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/intltool.sh b/chapter8/intltool.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/intltool.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/iproute2.sh b/chapter8/iproute2.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/iproute2.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/isl.sh b/chapter8/isl.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/isl.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/kbd.sh b/chapter8/kbd.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/kbd.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/kmod.sh b/chapter8/kmod.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/kmod.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/less.sh b/chapter8/less.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/less.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/libcap.sh b/chapter8/libcap.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/libcap.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/libelf.sh b/chapter8/libelf.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/libelf.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/libffi.sh b/chapter8/libffi.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/libffi.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/libpipeline.sh b/chapter8/libpipeline.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/libpipeline.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/libtool.sh b/chapter8/libtool.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/libtool.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/m4.sh b/chapter8/m4.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/m4.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/make.sh b/chapter8/make.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/make.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/man-db.sh b/chapter8/man-db.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/man-db.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/man-pages.sh b/chapter8/man-pages.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/man-pages.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/meson.sh b/chapter8/meson.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/meson.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/mpc.sh b/chapter8/mpc.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/mpc.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/mpfr.sh b/chapter8/mpfr.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/mpfr.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/ncurses.sh b/chapter8/ncurses.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/ncurses.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/ninja.sh b/chapter8/ninja.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/ninja.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/openssl.sh b/chapter8/openssl.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/openssl.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/patch.sh b/chapter8/patch.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/patch.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/perl.sh b/chapter8/perl.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/perl.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/pkg-config.sh b/chapter8/pkg-config.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/pkg-config.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/procps-ng.sh b/chapter8/procps-ng.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/procps-ng.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/psmisc.sh b/chapter8/psmisc.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/psmisc.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/python.sh b/chapter8/python.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/python.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/readline.sh b/chapter8/readline.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/readline.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/sed.sh b/chapter8/sed.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/sed.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/shadow.sh b/chapter8/shadow.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/shadow.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/sysklogd.sh b/chapter8/sysklogd.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/sysklogd.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/sysvinit.sh b/chapter8/sysvinit.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/sysvinit.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/tar.sh b/chapter8/tar.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/tar.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/tcl.sh b/chapter8/tcl.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/tcl.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/texinfo.sh b/chapter8/texinfo.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/texinfo.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/util-linux.sh b/chapter8/util-linux.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/util-linux.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/vim.sh b/chapter8/vim.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/vim.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/xml-parser.sh b/chapter8/xml-parser.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/xml-parser.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/xz.sh b/chapter8/xz.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/xz.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/zlib.sh b/chapter8/zlib.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/zlib.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + diff --git a/chapter8/zstd.sh b/chapter8/zstd.sh new file mode 100644 index 0000000..7a693aa --- /dev/null +++ b/chapter8/zstd.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + -- cgit v1.2.3-54-g00ecf From 7716c4bbadc8ba412044e31e16aca8300d619552 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 14:03:30 -0500 Subject: Change tcl Documentation to tcldoc, update pythdoc to 3.9.4, use libelf name for elfutils. --- packages.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages.csv b/packages.csv index ec8e073..10c93d1 100644 --- a/packages.csv +++ b/packages.csv @@ -12,7 +12,7 @@ coreutils,8.32,http://ftp.gnu.org/gnu/coreutils/coreutils-@.tar.xz,022042695b7d5 dejagnu,1.6.2,http://ftp.gnu.org/gnu/dejagnu/dejagnu-@.tar.gz,e1b07516533f351b3aba3423fafeffd6 diffutils,3.7,http://ftp.gnu.org/gnu/diffutils/diffutils-@.tar.xz,4824adc0e95dbbf11dfbdfaad6a1e461 e2fsprogs,1.46.1,https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v@/e2fsprogs-@.tar.gz,8c52585522b7ca6bdae2bdecba27b3a4 -elfutils,0.183,https://sourceware.org/ftp/elfutils/@/elfutils-@.tar.bz2,6f58aa1b9af1a5681b1cbf63e0da2d67 +libelf,0.183,https://sourceware.org/ftp/elfutils/@/elfutils-@.tar.bz2,6f58aa1b9af1a5681b1cbf63e0da2d67 eudev,3.2.10,https://dev.gentoo.org/~blueness/eudev/eudev-@.tar.gz,60b135a189523f333cea5f71a3345c8d expat,2.2.10,https://prdownloads.sourceforge.net/expat/expat-@.tar.xz,e0fe49a6b3480827c9455e4cfc799133 expect,5.45.4,https://prdownloads.sourceforge.net/expect/expect@.tar.gz,00fce8de158422f5ccd2666512329bd2 @@ -62,7 +62,7 @@ pkg-config,0.29.2,https://pkg-config.freedesktop.org/releases/pkg-config-@.tar.g 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 +pythdoc,3.9.4,https://www.python.org/ftp/python/doc/@/python-@-docs-html.tar.bz2,a225c583da4533c5bf98ba3555f50c7b readline,8.1,http://ftp.gnu.org/gnu/readline/readline-@.tar.gz,e9557dd5b1409f5d7b37ef717c64518e sed,4.8,http://ftp.gnu.org/gnu/sed/sed-@.tar.xz,6d906edfdb3202304059233f51f9a71d shadow,4.8.1,https://github.com/shadow-maint/shadow/releases/download/@/shadow-@.tar.xz,4b05eff8a427cf50e615bda324b5bc45 @@ -70,7 +70,7 @@ sysklogd,1.5.1,http://www.infodrom.org/projects/sysklogd/download/sysklogd-@.tar sysvinit,2.98,http://download.savannah.gnu.org/releases/sysvinit/sysvinit-@.tar.xz,e3254f7622ea5cf2322b1b386a98ba59 tar,1.34,http://ftp.gnu.org/gnu/tar/tar-@.tar.xz,9a08d29a9ac4727130b5708347c0f5cf tcl,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-src.tar.gz,8a4c004f48984a03a7747e9ba06e4da4 -tcl Documentation,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-html.tar.gz,e358a9140c3a171e42f18c8a7f6a36ea +tcldoc,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-html.tar.gz,e358a9140c3a171e42f18c8a7f6a36ea texinfo,6.7,http://ftp.gnu.org/gnu/texinfo/texinfo-@.tar.xz,d4c5d8cc84438c5993ec5163a59522a6 time Zone Data,2021a,https://www.iana.org/time-zones/repository/releases/tzdata@.tar.gz,20eae7d1da671c6eac56339c8df85bbd udev-lfs Tarball,udev-lfs-20171102,http://anduin.linuxfromscratch.org/LFS/@.tar.xz,27cd82f9a61422e186b9d6759ddf1634 -- cgit v1.2.3-54-g00ecf From 783a4c48e04e81783848f0cb0f757f6a836d7f6e Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 14:04:50 -0500 Subject: Use VERSION variable with bash fixes patch. --- chapter6/bash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter6/bash.sh b/chapter6/bash.sh index dee96c6..c920026 100644 --- a/chapter6/bash.sh +++ b/chapter6/bash.sh @@ -1,6 +1,6 @@ #!/bin/bash -patch -Np1 -i ../bash-5.1-fixes-1.patch && +patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && ./configure --prefix=/usr \ --build="$(support/config.guess)" \ --host="${LFS_TGT}" \ -- cgit v1.2.3-54-g00ecf From af28b78b8e659f995b39a5dde2ce2cef0da9fbe0 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 14:09:59 -0500 Subject: Add chapter8 script commands. --- chapter8/acl.sh | 10 +++++++ chapter8/attr.sh | 10 +++++++ chapter8/autoconf.sh | 4 +++ chapter8/automake.sh | 6 ++++ chapter8/bash.sh | 14 +++++++++ chapter8/bc.sh | 3 ++ chapter8/binutils.sh | 20 +++++++++++++ chapter8/bison.sh | 4 +++ chapter8/bzip2.sh | 18 ++++++++++++ chapter8/check.sh | 4 +++ chapter8/coreutils.sh | 22 +++++++++++++++ chapter8/dejagnu.sh | 6 ++++ chapter8/diffutils.sh | 4 +++ chapter8/e2fsprogs.sh | 22 +++++++++++++++ chapter8/eudev.sh | 21 ++++++++++++++ chapter8/expat.sh | 8 ++++++ chapter8/expect.sh | 8 ++++++ chapter8/file.sh | 4 ++- chapter8/findutils.sh | 7 +++++ chapter8/flex.sh | 7 +++++ chapter8/gawk.sh | 9 ++++++ chapter8/gcc.sh | 43 ++++++++++++++++++++++++++++ chapter8/gdbm.sh | 6 ++++ chapter8/gettext.sh | 7 +++++ chapter8/glibc.sh | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ chapter8/gmp.sh | 13 +++++++++ chapter8/gperf.sh | 4 +++ chapter8/grep.sh | 4 +++ chapter8/groff.sh | 4 +++ chapter8/grub.sh | 12 ++++++++ chapter8/gzip.sh | 6 ++++ chapter8/iana-etc.sh | 2 +- chapter8/inetutils.sh | 15 ++++++++++ chapter8/intltool.sh | 7 +++++ chapter8/iproute2.sh | 7 +++++ chapter8/isl.sh | 8 ++++++ chapter8/kbd.sh | 12 ++++++++ chapter8/kmod.sh | 16 +++++++++++ chapter8/less.sh | 4 +++ chapter8/libcap.sh | 9 ++++++ chapter8/libelf.sh | 9 ++++++ chapter8/libffi.sh | 4 +++ chapter8/libpipeline.sh | 4 +++ chapter8/libtool.sh | 6 ++++ chapter8/m4.sh | 5 ++++ chapter8/make.sh | 4 +++ chapter8/man-db.sh | 13 +++++++++ chapter8/man-pages.sh | 2 +- chapter8/meson.sh | 3 ++ chapter8/mpc.sh | 8 ++++++ chapter8/mpfr.sh | 9 ++++++ chapter8/ncurses.sh | 26 +++++++++++++++++ chapter8/ninja.sh | 13 +++++++++ chapter8/openssl.sh | 13 +++++++++ chapter8/patch.sh | 4 +++ chapter8/perl.sh | 23 +++++++++++++++ chapter8/pkg-config.sh | 6 ++++ chapter8/procps-ng.sh | 12 ++++++++ chapter8/psmisc.sh | 7 +++++ chapter8/python.sh | 16 +++++++++++ chapter8/readline.sh | 15 ++++++++++ chapter8/sed.sh | 8 ++++++ chapter8/shadow.sh | 23 +++++++++++++++ chapter8/sysklogd.sh | 19 +++++++++++++ chapter8/sysvinit.sh | 4 +++ chapter8/tar.sh | 7 +++++ chapter8/tcl.sh | 32 +++++++++++++++++++++ chapter8/texinfo.sh | 6 ++++ chapter8/util-linux.sh | 17 +++++++++++ chapter8/vim.sh | 31 ++++++++++++++++++++ chapter8/xml-parser.sh | 4 +++ chapter8/xz.sh | 9 ++++++ chapter8/zlib.sh | 6 ++++ chapter8/zstd.sh | 5 ++++ 74 files changed, 835 insertions(+), 3 deletions(-) diff --git a/chapter8/acl.sh b/chapter8/acl.sh index 7a693aa..da4caae 100644 --- a/chapter8/acl.sh +++ b/chapter8/acl.sh @@ -1,3 +1,13 @@ #!/bin/bash +./configure --prefix=/usr \ + --bindir=/bin \ + --disable-static \ + --libexecdir=/usr/lib \ + --docdir=/usr/share/doc/acl-"${VERSION}" +make +make -j1 install + +mv -v /usr/lib/libacl.so.* /lib +ln -sfv ../../lib/"$(readlink /usr/lib/libacl.so)" /usr/lib/libacl.so diff --git a/chapter8/attr.sh b/chapter8/attr.sh index 7a693aa..f68d6cb 100644 --- a/chapter8/attr.sh +++ b/chapter8/attr.sh @@ -1,3 +1,13 @@ #!/bin/bash +./configure --prefix=/usr \ + --bindir=/bin \ + --disable-static \ + --sysconfdir=/etc \ + --docdir=/usr/share/doc/attr-"${VERSION}" +make +make -j1 install + +mv -v /usr/lib/libattr.so.* /lib +ln -sfv ../../lib/"$(readlink /usr/lib/libattr.so)" /usr/lib/libattr.so diff --git a/chapter8/autoconf.sh b/chapter8/autoconf.sh index 7a693aa..c3588fd 100644 --- a/chapter8/autoconf.sh +++ b/chapter8/autoconf.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install diff --git a/chapter8/automake.sh b/chapter8/automake.sh index 7a693aa..e2b76e8 100644 --- a/chapter8/automake.sh +++ b/chapter8/automake.sh @@ -1,3 +1,9 @@ #!/bin/bash +sed -i "s/''/etags/" t/tags-lisp-space.sh +./configure --prefix=/usr --docdir=/usr/share/doc/automake-"${VERSION}" + +make + +make -j1 install diff --git a/chapter8/bash.sh b/chapter8/bash.sh index 7a693aa..65eb2d8 100644 --- a/chapter8/bash.sh +++ b/chapter8/bash.sh @@ -1,3 +1,17 @@ #!/bin/bash +patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch +sed -i '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in + +./configure --prefix=/usr \ + --docdir=/usr/share/doc/bash-"${VERSION}" \ + --without-bash-malloc \ + --with-installed-readline + +make + +make -j1 install +mv -vf /usr/bin/bash /bin + +#exec /bin/bash --login +h diff --git a/chapter8/bc.sh b/chapter8/bc.sh index 7a693aa..c1d3014 100644 --- a/chapter8/bc.sh +++ b/chapter8/bc.sh @@ -1,3 +1,6 @@ #!/bin/bash +PREFIX=/usr CC=gcc ./configure.sh -G -O3 +make +make -j1 install diff --git a/chapter8/binutils.sh b/chapter8/binutils.sh index 7a693aa..41a99b1 100644 --- a/chapter8/binutils.sh +++ b/chapter8/binutils.sh @@ -1,3 +1,23 @@ #!/bin/bash +expect -c "spawn ls" +sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in + +mkdir -v build +cd build || exit 1 + +../configure --prefix=/usr \ + --enable-gold \ + --enable-ld=default \ + --enable-plugins \ + --enable-shared \ + --disable-werror \ + --enable-64-bit-bfd \ + --with-system-zlib + +make tooldir=/usr + +make tooldir=/usr -j1 install + +rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.a diff --git a/chapter8/bison.sh b/chapter8/bison.sh index 7a693aa..eb97728 100644 --- a/chapter8/bison.sh +++ b/chapter8/bison.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr --docdir=/usr/share/doc/bison-"${VERSION}" +make + +make -j1 install diff --git a/chapter8/bzip2.sh b/chapter8/bzip2.sh index 7a693aa..b1b4459 100644 --- a/chapter8/bzip2.sh +++ b/chapter8/bzip2.sh @@ -1,3 +1,21 @@ #!/bin/bash +patch -Np1 -i ../bzip2-"${VERSION}"-install_docs-1.patch +sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile +sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile + +make -f Makefile-libbz2_so +make clean +make + +make PREFIX=/usr -j1 install + +cp -v bzip2-shared /bin/bzip2 +cp -av libbz2.so* /lib +ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so +rm -v /usr/bin/{bunzip2,bzcat,bzip2} +ln -sv bzip2 /bin/bunzip2 +ln -sv bzip2 /bin/bzcat + +rm -fv /usr/lib/libbz2.a diff --git a/chapter8/check.sh b/chapter8/check.sh index 7a693aa..9a4f704 100644 --- a/chapter8/check.sh +++ b/chapter8/check.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr --disable-static +make + +make docdir=/usr/share/doc/check-"${VERSION}" -j1 install diff --git a/chapter8/coreutils.sh b/chapter8/coreutils.sh index 7a693aa..62ceb69 100644 --- a/chapter8/coreutils.sh +++ b/chapter8/coreutils.sh @@ -1,3 +1,25 @@ #!/bin/bash +echo $NINJAJOBS +patch -Np1 -i ../coreutils-"${VERSION}"-i18n-1.patch + +sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk + +autoreconf -fiv +FORCE_UNSAFE_CONFIGURE=1 ./configure \ + --prefix=/usr \ + --enable-no-install-program=kill,uptime + +make + +make -j1 install + +mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin +mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin +mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin +mv -v /usr/bin/chroot /usr/sbin +mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8 +sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8 + +mv -v /usr/bin/{head,nice,sleep,touch} /bin diff --git a/chapter8/dejagnu.sh b/chapter8/dejagnu.sh index 7a693aa..fc94545 100644 --- a/chapter8/dejagnu.sh +++ b/chapter8/dejagnu.sh @@ -1,3 +1,9 @@ #!/bin/bash +./configure --prefix=/usr +makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi +makeinfo --plaintext -o doc/dejagnu.txt doc/dejagnu.texi +make -j1 install +install -v -dm755 /usr/share/doc/dejagnu-"${VERSION}" +install -v -m644 doc/dejagnu.{html,txt} /usr/share/doc/dejagnu-"${VERSION}" diff --git a/chapter8/diffutils.sh b/chapter8/diffutils.sh index 7a693aa..c3588fd 100644 --- a/chapter8/diffutils.sh +++ b/chapter8/diffutils.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install diff --git a/chapter8/e2fsprogs.sh b/chapter8/e2fsprogs.sh index 7a693aa..b872707 100644 --- a/chapter8/e2fsprogs.sh +++ b/chapter8/e2fsprogs.sh @@ -1,3 +1,25 @@ #!/bin/bash +mkdir -v build +cd build || exit 1 +../configure --prefix=/usr \ + --bindir=/bin \ + --with-root-prefix="" \ + --enable-elf-shlibs \ + --disable-libblkid \ + --disable-libuuid \ + --disable-uuidd \ + --disable-fsck + +make + +make -j1 install + +rm -fv /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a +gunzip -v /usr/share/info/libext2fs.info.gz +install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info + +makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo +install -v -m644 doc/com_err.info /usr/share/info +install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info diff --git a/chapter8/eudev.sh b/chapter8/eudev.sh index 7a693aa..a15e189 100644 --- a/chapter8/eudev.sh +++ b/chapter8/eudev.sh @@ -1,3 +1,24 @@ #!/bin/bash +./configure --prefix=/usr \ + --bindir=/sbin \ + --sbindir=/sbin \ + --libdir=/usr/lib \ + --sysconfdir=/etc \ + --libexecdir=/lib \ + --with-rootprefix= \ + --with-rootlibdir=/lib \ + --enable-manpages \ + --disable-static +make + +mkdir -pv /lib/udev/rules.d +mkdir -pv /etc/udev/rules.d + +make -j1 install + +tar -xvf ../udev-lfs-20171102.tar.xz +make -f udev-lfs-20171102/Makefile.lfs install + +udevadm hwdb --update diff --git a/chapter8/expat.sh b/chapter8/expat.sh index 7a693aa..1e21feb 100644 --- a/chapter8/expat.sh +++ b/chapter8/expat.sh @@ -1,3 +1,11 @@ #!/bin/bash +./configure --prefix=/usr \ + --disable-static \ + --docdir=/usr/share/doc/expat-"${VERSION}" +make + +make -j1 install + +install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-"${VERSION}" diff --git a/chapter8/expect.sh b/chapter8/expect.sh index 7a693aa..1b7ccdc 100644 --- a/chapter8/expect.sh +++ b/chapter8/expect.sh @@ -1,3 +1,11 @@ #!/bin/bash +./configure --prefix=/usr \ + --with-tcl=/usr/lib \ + --enable-shared \ + --mandir=/usr/share/man \ + --with-tclinclude=/usr/include +make +make -j1 install +ln -svf expect"${VERSION}"/libexpect"${VERSION}".so /usr/lib diff --git a/chapter8/file.sh b/chapter8/file.sh index 7a693aa..5adb7d7 100644 --- a/chapter8/file.sh +++ b/chapter8/file.sh @@ -1,3 +1,5 @@ #!/bin/bash - +./configure --prefix=/usr +make +make -j1 install diff --git a/chapter8/findutils.sh b/chapter8/findutils.sh index 7a693aa..b058eea 100644 --- a/chapter8/findutils.sh +++ b/chapter8/findutils.sh @@ -1,3 +1,10 @@ #!/bin/bash +./configure --prefix=/usr --localstatedir=/var/lib/locate +make + +make -j1 install + +mv -v /usr/bin/find /bin +sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb diff --git a/chapter8/flex.sh b/chapter8/flex.sh index 7a693aa..58d7b29 100644 --- a/chapter8/flex.sh +++ b/chapter8/flex.sh @@ -1,3 +1,10 @@ #!/bin/bash +./configure --prefix=/usr \ + --docdir=/usr/share/doc/flex-"${VERSION}" \ + --disable-static +make + +make -j1 install +ln -sv flex /usr/bin/lex diff --git a/chapter8/gawk.sh b/chapter8/gawk.sh index 7a693aa..eb7c111 100644 --- a/chapter8/gawk.sh +++ b/chapter8/gawk.sh @@ -1,3 +1,12 @@ #!/bin/bash +sed -i 's/extras//' Makefile.in +./configure --prefix=/usr + +make + +make -j1 install + +mkdir -v /usr/share/doc/gawk-"${VERSION}" +cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-"${VERSION}" diff --git a/chapter8/gcc.sh b/chapter8/gcc.sh index 7a693aa..7b4df3b 100644 --- a/chapter8/gcc.sh +++ b/chapter8/gcc.sh @@ -1,3 +1,46 @@ #!/bin/bash +case $(uname -m) in + x86_64) + sed -e '/m64=/s/lib64/lib/' \ + -i.orig gcc/config/i386/t-linux64 + ;; +esac +mkdir -v build +cd build || exit 1 + +../configure --prefix=/usr \ + LD=ld \ + --enable-languages=c,c++ \ + --disable-multilib \ + --disable-bootstrap \ + --with-system-zlib + +make + +make -j1 install +rm -rf /usr/lib/gcc/"$(gcc -dumpmachine)"/"${VERSION}"/include-fixed/bits/ + +chown -v -R root:root \ + /usr/lib/gcc/*linux-gnu/"${VERSION}"/include{,-fixed} + +ln -sv ../usr/bin/cpp /lib + +ln -sfv ../../libexec/gcc/"$(gcc -dumpmachine)"/"${VERSION}"/liblto_plugin.so \ + /usr/lib/bfd-plugins/ + +echo 'int main(){}' > dummy.c +cc dummy.c -v -Wl,--verbose &> dummy.log +readelf -l a.out | grep ': /lib' + +grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log +grep -B4 '^ /usr/include' dummy.log +grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g' +grep "/lib.*/libc.so.6 " dummy.log +grep found dummy.log + +rm -v dummy.c a.out dummy.log + +mkdir -pv /usr/share/gdb/auto-load/usr/lib +mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib diff --git a/chapter8/gdbm.sh b/chapter8/gdbm.sh index 7a693aa..adf3947 100644 --- a/chapter8/gdbm.sh +++ b/chapter8/gdbm.sh @@ -1,3 +1,9 @@ #!/bin/bash +./configure --prefix=/usr \ + --disable-static \ + --enable-libgdbm-compat +make + +make -j1 install diff --git a/chapter8/gettext.sh b/chapter8/gettext.sh index 7a693aa..1ff6c97 100644 --- a/chapter8/gettext.sh +++ b/chapter8/gettext.sh @@ -1,3 +1,10 @@ #!/bin/bash +./configure --prefix=/usr \ + --disable-static \ + --docdir=/usr/share/doc/gettext-"${VERSION}" +make + +make -j1 install +chmod -v 0755 /usr/lib/preloadable_libintl.so diff --git a/chapter8/glibc.sh b/chapter8/glibc.sh index 7a693aa..21289b1 100644 --- a/chapter8/glibc.sh +++ b/chapter8/glibc.sh @@ -1,3 +1,78 @@ #!/bin/bash +patch -Np1 -i ../glibc-"${VERSION}"-fhs-1.patch +sed -e '402a\ *result = local->data.services[database_index];' \ + -i nss/nss_database.c + +mkdir -v build +cd build || exit 1 + +../configure --prefix=/usr \ + --disable-werror \ + --enable-kernel=5.10.0 \ + --enable-stack-protector=strong \ + --with-headers=/usr/include \ + libc_cv_slibdir=/lib + +make PARALLELMFLAGS="${MAKEFLAGS}" + +touch /etc/ld.so.conf + +sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile + +make -j1 install + +cp -v ../nscd/nscd.conf /etc/nscd.conf +mkdir -pv /var/cache/nscd + +make localedata/install-locales + +cat > /etc/nsswitch.conf << "EOF" +# Begin /etc/nsswitch.conf + +passwd: files +group: files +shadow: files + +hosts: files dns +networks: files + +protocols: files +services: files +ethers: files +rpc: files + +# End /etc/nsswitch.conf +EOF + +tar -xf ../../tzdata2021a.tar.gz + +ZONEINFO=/usr/share/zoneinfo +mkdir -pv "${ZONEINFO}"/{posix,right} + +for tz in etcetera southamerica northamerica europe africa antarctica \ + asia australasia backward; do + zic -L /dev/null -d "${ZONEINFO}" "${tz}" + zic -L /dev/null -d "${ZONEINFO}"/posix "${tz}" + zic -L leapseconds -d "${ZONEINFO}"/right "${tz}" +done + +cp -v zone.tab zone1970.tab iso3166.tab "${ZONEINFO}" +zic -d "${ZONEINFO}" -p America/New_York + +ln -sfv /usr/share/zoneinfo/America/Chicago /etc/localtime + +cat > /etc/ld.so.conf << "EOF" +# Begin /etc/ld.so.conf +/usr/local/lib +/opt/lib + +EOF + +cat >> /etc/ld.so.conf << "EOF" +# Add an include directory +include /etc/ld.so.conf.d/*.conf + +EOF +mkdir -pv /etc/ld.so.conf.d diff --git a/chapter8/gmp.sh b/chapter8/gmp.sh index 7a693aa..f853d52 100644 --- a/chapter8/gmp.sh +++ b/chapter8/gmp.sh @@ -1,3 +1,16 @@ #!/bin/bash +# Uncomment for generic libraries +# cp -v configfsf.guess config.guess +# cp -v configfsf.sub config.sub +./configure --prefix=/usr \ + --enable-cxx \ + --disable-static \ + --docdir=/usr/share/doc/gmp-"${VERSION}" + +make +make html + +make -j1 install +make -j1 install-html diff --git a/chapter8/gperf.sh b/chapter8/gperf.sh index 7a693aa..66c6e76 100644 --- a/chapter8/gperf.sh +++ b/chapter8/gperf.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr --docdir=/usr/share/doc/gperf-"${VERSION}" +make + +make -j1 install diff --git a/chapter8/grep.sh b/chapter8/grep.sh index 7a693aa..3c82a41 100644 --- a/chapter8/grep.sh +++ b/chapter8/grep.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr --bindir=/bin +make + +make -j1 install diff --git a/chapter8/groff.sh b/chapter8/groff.sh index 7a693aa..ec6b15c 100644 --- a/chapter8/groff.sh +++ b/chapter8/groff.sh @@ -1,3 +1,7 @@ #!/bin/bash +PAGE=letter ./configure --prefix=/usr +make + +make -j1 install diff --git a/chapter8/grub.sh b/chapter8/grub.sh index 7a693aa..edb7b3b 100644 --- a/chapter8/grub.sh +++ b/chapter8/grub.sh @@ -1,3 +1,15 @@ #!/bin/bash +sed "s/gold-version/& -R .note.gnu.property/" \ + -i Makefile.in grub-core/Makefile.in +./configure --prefix=/usr \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --disable-efiemu \ + --disable-werror + +make + +make -j1 install +mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions diff --git a/chapter8/gzip.sh b/chapter8/gzip.sh index 7a693aa..dbf30a3 100644 --- a/chapter8/gzip.sh +++ b/chapter8/gzip.sh @@ -1,3 +1,9 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install + +mv -v /usr/bin/gzip /bin diff --git a/chapter8/iana-etc.sh b/chapter8/iana-etc.sh index 7a693aa..8576a80 100644 --- a/chapter8/iana-etc.sh +++ b/chapter8/iana-etc.sh @@ -1,3 +1,3 @@ #!/bin/bash - +cp -v services protocols /etc diff --git a/chapter8/inetutils.sh b/chapter8/inetutils.sh index 7a693aa..3999fb7 100644 --- a/chapter8/inetutils.sh +++ b/chapter8/inetutils.sh @@ -1,3 +1,18 @@ #!/bin/bash +./configure --prefix=/usr \ + --localstatedir=/var \ + --disable-logger \ + --disable-whois \ + --disable-rcp \ + --disable-rexec \ + --disable-rlogin \ + --disable-rsh \ + --disable-servers +make + +make -j1 install + +mv -v /usr/bin/{hostname,ping,ping6,traceroute} /bin +mv -v /usr/bin/ifconfig /sbin diff --git a/chapter8/intltool.sh b/chapter8/intltool.sh index 7a693aa..0ab53c5 100644 --- a/chapter8/intltool.sh +++ b/chapter8/intltool.sh @@ -1,3 +1,10 @@ #!/bin/bash +sed -i 's:\\\${:\\\$\\{:' intltool-update.in +./configure --prefix=/usr + +make + +make -j1 install +install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-"${VERSION}"/I18N-HOWTO diff --git a/chapter8/iproute2.sh b/chapter8/iproute2.sh index 7a693aa..efa8e3f 100644 --- a/chapter8/iproute2.sh +++ b/chapter8/iproute2.sh @@ -1,3 +1,10 @@ #!/bin/bash +sed -i /ARPD/d Makefile +rm -fv man/man8/arpd.8 +sed -i 's/.m_ipt.o//' tc/Makefile + +make + +make DOCDIR=/usr/share/doc/iproute2-"${VERSION}" -j1 install diff --git a/chapter8/isl.sh b/chapter8/isl.sh index 7a693aa..3a98da1 100644 --- a/chapter8/isl.sh +++ b/chapter8/isl.sh @@ -1,3 +1,11 @@ #!/bin/bash +./configure --prefix=/usr \ + --disable-static \ + --docdir=/usr/share/doc/isl-"${VERSION}" +make +make html + +make -j1 install +make -j1 install-html diff --git a/chapter8/kbd.sh b/chapter8/kbd.sh index 7a693aa..81b369c 100644 --- a/chapter8/kbd.sh +++ b/chapter8/kbd.sh @@ -1,3 +1,15 @@ #!/bin/bash +patch -Np1 -i ../kbd-"${VERSION}"-backspace-1.patch +sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure +sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in + +./configure --prefix=/usr --disable-vlock + +make + +make -j1 install + +mkdir -v /usr/share/doc/kbd-"${VERSION}" +cp -R -v docs/doc/* /usr/share/doc/kbd-"${VERSION}" diff --git a/chapter8/kmod.sh b/chapter8/kmod.sh index 7a693aa..65e3a5f 100644 --- a/chapter8/kmod.sh +++ b/chapter8/kmod.sh @@ -1,3 +1,19 @@ #!/bin/bash +./configure --prefix=/usr \ + --bindir=/bin \ + --sysconfdir=/etc \ + --with-rootlibdir=/lib \ + --with-xz \ + --with-zstd \ + --with-zlib +make + +make -j1 install + +for target in depmod insmod lsmod modinfo modprobe rmmod; do + ln -sfv ../bin/kmod /sbin/"${target}" +done + +ln -sfv kmod /bin/lsmod diff --git a/chapter8/less.sh b/chapter8/less.sh index 7a693aa..8bdbea9 100644 --- a/chapter8/less.sh +++ b/chapter8/less.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr --sysconfdir=/etc +make + +make -j1 install diff --git a/chapter8/libcap.sh b/chapter8/libcap.sh index 7a693aa..41ff39c 100644 --- a/chapter8/libcap.sh +++ b/chapter8/libcap.sh @@ -1,3 +1,12 @@ #!/bin/bash +sed -i '/install -m.*STA/d' libcap/Makefile +make prefix=/usr lib=lib + +make prefix=/usr lib=lib -j1 install +for libname in cap psx; do + mv -v /usr/lib/lib"${libname}".so.* /lib + ln -sfv ../../lib/lib"${libname}".so.2 /usr/lib/lib"${libname}".so + chmod -v 755 /lib/lib"${libname}".so.2.48 +done diff --git a/chapter8/libelf.sh b/chapter8/libelf.sh index 7a693aa..ef91c85 100644 --- a/chapter8/libelf.sh +++ b/chapter8/libelf.sh @@ -1,3 +1,12 @@ #!/bin/bash +./configure --prefix=/usr \ + --disable-debuginfod \ + --enable-libdebuginfod=dummy \ + --libdir=/lib +make + +make -C libelf -j1 install +install -vm644 config/libelf.pc /usr/lib/pkgconfig +rm /lib/libelf.a diff --git a/chapter8/libffi.sh b/chapter8/libffi.sh index 7a693aa..51846d6 100644 --- a/chapter8/libffi.sh +++ b/chapter8/libffi.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr --disable-static --with-gcc-arch=native +make + +make -j1 install diff --git a/chapter8/libpipeline.sh b/chapter8/libpipeline.sh index 7a693aa..c3588fd 100644 --- a/chapter8/libpipeline.sh +++ b/chapter8/libpipeline.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install diff --git a/chapter8/libtool.sh b/chapter8/libtool.sh index 7a693aa..819a697 100644 --- a/chapter8/libtool.sh +++ b/chapter8/libtool.sh @@ -1,3 +1,9 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install + +rm -fv /usr/lib/libltdl.a diff --git a/chapter8/m4.sh b/chapter8/m4.sh index 7a693aa..1ccef8e 100644 --- a/chapter8/m4.sh +++ b/chapter8/m4.sh @@ -1,3 +1,8 @@ #!/bin/bash +sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c +echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h +./configure --prefix=/usr +make +make -j1 install diff --git a/chapter8/make.sh b/chapter8/make.sh index 7a693aa..c3588fd 100644 --- a/chapter8/make.sh +++ b/chapter8/make.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install diff --git a/chapter8/man-db.sh b/chapter8/man-db.sh index 7a693aa..be0d139 100644 --- a/chapter8/man-db.sh +++ b/chapter8/man-db.sh @@ -1,3 +1,16 @@ #!/bin/bash +./configure --prefix=/usr \ + --docdir=/usr/share/doc/man-db-"${VERSION}" \ + --sysconfdir=/etc \ + --disable-setuid \ + --enable-cache-owner=bin \ + --with-browser=/usr/bin/lynx \ + --with-vgrind=/usr/bin/vgrind \ + --with-grap=/usr/bin/grap \ + --with-systemdtmpfilesdir= \ + --with-systemdsystemunitdir= +make + +make -j1 install diff --git a/chapter8/man-pages.sh b/chapter8/man-pages.sh index 7a693aa..db9dad4 100644 --- a/chapter8/man-pages.sh +++ b/chapter8/man-pages.sh @@ -1,3 +1,3 @@ #!/bin/bash - +make -j1 install diff --git a/chapter8/meson.sh b/chapter8/meson.sh index 7a693aa..df3a017 100644 --- a/chapter8/meson.sh +++ b/chapter8/meson.sh @@ -1,3 +1,6 @@ #!/bin/bash +python3 setup.py build +python3 setup.py install --root=dest +cp -rv dest/* / diff --git a/chapter8/mpc.sh b/chapter8/mpc.sh index 7a693aa..8093f46 100644 --- a/chapter8/mpc.sh +++ b/chapter8/mpc.sh @@ -1,3 +1,11 @@ #!/bin/bash +./configure --prefix=/usr \ + --disable-static \ + --docdir=/usr/share/doc/mpc-"${VERSION}" +make +make html + +make -j1 install +make -j1 install-html diff --git a/chapter8/mpfr.sh b/chapter8/mpfr.sh index 7a693aa..f73b287 100644 --- a/chapter8/mpfr.sh +++ b/chapter8/mpfr.sh @@ -1,3 +1,12 @@ #!/bin/bash +./configure --prefix=/usr \ + --disable-static \ + --enable-thread-safe \ + --docdir=/usr/share/doc/mpfr-"${VERSION}" +make +make html + +make -j1 install +make -j1 install-html diff --git a/chapter8/ncurses.sh b/chapter8/ncurses.sh index 7a693aa..918c829 100644 --- a/chapter8/ncurses.sh +++ b/chapter8/ncurses.sh @@ -1,3 +1,29 @@ #!/bin/bash +./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --with-shared \ + --without-debug \ + --without-normal \ + --enable-pc-files \ + --enable-widec +make +make -j1 install + +mv -v /usr/lib/libncursesw.so.6* /lib +ln -sfv ../../lib/"$(readlink /usr/lib/libncursesw.so)" /usr/lib/libncursesw.so +for lib in ncurses form panel menu ; do + rm -vf /usr/lib/lib"${lib}".so + echo "INPUT(-l${lib}w)" > /usr/lib/lib"${lib}".so + ln -sfv "${lib}"w.pc /usr/lib/pkgconfig/"${lib}".pc +done + +rm -vf /usr/lib/libcursesw.so +echo "INPUT(-lncursesw)" > /usr/lib/libcursesw.so +ln -sfv libncurses.so /usr/lib/libcurses.so + +rm -fv /usr/lib/libncurses++w.a + +mkdir -v /usr/share/doc/ncurses-"${VERSION}" +cp -v -R doc/* /usr/share/doc/ncurses-"${VERSION}" diff --git a/chapter8/ninja.sh b/chapter8/ninja.sh index 7a693aa..3f93e56 100644 --- a/chapter8/ninja.sh +++ b/chapter8/ninja.sh @@ -1,3 +1,16 @@ #!/bin/bash +export NINJAJOBS=4 +sed -i '/int Guess/a \ + int j = 0;\ + char* jobs = getenv( "NINJAJOBS" );\ + if ( jobs != NULL ) j = atoi( jobs );\ + if ( j > 0 ) return j;\ +' src/ninja.cc + +python3 configure.py --bootstrap + +install -vm755 ninja /usr/bin/ +install -vDm644 misc/bash-completion /usr/share/bash-completion/completions/ninja +install -vDm644 misc/zsh-completion /usr/share/zsh/site-functions/_ninja diff --git a/chapter8/openssl.sh b/chapter8/openssl.sh index 7a693aa..d7b5e9b 100644 --- a/chapter8/openssl.sh +++ b/chapter8/openssl.sh @@ -1,3 +1,16 @@ #!/bin/bash +./config --prefix=/usr \ + --openssldir=/etc/ssl \ + --libdir=lib \ + shared \ + zlib-dynamic +make + +sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile +make MANSUFFIX=ssl install + +mv -v /usr/share/doc/openssl /usr/share/doc/openssl-"${VERSION}" + +cp -vfr doc/* /usr/share/doc/openssl-"${VERSION}" diff --git a/chapter8/patch.sh b/chapter8/patch.sh index 7a693aa..c3588fd 100644 --- a/chapter8/patch.sh +++ b/chapter8/patch.sh @@ -1,3 +1,7 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install diff --git a/chapter8/perl.sh b/chapter8/perl.sh index 7a693aa..c7afaaf 100644 --- a/chapter8/perl.sh +++ b/chapter8/perl.sh @@ -1,3 +1,26 @@ #!/bin/bash +MAJMIN="$(cut -d\. -f1,2 <<< "${VERSION}")" +export BUILD_ZLIB=False +export BUILD_BZIP2=0 + +sh Configure -des \ + -Dprefix=/usr \ + -Dvendorprefix=/usr \ + -Dprivlib=/usr/lib/perl5/"${MAJMIN}"/core_perl \ + -Darchlib=/usr/lib/perl5/"${MAJMIN}"/core_perl \ + -Dsitelib=/usr/lib/perl5/"${MAJMIN}"/site_perl \ + -Dsitearch=/usr/lib/perl5/"${MAJMIN}"/site_perl \ + -Dvendorlib=/usr/lib/perl5/"${MAJMIN}"/vendor_perl \ + -Dvendorarch=/usr/lib/perl5/"${MAJMIN}"/vendor_perl \ + -Dman1dir=/usr/share/man/man1 \ + -Dman3dir=/usr/share/man/man3 \ + -Dpager="/usr/bin/less -isR" \ + -Duseshrplib \ + -Dusethreads + +make + +make -j1 install +unset BUILD_ZLIB BUILD_BZIP2 diff --git a/chapter8/pkg-config.sh b/chapter8/pkg-config.sh index 7a693aa..395d190 100644 --- a/chapter8/pkg-config.sh +++ b/chapter8/pkg-config.sh @@ -1,3 +1,9 @@ #!/bin/bash +./configure --prefix=/usr \ + --with-internal-glib \ + --disable-host-tool \ + --docdir=/usr/share/doc/pkg-config-"${VERSION}" +make +make -j1 install diff --git a/chapter8/procps-ng.sh b/chapter8/procps-ng.sh index 7a693aa..a21e6e4 100644 --- a/chapter8/procps-ng.sh +++ b/chapter8/procps-ng.sh @@ -1,3 +1,15 @@ #!/bin/bash +./configure --prefix=/usr \ + --exec-prefix= \ + --libdir=/usr/lib \ + --docdir=/usr/share/doc/procps-ng-"${VERSION}" \ + --disable-static \ + --disable-kill +make + +make -j1 install + +mv -v /usr/lib/libprocps.so.* /lib +ln -sfv ../../lib/"$(readlink /usr/lib/libprocps.so)" /usr/lib/libprocps.so diff --git a/chapter8/psmisc.sh b/chapter8/psmisc.sh index 7a693aa..b57d459 100644 --- a/chapter8/psmisc.sh +++ b/chapter8/psmisc.sh @@ -1,3 +1,10 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install + +mv -v /usr/bin/fuser /bin +mv -v /usr/bin/killall /bin diff --git a/chapter8/python.sh b/chapter8/python.sh index 7a693aa..f0e1ce9 100644 --- a/chapter8/python.sh +++ b/chapter8/python.sh @@ -1,3 +1,19 @@ #!/bin/bash +./configure --prefix=/usr \ + --enable-shared \ + --with-system-expat \ + --with-system-ffi \ + --with-ensurepip=yes +make + +make -j1 install + +install -v -dm755 /usr/share/doc/python-"${VERSION}"/html + +tar --strip-components=1 \ + --no-same-owner \ + --no-same-permissions \ + -C /usr/share/doc/python-"${VERSION}"/html \ + -xvf ../python-"${VERSION}"-docs-html.tar.bz2 diff --git a/chapter8/readline.sh b/chapter8/readline.sh index 7a693aa..be3dcc0 100644 --- a/chapter8/readline.sh +++ b/chapter8/readline.sh @@ -1,3 +1,18 @@ #!/bin/bash +sed -i '/MV.*old/d' Makefile.in +sed -i '/{OLDSUFF}/c:' support/shlib-install +./configure --prefix=/usr \ + --disable-static \ + --with-curses \ + --docdir=/usr/share/doc/readline-"${VERSION}" + +make SHLIB_LIBS="-lncursesw" +make SHLIB_LIBS="-lncursesw" -j1 install + +mv -v /usr/lib/lib{readline,history}.so.* /lib +ln -sfv ../../lib/"$(readlink /usr/lib/libreadline.so)" /usr/lib/libreadline.so +ln -sfv ../../lib/"$(readlink /usr/lib/libhistory.so )" /usr/lib/libhistory.so + +install -v -m644 doc/*.{ps,pdf,html,dvi} /usr/share/doc/readline-"${VERSION}" diff --git a/chapter8/sed.sh b/chapter8/sed.sh index 7a693aa..97e8197 100644 --- a/chapter8/sed.sh +++ b/chapter8/sed.sh @@ -1,3 +1,11 @@ #!/bin/bash +./configure --prefix=/usr --bindir=/bin +make +make html + +make -j1 install + +install -d -m755 /usr/share/doc/sed-"${VERSION}" +install -m644 doc/sed.html /usr/share/doc/sed-"${VERSION}" diff --git a/chapter8/shadow.sh b/chapter8/shadow.sh index 7a693aa..f0254de 100644 --- a/chapter8/shadow.sh +++ b/chapter8/shadow.sh @@ -1,3 +1,26 @@ #!/bin/bash +ROOTPW='$1$5RPAAd$oejpw8ErihLIB7vmGE4SV1' +sed -i 's/groups$(EXEEXT) //' src/Makefile.in +find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; +find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \; +find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \; + +sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \ + -e 's:/var/spool/mail:/var/mail:' \ + -i etc/login.defs + +sed -i 's/1000/999/' etc/useradd + +touch /usr/bin/passwd +./configure --sysconfdir=/etc \ + --with-group-name-max-length=32 + +make +make -j1 install + +pwconv +grpconv + +usermod -p "${ROOTPW}" root diff --git a/chapter8/sysklogd.sh b/chapter8/sysklogd.sh index 7a693aa..7d28f51 100644 --- a/chapter8/sysklogd.sh +++ b/chapter8/sysklogd.sh @@ -1,3 +1,22 @@ #!/bin/bash +sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c +sed -i 's/union wait/int/' syslogd.c +make + +make BINDIR=/sbin -j1 install + +cat > /etc/syslog.conf << "EOF" +# Begin /etc/syslog.conf + +auth,authpriv.* -/var/log/auth.log +*.*;auth,authpriv.none -/var/log/sys.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log +*.emerg * + +# End /etc/syslog.conf +EOF diff --git a/chapter8/sysvinit.sh b/chapter8/sysvinit.sh index 7a693aa..563a21a 100644 --- a/chapter8/sysvinit.sh +++ b/chapter8/sysvinit.sh @@ -1,3 +1,7 @@ #!/bin/bash +patch -Np1 -i ../sysvinit-"${VERSION}"-consolidated-1.patch +make + +make -j1 install diff --git a/chapter8/tar.sh b/chapter8/tar.sh index 7a693aa..312a500 100644 --- a/chapter8/tar.sh +++ b/chapter8/tar.sh @@ -1,3 +1,10 @@ #!/bin/bash +FORCE_UNSAFE_CONFIGURE=1 \ +./configure --prefix=/usr \ + --bindir=/bin +make + +make -j1 install +make -C doc install-html docdir=/usr/share/doc/tar-"${VERSION}" diff --git a/chapter8/tcl.sh b/chapter8/tcl.sh index 7a693aa..688dc5e 100644 --- a/chapter8/tcl.sh +++ b/chapter8/tcl.sh @@ -1,3 +1,35 @@ #!/bin/bash +tar -xf ../tcl"${VERSION}"-html.tar.gz --strip-components=1 +SRCDIR=$(pwd) +cd unix || exit 1 +./configure --prefix=/usr \ + --mandir=/usr/share/man \ + "$([ "$(uname -m)" = x86_64 ] && echo --enable-64bit)" + +make + +sed -e "s|${SRCDIR}/unix|/usr/lib|" \ + -e "s|${SRCDIR}|/usr/include|" \ + -i tclConfig.sh + +sed -e "s|${SRCDIR}/unix/pkgs/tdbc1.1.2|/usr/lib/tdbc1.1.2|" \ + -e "s|${SRCDIR}/pkgs/tdbc1.1.2/generic|/usr/include|" \ + -e "s|${SRCDIR}/pkgs/tdbc1.1.2/library|/usr/lib/tcl8.6|" \ + -e "s|${SRCDIR}/pkgs/tdbc1.1.2|/usr/include|" \ + -i pkgs/tdbc1.1.2/tdbcConfig.sh + +sed -e "s|${SRCDIR}/unix/pkgs/itcl4.2.1|/usr/lib/itcl4.2.1|" \ + -e "s|${SRCDIR}/pkgs/itcl4.2.1/generic|/usr/include|" \ + -e "s|${SRCDIR}/pkgs/itcl4.2.1|/usr/include|" \ + -i pkgs/itcl4.2.1/itclConfig.sh + +unset SRCDIR + +make -j1 install + +chmod -v u+w /usr/lib/libtcl8.6.so +make -j1 install-private-headers +ln -sfv tclsh8.6 /usr/bin/tclsh +mv /usr/share/man/man3/{Thread,Tcl_Thread}.3 diff --git a/chapter8/texinfo.sh b/chapter8/texinfo.sh index 7a693aa..bfd324f 100644 --- a/chapter8/texinfo.sh +++ b/chapter8/texinfo.sh @@ -1,3 +1,9 @@ #!/bin/bash +./configure --prefix=/usr +make + +make -j1 install + +make TEXMF=/usr/share/texmf install-tex diff --git a/chapter8/util-linux.sh b/chapter8/util-linux.sh index 7a693aa..f44bb38 100644 --- a/chapter8/util-linux.sh +++ b/chapter8/util-linux.sh @@ -1,3 +1,20 @@ #!/bin/bash +./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ + --docdir=/usr/share/doc/util-linux-"${VERSION}" \ + --disable-chfn-chsh \ + --disable-login \ + --disable-nologin \ + --disable-su \ + --disable-setpriv \ + --disable-runuser \ + --disable-pylibmount \ + --disable-static \ + --without-python \ + --without-systemd \ + --without-systemdsystemunitdir \ + runstatedir=/run +make + +make -j1 install diff --git a/chapter8/vim.sh b/chapter8/vim.sh index 7a693aa..6543279 100644 --- a/chapter8/vim.sh +++ b/chapter8/vim.sh @@ -1,3 +1,34 @@ #!/bin/bash +echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h +./configure --prefix=/usr + +make + +make -j1 install + +ln -sv vim /usr/bin/vi +for L in /usr/share/man/{,*/}man1/vim.1; do + ln -sv vim.1 "$(dirname $L)"/vi.1 +done + +ln -sv ../vim/vim82/doc /usr/share/doc/vim-"${VERSION}" + +cat > /etc/vimrc << "EOF" +" Begin /etc/vimrc + +" Ensure defaults are set before customizing settings, not after +source $VIMRUNTIME/defaults.vim +let skip_defaults_vim=1 + +set nocompatible +set backspace=2 +set mouse= +syntax on +if (&term == "xterm") || (&term == "putty") + set background=dark +endif + +" End /etc/vimrc +EOF diff --git a/chapter8/xml-parser.sh b/chapter8/xml-parser.sh index 7a693aa..468c6f1 100644 --- a/chapter8/xml-parser.sh +++ b/chapter8/xml-parser.sh @@ -1,3 +1,7 @@ #!/bin/bash +perl Makefile.PL +make + +make -j1 install diff --git a/chapter8/xz.sh b/chapter8/xz.sh index 7a693aa..5204163 100644 --- a/chapter8/xz.sh +++ b/chapter8/xz.sh @@ -1,3 +1,12 @@ #!/bin/bash +./configure --prefix=/usr \ + --disable-static \ + --docdir=/usr/share/doc/xz-"${VERSION}" + +make +make -j1 install +mv -v /usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat} /bin +mv -v /usr/lib/liblzma.so.* /lib +ln -svf ../../lib/"$(readlink /usr/lib/liblzma.so)" /usr/lib/liblzma.so diff --git a/chapter8/zlib.sh b/chapter8/zlib.sh index 7a693aa..47dfba2 100644 --- a/chapter8/zlib.sh +++ b/chapter8/zlib.sh @@ -1,3 +1,9 @@ #!/bin/bash +./configure --prefix=/usr +make +make -j1 install +mv -v /usr/lib/libz.so.* /lib +ln -sfv ../../lib/"$(readlink /usr/lib/libz.so)" /usr/lib/libz.so +rm -fv /usr/lib/libz.a diff --git a/chapter8/zstd.sh b/chapter8/zstd.sh index 7a693aa..56b5ddb 100644 --- a/chapter8/zstd.sh +++ b/chapter8/zstd.sh @@ -1,3 +1,8 @@ #!/bin/bash +make +make prefix=/usr -j1 install +rm -v /usr/lib/libzstd.a +mv -v /usr/lib/libzstd.so.* /lib +ln -sfv ../../lib/"$(readlink /usr/lib/libzstd.so)" /usr/lib/libzstd.so -- cgit v1.2.3-54-g00ecf From 193505ab65719cdb341d297c242be476169316b0 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 14:10:22 -0500 Subject: Add package listing for chapter 8 packageinstall loop. --- insidechroot.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/insidechroot.sh b/insidechroot.sh index b6cb78e..b78a4a2 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -29,8 +29,7 @@ elif [[ "${CHAPTER}" -eq 8 ]]; then printf "%b" "\n${IWHT}============ ${IGRN}Building ${IYLW}Chapter 8${IWHT} \ ============${RST}\n" - #Add elfutils after kmod - 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 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 + 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 -- cgit v1.2.3-54-g00ecf From 595314c62b0344c3c6f862f198d56ab88eb17e0b Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 14:10:50 -0500 Subject: Add NINJAJOBS variable to be used with ninja builds. --- env.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/env.sh b/env.sh index e265628..7587c1e 100644 --- a/env.sh +++ b/env.sh @@ -35,6 +35,7 @@ NUMPROCS="$(getconf _NPROCESSORS_ONLN)" numjobs="$((NUMPROCS * 2 - 1))" # Make flags for multiple jobs MAKEFLAGS="-j ${numjobs}" +NINJAJOBS="${NUMPROCS}" # Set spinner type (0-12 in funtions.sh) SPINNER="0" @@ -43,7 +44,7 @@ SPINNER="0" TESTERUID="$(id -u)" \ export PS1 LC_ALL LFS LFS_TGT PATH CONFIG_SITE -export LFS_VER LFS_DISK LFS_FS LFS_PART LFS_PWD NUMPROCS MAKEFLAGS +export LFS_VER LFS_DISK LFS_FS LFS_PART LFS_PWD NUMPROCS MAKEFLAGS NINJAJOBS export SPINNER export TESTERUID -- cgit v1.2.3-54-g00ecf From 2896a9a96726f65602612e3c684ee349a84add29 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 6 Apr 2021 14:11:29 -0500 Subject: Pass NINJAJOBS when entering chroot. --- lfs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lfs.sh b/lfs.sh index ac10c67..37ae8a2 100755 --- a/lfs.sh +++ b/lfs.sh @@ -158,6 +158,7 @@ sudo chroot "${LFS}" /usr/bin/env \ PATH=/bin:/usr/bin:/sbin:/usr/sbin \ NUMPROCS="${NUMPROCS}" \ MAKEFLAGS="${MAKEFLAGS}" \ + NINJAJOBS="${MAKEFLAGS}" \ SPINNER="${SPINNER}" \ /bin/bash --login +h -c "/sources/insidechroot.sh 7" retval=$? @@ -189,6 +190,7 @@ sudo chroot "${LFS}" /usr/bin/env \ PATH=/bin:/usr/bin:/sbin:/usr/sbin \ NUMPROCS="${NUMPROCS}" \ MAKEFLAGS="${MAKEFLAGS}" \ + NINJAJOBS="${NINJAJOBS}" \ SPINNER="${SPINNER}" \ /bin/bash --login +h -c "/sources/insidechroot.sh 8" -- cgit v1.2.3-54-g00ecf From b760559acc63f313f648076a665efe49a2fbf69d Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 08:36:19 -0500 Subject: Change xz Utils to xz, and use tcl-doc and python-doc since adjusting the grep in packageinsta.sh. --- packages.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages.csv b/packages.csv index 10c93d1..f9303e5 100644 --- a/packages.csv +++ b/packages.csv @@ -62,7 +62,7 @@ pkg-config,0.29.2,https://pkg-config.freedesktop.org/releases/pkg-config-@.tar.g 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.4,https://www.python.org/ftp/python/doc/@/python-@-docs-html.tar.bz2,a225c583da4533c5bf98ba3555f50c7b +python-doc,3.9.4,https://www.python.org/ftp/python/doc/@/python-@-docs-html.tar.bz2,a225c583da4533c5bf98ba3555f50c7b readline,8.1,http://ftp.gnu.org/gnu/readline/readline-@.tar.gz,e9557dd5b1409f5d7b37ef717c64518e sed,4.8,http://ftp.gnu.org/gnu/sed/sed-@.tar.xz,6d906edfdb3202304059233f51f9a71d shadow,4.8.1,https://github.com/shadow-maint/shadow/releases/download/@/shadow-@.tar.xz,4b05eff8a427cf50e615bda324b5bc45 @@ -70,13 +70,13 @@ sysklogd,1.5.1,http://www.infodrom.org/projects/sysklogd/download/sysklogd-@.tar sysvinit,2.98,http://download.savannah.gnu.org/releases/sysvinit/sysvinit-@.tar.xz,e3254f7622ea5cf2322b1b386a98ba59 tar,1.34,http://ftp.gnu.org/gnu/tar/tar-@.tar.xz,9a08d29a9ac4727130b5708347c0f5cf tcl,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-src.tar.gz,8a4c004f48984a03a7747e9ba06e4da4 -tcldoc,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-html.tar.gz,e358a9140c3a171e42f18c8a7f6a36ea +tcl-doc,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-html.tar.gz,e358a9140c3a171e42f18c8a7f6a36ea texinfo,6.7,http://ftp.gnu.org/gnu/texinfo/texinfo-@.tar.xz,d4c5d8cc84438c5993ec5163a59522a6 time Zone Data,2021a,https://www.iana.org/time-zones/repository/releases/tzdata@.tar.gz,20eae7d1da671c6eac56339c8df85bbd udev-lfs Tarball,udev-lfs-20171102,http://anduin.linuxfromscratch.org/LFS/@.tar.xz,27cd82f9a61422e186b9d6759ddf1634 util-linux,2.36.2,https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-@.tar.xz,f78419af679ac9678190ad961eb3cf27 vim,8.2.2433,http://anduin.linuxfromscratch.org/LFS/vim-@.tar.gz,a26555c8919cf40938d2428d834bf913 xml-parser,2.46,https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-@.tar.gz,80bb18a8e6240fcf7ec2f7b57601c170 -xz Utils,5.2.5,https://tukaani.org/xz/xz-@.tar.xz,aa1621ec7013a19abab52a8aff04fe5b +xz,5.2.5,https://tukaani.org/xz/xz-@.tar.xz,aa1621ec7013a19abab52a8aff04fe5b zlib,1.2.11,https://zlib.net/zlib-@.tar.xz,85adef240c5f370b308da8c938951a68 zstd,1.4.8,https://github.com/facebook/zstd/releases/download/v@/zstd-@.tar.gz,e873db7cfa5ef05832e6d55a5a572840 -- cgit v1.2.3-54-g00ecf From 031b2c7f5f356771ac05a582b0393baa92da4c48 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 08:39:35 -0500 Subject: Change grep to look for package up until the first comma. --- packageinstall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packageinstall.sh b/packageinstall.sh index 78e2cdd..df09148 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -3,7 +3,7 @@ CHAPTER="$1" PACKAGE="$2" -if ! grep -q "^${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 @@ -12,7 +12,7 @@ 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 + 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")" CACHEFILE="$(basename "${URL}")" -- cgit v1.2.3-54-g00ecf From ac354a9d5315885efa9454a41becd710ddd6de21 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 09:55:40 -0500 Subject: Remove unneeded test echo. --- chapter8/coreutils.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/chapter8/coreutils.sh b/chapter8/coreutils.sh index 62ceb69..6a41065 100644 --- a/chapter8/coreutils.sh +++ b/chapter8/coreutils.sh @@ -1,7 +1,5 @@ #!/bin/bash -echo $NINJAJOBS - patch -Np1 -i ../coreutils-"${VERSION}"-i18n-1.patch sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk -- cgit v1.2.3-54-g00ecf From bd28b404a87e275ba39da8f1e15870c741a93aec 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 f7343ae4287635379a9cb71eb4e420bc641e35ee Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 11:40:33 -0500 Subject: Use package version when changing ownership of versioned library libpsx.so.x.xx --- chapter8/libcap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter8/libcap.sh b/chapter8/libcap.sh index 41ff39c..2925c8b 100644 --- a/chapter8/libcap.sh +++ b/chapter8/libcap.sh @@ -8,5 +8,5 @@ make prefix=/usr lib=lib -j1 install for libname in cap psx; do mv -v /usr/lib/lib"${libname}".so.* /lib ln -sfv ../../lib/lib"${libname}".so.2 /usr/lib/lib"${libname}".so - chmod -v 755 /lib/lib"${libname}".so.2.48 + chmod -v 755 /lib/lib"${libname}".so."${VERSION}" done -- cgit v1.2.3-54-g00ecf From 99c6ae8bf03053bce2bb97d5df9a09b06154fe9a Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 12:38:15 -0500 Subject: Add commands to move libmagic shared library to /lib. --- chapter8/file.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chapter8/file.sh b/chapter8/file.sh index 5adb7d7..343b08b 100644 --- a/chapter8/file.sh +++ b/chapter8/file.sh @@ -3,3 +3,6 @@ ./configure --prefix=/usr make make -j1 install + +mv -v /usr/lib/libmagic.so.* /lib +ln -sfv ../../lib/"$(readlink /usr/lib/libmagic.so)" /usr/lib/libmagic.so -- cgit v1.2.3-54-g00ecf From a0df9ed4e8d7d1ba657b365356832f4c80f8306b Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 12:45:25 -0500 Subject: Use configure prefix option rather than PREFIX variable for /usr --- chapter8/bc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter8/bc.sh b/chapter8/bc.sh index c1d3014..cfc3b3c 100644 --- a/chapter8/bc.sh +++ b/chapter8/bc.sh @@ -1,6 +1,6 @@ #!/bin/bash -PREFIX=/usr CC=gcc ./configure.sh -G -O3 +CC=gcc ./configure.sh --prefix=/usr -G -O3 make make -j1 install -- cgit v1.2.3-54-g00ecf From 25346f097ddbd7957b8a48d94305ab04ce290ff0 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 12:49:47 -0500 Subject: Install shell-complletions for bash and zsh. --- chapter8/meson.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chapter8/meson.sh b/chapter8/meson.sh index df3a017..dc30b07 100644 --- a/chapter8/meson.sh +++ b/chapter8/meson.sh @@ -4,3 +4,5 @@ python3 setup.py build python3 setup.py install --root=dest cp -rv dest/* / +install -vDm644 data/shell-completions/bash/meson /usr/share/bash-completion/completions/meson +install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/_meson -- cgit v1.2.3-54-g00ecf From 8e2a517acb2c0f6e984fdfbf0d39f5b7d776bf1c Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 12:54:17 -0500 Subject: Fix a header so that #include works. --- chapter8/python.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chapter8/python.sh b/chapter8/python.sh index f0e1ce9..f78b41b 100644 --- a/chapter8/python.sh +++ b/chapter8/python.sh @@ -1,5 +1,7 @@ #!/bin/bash +sed 's|cpython/||' -i Include/cpython/pystate.h + ./configure --prefix=/usr \ --enable-shared \ --with-system-expat \ -- cgit v1.2.3-54-g00ecf From f915ae2960d95eaa39e9c6fb170e7f3382cda9d5 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 7 Apr 2021 16:31:11 -0500 Subject: Change backup file to proper user:group ownership after creation. --- chapter6/backup.sh | 2 +- chapter7/backup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter6/backup.sh b/chapter6/backup.sh index 15a26c9..a27440b 100644 --- a/chapter6/backup.sh +++ b/chapter6/backup.sh @@ -16,7 +16,7 @@ else printf "%b" "${IRED}FAILED!${RST}\n" exit "${retval}" else - sudo chown -v "${USER}" "${HOME}"/"${file}" >>"${LFS}"/sources/log/chapter6/backup.log + sudo chown -v "${USER}":"$(id -g)" "${HOME}"/"${file}" >>"${LFS}"/sources/log/chapter6/backup.log printf "%b" "${IGRN}OK${RST}\n" fi popd > /dev/null || exit 1 diff --git a/chapter7/backup.sh b/chapter7/backup.sh index 9442566..7cfb29f 100644 --- a/chapter7/backup.sh +++ b/chapter7/backup.sh @@ -16,7 +16,7 @@ else printf "%b" "${IRED}FAILED!${RST}\n" exit "${retval}" else - sudo chown -v "${USER}" "${HOME}"/"${file}" >"${LFS}"/sources/log/chapter7/backup.log 2>&1 + sudo chown -v "${USER}":"$(id -g)" "${HOME}"/"${file}" >"${LFS}"/sources/log/chapter7/backup.log 2>&1 printf "%b" "${IGRN}OK${RST}\n" fi popd > /dev/null || exit 1 -- cgit v1.2.3-54-g00ecf From 9ee68f93a3665922091afcd0706ce0f00b4d4a33 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 8 Apr 2021 10:01:34 -0500 Subject: Fix/Add chroot commands. Add cleanup and backup for chapter 8. --- lfs.sh | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/lfs.sh b/lfs.sh index 37ae8a2..4d13d2a 100755 --- a/lfs.sh +++ b/lfs.sh @@ -151,7 +151,9 @@ sleep 3 # Create chapter7 log directory as non root user mkdir -p "${LFS}"/sources/log/chapter7 -sudo chroot "${LFS}" /usr/bin/env \ + +# Enter CHROOT for chapter 7 +sudo chroot "${LFS}" /usr/bin/env -i \ HOME=/root \ TERM="${TERM}" \ PS1='(lfs chroot) \u:\w\$ ' \ @@ -182,8 +184,11 @@ source mountvirtfs.sh printf "%b" "\n${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n" sleep 3 -# Enter CHROOT for chapter 8, 9 and 10 -sudo chroot "${LFS}" /usr/bin/env \ +# Create chapter8 log directory as non root user +mkdir -p "${LFS}"/sources/log/chapter8 + +# Enter CHROOT for chapter 8 +sudo chroot "${LFS}" /usr/bin/env -i \ HOME=/root \ TERM="${TERM}" \ PS1='(lfs chroot) \u:\w\$ ' \ @@ -193,5 +198,39 @@ sudo chroot "${LFS}" /usr/bin/env \ NINJAJOBS="${NINJAJOBS}" \ SPINNER="${SPINNER}" \ /bin/bash --login +h -c "/sources/insidechroot.sh 8" +retval=$? + +printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n" +# Cleanup and Backup if chapter 8 successfully finished +if [[ "$retval" -eq 0 ]]; then + source umountvirtfs.sh + + printf "%b" "\n${IWHT}======= ${IYLW}Chapter 8 ${IGRN}Cleanup and Backup \ +${IWHT}=======${RST}\n" + source "${LFS}"/sources/chapter8/cleanup.sh + source "${LFS}"/sources/chapter8/backup.sh +else + exit "$retval" +fi + +# Mount virtual kernel filesystems after cleanup and backup +source mountvirtfs.sh + +printf "%b" "\n${CYN}ENTERING ${RED}CHROOT${CYN} ENVIRONMENT...${RST}\n" +sleep 3 + +# Enter CHROOT for chapter 9,10 +sudo chroot "${LFS}" /usr/bin/env -i \ + HOME=/root \ + TERM="${TERM}" \ + PS1='(lfs chroot) \u:\w\$ ' \ + PATH=/bin:/usr/bin:/sbin:/usr/sbin \ + NUMPROCS="${NUMPROCS}" \ + MAKEFLAGS="${MAKEFLAGS}" \ + NINJAJOBS="${NINJAJOBS}" \ + SPINNER="${SPINNER}" \ + /bin/bash --login +h -c "/sources/insidechroot.sh 9" +retval=$? + +printf "%b" "\n${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n" -printf "%b" "\n${CYN}EXITED ${RED}CHROOT${CYN} ENVIRONMENT${RST}...\n" -- cgit v1.2.3-54-g00ecf From c8352c837d55df42754351ecb15aed4b5ec8e8f2 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 8 Apr 2021 10:01:59 -0500 Subject: Adjust backup and cleanup scripts for chapter8. --- chapter8/backup.sh | 25 +++++++++++++++++++++ chapter8/cleanup.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 chapter8/backup.sh create mode 100644 chapter8/cleanup.sh diff --git a/chapter8/backup.sh b/chapter8/backup.sh new file mode 100644 index 0000000..57b356d --- /dev/null +++ b/chapter8/backup.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +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) + +if [ -f "${LFS}/sources/chapter8/backup" ]; then + printf "%b" " ${IGRN}Backup previously completed${RST}\n" +else + + printf "%b" "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${file}${RST}... " + pushd "${LFS}" > /dev/null || exit 1 + sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJvpf "${HOME}"/"${file}" "${directories[@]}" >"${LFS}"/sources/log/chapter8/backup.log 2>&1 & pid=$! + spinner "$pid" "${SPINNER}" + retval=$? + if [ "${retval}" -ne 0 ]; then + printf "%b" "${IRED}FAILED!${RST}\n" + exit "${retval}" + else + sudo chown -v "${USER}":"$(id -g)" "${HOME}"/"${file}" >"${LFS}"/sources/log/chapter8/backup.log 2>&1 + printf "%b" "${IGRN}OK${RST}\n" + fi + popd > /dev/null || exit 1 + + touch "${LFS}/sources/chapter8/backup" +fi diff --git a/chapter8/cleanup.sh b/chapter8/cleanup.sh new file mode 100644 index 0000000..46c152d --- /dev/null +++ b/chapter8/cleanup.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +if [ -f "${LFS}/sources/chapter8/cleanup" ]; then + printf "%b" " ${IGRN}Cleanup already performed${RST}\n" +else + + printf "%b" "${GRN}Cleaning up ${YLW}${LFS}${RST}... " + + { + + sudo rm -rfv "${LFS}"/tmp/* + sudo rm -rfv "${LFS}"/tools + + sudo find "${LFS}"/usr/lib -name \*.la -delete + sudo find "${LFS}"/usr/libexec -name \*.la -delete + + sudo find "${LFS}"/usr -depth -name "$(uname -m)"-lfs-linux-gnu\* | xargs sudo rm -rfv + + sudo sed '/tester/d' -i "${LFS}"/etc/group + sudo sed '/tester/d' -i "${LFS}"/etc/passwd + sudo rm -rfv "${LFS}"/home/tester + + sudo rm -rfv "${LFS}"/usr/share/doc + sudo rm -rfv "${LFS}"/usr/share/info + sudo rm -rfv "${LFS}"/usr/share/man + + # Place debugging symbols for selected libraries in seprate files + save_lib="ld-2.33.so libc-2.33.so libpthread-2.33.so libthread_db-1.0.so" + cd "${LFS}"/lib || exit 1 + + for LIB in $save_lib; do + sudo objcopy --only-keep-debug "${LIB}" "${LIB}".dbg + sudo strip --strip-unneeded "${LIB}" + sudo objcopy --add-gnu-debuglink="${LIB}".dbg "${LIB}" + done + + save_usrlib="libquadmath.so.0.0.0 libstdc++.so.6.0.28 libitm.so.1.0.0 libatomic.so.1.2.0" + + cd "${LFS}"/usr/lib || exit 1 + + for LIB in $save_usrlib; do + sudo objcopy --only-keep-debug "${LIB}" "${LIB}".dbg + sudo strip --strip-unneeded "${LIB}" + sudo objcopy --add-gnu-debuglink="${LIB}".dbg "${LIB}" + done + + sudo find "${LFS}"/usr/lib -type f -name \*.a -exec strip --strip-debug {} ';' + sudo find "${LFS}"/lib -type f -name \*.so* ! -name \*dbg -exec strip --strip-unneeded {} ';' + sudo find "${LFS}"/usr/lib -type f -name \*.so* ! -name \*dbg -exec strip --strip-unneeded {} ';' + + + sudo find "${LFS}"/bin -type f -exec strip --strip-all {} ';' + sudo find "${LFS}"/sbin -type f -exec strip --strip-all {} ';' + sudo find "${LFS}"/usr/bin -type f -exec strip --strip-all {} ';' + sudo find "${LFS}"/usr/sbin -type f -exec strip --strip-all {} ';' + sudo find "${LFS}"/usr/libexec -type f -exec strip --strip-all {} ';' + + +} >"${LFS}"/sources/log/chapter8/cleanup.log 2>&1 + + printf "%b" "${IGRN}OK${RST}\n" + sudo touch "${LFS}"/sources/chapter8/cleanup >/dev/null 2>&1 +fi -- cgit v1.2.3-54-g00ecf From cf106d825a7c6501b7217652a74f1e5a7385133d Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 8 Apr 2021 14:14:50 -0500 Subject: Use sudo inside preparechroot and remove check for root user. --- preparechroot.sh | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/preparechroot.sh b/preparechroot.sh index 52e1f60..809a0d4 100644 --- a/preparechroot.sh +++ b/preparechroot.sh @@ -4,50 +4,45 @@ source colors.sh export LFS="$1" -if [[ -f chrootprepared ]]; then - printf "%b" " ${IRED}CHROOT ${IGRN}already prepared\n${RST}" - exit 0 -fi - if [[ -z "${LFS}" ]]; then - printf "%b" "${RED}Require first argument as path to LFS build!${RST}\n" + printf "%b" " ${IGRN}preparechroot.sh${RST}: ${IRED}Require first argument as path to LFS build!${RST}\n" exit 1 fi -if [[ "${USER}" == "root" ]]; then +if [[ -f chrootprepared ]]; then + printf "%b" " ${IRED}CHROOT ${IGRN}already prepared\n${RST}" +else printf "%b" "${GRN}Changing ownership to root...${RST}\n" { - chown -Rv root:root "${LFS}"/bin - chown -Rv root:root "${LFS}"/etc - chown -Rv root:root "${LFS}"/lib - chown -Rv root:root "${LFS}"/sbin - chown -Rv root:root "${LFS}"/tools - chown -Rv root:root "${LFS}"/usr - chown -Rv root:root "${LFS}"/var + sudo chown -v root:root "${LFS}" + sudo chown -Rv root:root "${LFS}"/bin + sudo chown -Rv root:root "${LFS}"/etc + sudo chown -Rv root:root "${LFS}"/lib + sudo chown -Rv root:root "${LFS}"/sbin + sudo chown -Rv root:root "${LFS}"/tools + sudo chown -Rv root:root "${LFS}"/usr + sudo chown -Rv root:root "${LFS}"/var case $(uname -m) in - x86_64) chown -Rv root:root "${LFS}"/lib64 ;; + x86_64) sudo chown -Rv root:root "${LFS}"/lib64 ;; esac -} >"${LFS}"/sources/log/preparechroot.log 2>&1 + } >"${LFS}"/sources/log/preparechroot.log 2>&1 printf "%b" "${GRN}Creating virtual kernel filesystem mountpoints...${RST}\n" { - mkdir -pv "${LFS}"/dev - mkdir -pv "${LFS}"/proc - mkdir -pv "${LFS}"/run - mkdir -pv "${LFS}"/sys -} >>"${LFS}"/sources/log/preparechroot.log 2>&1 + sudo mkdir -pv "${LFS}"/dev + sudo mkdir -pv "${LFS}"/proc + sudo mkdir -pv "${LFS}"/run + sudo mkdir -pv "${LFS}"/sys + } >>"${LFS}"/sources/log/preparechroot.log 2>&1 printf "%b" "${GRN}Creating initial device nodes...${RST}\n" { - mknod -m 600 "${LFS}"/dev/console c 5 1 - mknod -m 666 "${LFS}"/dev/null c 1 3 -} >>"${LFS}"/sources/log/preparechroot.log 2>&1 + sudo mknod -m 600 "${LFS}"/dev/console c 5 1 + sudo mknod -m 666 "${LFS}"/dev/null c 1 3 + } >>"${LFS}"/sources/log/preparechroot.log 2>&1 source mountvirtfs.sh touch chrootprepared - -else - printf "%b" "${RED}preparechroot.sh must be ran as ${YLW}root${RED} user!${RST}\n" fi -- cgit v1.2.3-54-g00ecf From 6fe7cbce4bdf80bc357fa5501aa69590772cfc57 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 8 Apr 2021 14:15:59 -0500 Subject: Source preparechroot instead of sudo. If limited directory structure is created, then put a conditional around it if limited has already been done and if not, then touch a file. This keeps /mnt/lfs/tools from cropping up after cleanup stage for chapter 8 and this script is reran. --- lfs.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lfs.sh b/lfs.sh index 4d13d2a..9291767 100755 --- a/lfs.sh +++ b/lfs.sh @@ -70,14 +70,17 @@ to user ${IWHT}${USER}${RST}\n" fi # Create limited directory layout -mkdir -p "${LFS}"/sources -mkdir -p "${LFS}"/tools -mkdir -p "${LFS}"/bin -mkdir -p "${LFS}"/etc -mkdir -p "${LFS}"/lib -mkdir -p "${LFS}"/sbin -mkdir -p "${LFS}"/usr -mkdir -p "${LFS}"/var +if [[ ! -f "${LFS}"/sources/limited ]]; then + mkdir -p "${LFS}"/sources + mkdir -p "${LFS}"/tools + mkdir -p "${LFS}"/bin + mkdir -p "${LFS}"/etc + mkdir -p "${LFS}"/lib + mkdir -p "${LFS}"/sbin + mkdir -p "${LFS}"/usr + mkdir -p "${LFS}"/var + touch "${LFS}"/sources/limited +fi case $(uname -m) in x86_64) mkdir -p "${LFS}"/lib64 ;; @@ -142,7 +145,7 @@ chmod ugo+x preparechroot.sh chmod ugo+x insidechroot.sh printf "%b" "\n${CYN}PREPARING ${RED}CHROOT${CYN} ENVIRONMENT${RST}...\n" -sudo ./preparechroot.sh "${LFS}" +source preparechroot.sh "${LFS}" source createdirs.sh source essential.sh -- cgit v1.2.3-54-g00ecf From dd8ac86ccddee8f91a47fe332991105be8d3bf8e Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 8 Apr 2021 18:49:04 -0500 Subject: Add shellcheck parsing directives. --- chapter8/backup.sh | 2 ++ chapter8/bash.sh | 1 + chapter8/bzip2.sh | 1 + chapter8/cleanup.sh | 8 ++++++-- chapter8/findutils.sh | 1 + chapter8/glibc.sh | 1 + chapter8/ninja.sh | 1 + chapter8/shadow.sh | 2 ++ 8 files changed, 15 insertions(+), 2 deletions(-) diff --git a/chapter8/backup.sh b/chapter8/backup.sh index 57b356d..8d750c5 100644 --- a/chapter8/backup.sh +++ b/chapter8/backup.sh @@ -9,6 +9,7 @@ else printf "%b" "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${file}${RST}... " pushd "${LFS}" > /dev/null || exit 1 + # shellcheck disable=SC2024 sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJvpf "${HOME}"/"${file}" "${directories[@]}" >"${LFS}"/sources/log/chapter8/backup.log 2>&1 & pid=$! spinner "$pid" "${SPINNER}" retval=$? @@ -16,6 +17,7 @@ else printf "%b" "${IRED}FAILED!${RST}\n" exit "${retval}" else + # shellcheck disable=SC2024 sudo chown -v "${USER}":"$(id -g)" "${HOME}"/"${file}" >"${LFS}"/sources/log/chapter8/backup.log 2>&1 printf "%b" "${IGRN}OK${RST}\n" fi diff --git a/chapter8/bash.sh b/chapter8/bash.sh index 65eb2d8..b4ca0c2 100644 --- a/chapter8/bash.sh +++ b/chapter8/bash.sh @@ -2,6 +2,7 @@ patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch +# shellcheck disable=SC2016 sed -i '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in ./configure --prefix=/usr \ diff --git a/chapter8/bzip2.sh b/chapter8/bzip2.sh index b1b4459..81b111e 100644 --- a/chapter8/bzip2.sh +++ b/chapter8/bzip2.sh @@ -2,6 +2,7 @@ patch -Np1 -i ../bzip2-"${VERSION}"-install_docs-1.patch +# shellcheck disable=SC2016 sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile diff --git a/chapter8/cleanup.sh b/chapter8/cleanup.sh index 46c152d..ed62e18 100644 --- a/chapter8/cleanup.sh +++ b/chapter8/cleanup.sh @@ -26,7 +26,7 @@ else # Place debugging symbols for selected libraries in seprate files save_lib="ld-2.33.so libc-2.33.so libpthread-2.33.so libthread_db-1.0.so" - cd "${LFS}"/lib || exit 1 + pushd "${LFS}"/lib || exit 1 for LIB in $save_lib; do sudo objcopy --only-keep-debug "${LIB}" "${LIB}".dbg @@ -34,9 +34,11 @@ else sudo objcopy --add-gnu-debuglink="${LIB}".dbg "${LIB}" done + popd || exit 1 + save_usrlib="libquadmath.so.0.0.0 libstdc++.so.6.0.28 libitm.so.1.0.0 libatomic.so.1.2.0" - cd "${LFS}"/usr/lib || exit 1 + pushd "${LFS}"/usr/lib || exit 1 for LIB in $save_usrlib; do sudo objcopy --only-keep-debug "${LIB}" "${LIB}".dbg @@ -44,6 +46,8 @@ else sudo objcopy --add-gnu-debuglink="${LIB}".dbg "${LIB}" done + popd || exit 1 + sudo find "${LFS}"/usr/lib -type f -name \*.a -exec strip --strip-debug {} ';' sudo find "${LFS}"/lib -type f -name \*.so* ! -name \*dbg -exec strip --strip-unneeded {} ';' sudo find "${LFS}"/usr/lib -type f -name \*.so* ! -name \*dbg -exec strip --strip-unneeded {} ';' diff --git a/chapter8/findutils.sh b/chapter8/findutils.sh index b058eea..8203619 100644 --- a/chapter8/findutils.sh +++ b/chapter8/findutils.sh @@ -7,4 +7,5 @@ make make -j1 install mv -v /usr/bin/find /bin +# shellcheck disable=SC2016 sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb diff --git a/chapter8/glibc.sh b/chapter8/glibc.sh index 21289b1..6f6289c 100644 --- a/chapter8/glibc.sh +++ b/chapter8/glibc.sh @@ -19,6 +19,7 @@ make PARALLELMFLAGS="${MAKEFLAGS}" touch /etc/ld.so.conf +# shellcheck disable=SC2016 sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile make -j1 install diff --git a/chapter8/ninja.sh b/chapter8/ninja.sh index 3f93e56..744dffc 100644 --- a/chapter8/ninja.sh +++ b/chapter8/ninja.sh @@ -2,6 +2,7 @@ export NINJAJOBS=4 +# shellcheck disable=SC1004 sed -i '/int Guess/a \ int j = 0;\ char* jobs = getenv( "NINJAJOBS" );\ diff --git a/chapter8/shadow.sh b/chapter8/shadow.sh index f0254de..3e2bdd5 100644 --- a/chapter8/shadow.sh +++ b/chapter8/shadow.sh @@ -1,7 +1,9 @@ #!/bin/bash +# shellcheck disable=SC2016 ROOTPW='$1$5RPAAd$oejpw8ErihLIB7vmGE4SV1' +# shellcheck disable=SC2016 sed -i 's/groups$(EXEEXT) //' src/Makefile.in find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \; -- cgit v1.2.3-54-g00ecf From e7a38788125880c6817ea63f300c0575d456cdbc Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 8 Apr 2021 18:50:28 -0500 Subject: Add shellcheck directives. --- lfs.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lfs.sh b/lfs.sh index 9291767..dc83800 100755 --- a/lfs.sh +++ b/lfs.sh @@ -175,7 +175,9 @@ if [[ "$retval" -eq 0 ]]; then printf "%b" "\n${IWHT}======= ${IYLW}Chapter 7 ${IGRN}Cleanup and Backup \ ${IWHT}=======${RST}\n" + # shellcheck source=chapter7/cleanup.sh source "${LFS}"/sources/chapter7/cleanup.sh + # shellcheck source=chapter7/backup.sh source "${LFS}"/sources/chapter7/backup.sh else exit "$retval" @@ -210,7 +212,9 @@ if [[ "$retval" -eq 0 ]]; then printf "%b" "\n${IWHT}======= ${IYLW}Chapter 8 ${IGRN}Cleanup and Backup \ ${IWHT}=======${RST}\n" + # shellcheck source=chapter8/cleanup.sh source "${LFS}"/sources/chapter8/cleanup.sh + # shellcheck source=chapter8/backup.sh source "${LFS}"/sources/chapter8/backup.sh else exit "$retval" -- cgit v1.2.3-54-g00ecf From 9da9daf92dd8abf6793276d0e0d8b347948914e5 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 8 Apr 2021 18:50:46 -0500 Subject: Add shellcheck directives. --- chapter5/glibc.sh | 2 +- chapter6/backup.sh | 2 ++ chapter7/backup.sh | 2 ++ insidechroot.sh | 2 ++ packageinstall.sh | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/chapter5/glibc.sh b/chapter5/glibc.sh index 8997613..edab0d3 100644 --- a/chapter5/glibc.sh +++ b/chapter5/glibc.sh @@ -30,4 +30,4 @@ readelf -l a.out | grep '/ld-linux' && rm -v dummy.c a.out && -"${LFS}"/tools/libexec/gcc/"${LFS_TGT}"/10.2.0/install-tools/mkheaders +"${LFS}"/tools/libexec/gcc/"${LFS_TGT}"/10.3.0/install-tools/mkheaders diff --git a/chapter6/backup.sh b/chapter6/backup.sh index a27440b..43e8b18 100644 --- a/chapter6/backup.sh +++ b/chapter6/backup.sh @@ -9,6 +9,7 @@ else printf "%b" "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${file}${RST}... " pushd "${LFS}" > /dev/null || exit 1 + # shellcheck disable=SC2024 sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJvpf "${HOME}"/"${file}" "${directories[@]}" >/"${LFS}"/sources/log/chapter6/backup.log 2>&1 & pid=$! spinner "$pid" "${SPINNER}" retval=$? @@ -16,6 +17,7 @@ else printf "%b" "${IRED}FAILED!${RST}\n" exit "${retval}" else + # shellcheck disable=SC2024 sudo chown -v "${USER}":"$(id -g)" "${HOME}"/"${file}" >>"${LFS}"/sources/log/chapter6/backup.log printf "%b" "${IGRN}OK${RST}\n" fi diff --git a/chapter7/backup.sh b/chapter7/backup.sh index 7cfb29f..38d626f 100644 --- a/chapter7/backup.sh +++ b/chapter7/backup.sh @@ -9,6 +9,7 @@ else printf "%b" "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${file}${RST}... " pushd "${LFS}" > /dev/null || exit 1 + # shellcheck disable=SC2024 sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJvpf "${HOME}"/"${file}" "${directories[@]}" >"${LFS}"/sources/log/chapter7/backup.log 2>&1 & pid=$! spinner "$pid" "${SPINNER}" retval=$? @@ -16,6 +17,7 @@ else printf "%b" "${IRED}FAILED!${RST}\n" exit "${retval}" else + # shellcheck disable=SC2024 sudo chown -v "${USER}":"$(id -g)" "${HOME}"/"${file}" >"${LFS}"/sources/log/chapter7/backup.log 2>&1 printf "%b" "${IGRN}OK${RST}\n" fi diff --git a/insidechroot.sh b/insidechroot.sh index b78a4a2..08eada0 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -2,7 +2,9 @@ CHAPTER="$1" +# shellcheck source=colors.sh source /sources/colors.sh +# shellcheck source=functions.sh source /sources/functions.sh printf "%b" "${CYN}SUCCESSFULLY ENTERED ${RED}CHROOT${RST}!\n" diff --git a/packageinstall.sh b/packageinstall.sh index df09148..706880c 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -37,6 +37,7 @@ else printf "%b" " ${CYN}Compiling ${YLW}${PACKAGE}${RST}... " mkdir -p "${LFS}/sources/log/chapter${CHAPTER}/" + # shellcheck source=/dev/null source "${LFS}/sources/chapter${CHAPTER}/${PACKAGE}.sh" 2>&1 > "${LFS}/sources/log/chapter${CHAPTER}/${PACKAGE}.log" 2>&1 & pid=$! spinner "$pid" "${SPINNER}" retval=$? -- cgit v1.2.3-54-g00ecf From 2c18321fa66000365979e6ca78eb065b5b8d1391 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 8 Apr 2021 18:52:36 -0500 Subject: Upgrade GCC to 10.3.0. --- packages.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.csv b/packages.csv index 6576b5c..e91bb0f 100644 --- a/packages.csv +++ b/packages.csv @@ -20,7 +20,7 @@ file,5.40,http://ftp.astron.com/pub/file/file-@.tar.gz,72540ea1cc8c6e1dee35d6100 findutils,4.8.0,http://ftp.gnu.org/gnu/findutils/findutils-@.tar.xz,eeefe2e6380931a77dfa6d9350b43186 flex,2.6.4,https://github.com/westes/flex/releases/download/v@/flex-@.tar.gz,2882e3179748cc9f9c23ec593d6adc8d gawk,5.1.0,http://ftp.gnu.org/gnu/gawk/gawk-@.tar.xz,8470c34eeecc41c1aa0c5d89e630df50 -gcc,10.2.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,e9fd9b1789155ad09bcf3ae747596b50 +gcc,10.3.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,443c15b92614a3ce8f22e3b24ca2226a gdbm,1.19,http://ftp.gnu.org/gnu/gdbm/gdbm-@.tar.gz,aeb29c6a90350a4c959cd1df38cd0a7e gettext,0.21,http://ftp.gnu.org/gnu/gettext/gettext-@.tar.xz,40996bbaf7d1356d3c22e33a8b255b31 glibc,2.33,http://ftp.gnu.org/gnu/glibc/glibc-@.tar.xz,390bbd889c7e8e8a7041564cb6b27cca @@ -42,7 +42,7 @@ lfs-bootscripts,20210201,http://www.linuxfromscratch.org/lfs/downloads/10.1/lfs- libcap,2.49,https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-@.tar.xz,b43ae3690fe4d2cb32e4d25c0983ecd3 libffi,3.3,https://sourceware.org/pub/libffi/libffi-@.tar.gz,6313289e32f1d38a9df4770b014a2ca7 libpipeline,1.5.3,http://download.savannah.gnu.org/releases/libpipeline/libpipeline-@.tar.gz,dad443d0911cf9f0f1bd90a334bc9004 -libstdc++,10.2.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,e9fd9b1789155ad09bcf3ae747596b50 +libstdc++,10.3.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,443c15b92614a3ce8f22e3b24ca2226a libtool,2.4.6,http://ftp.gnu.org/gnu/libtool/libtool-@.tar.xz,1bfb9b923f2c1339b4d2ce1807064aa5 linux,5.10.28,https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,e537f7035e3ae63ea494c83015af1447 linux-api-headers,5.10.28,cdn://www.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,e537f7035e3ae63ea494c83015af1447 -- cgit v1.2.3-54-g00ecf From c264bc9d91ad9d19cfd6a511bb26236cbef6987d Mon Sep 17 00:00:00 2001 From: William Harrington Date: Sat, 10 Apr 2021 14:49:13 -0500 Subject: Fix link creation for /run and /run lock. Was causing issues when botting because /run ended up being an inifnite loop. --- createdirs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/createdirs.sh b/createdirs.sh index a1092f4..0e6995d 100644 --- a/createdirs.sh +++ b/createdirs.sh @@ -73,8 +73,8 @@ else { sudo mkdir -pv var/lib/misc sudo mkdir -pv var/lib/locate - sudo ln -sfv run var/run - sudo ln -sfv run/lock var/lock + sudo ln -sfv run /var/run + sudo ln -sfv run/lock /var/lock sudo install -v -d -m 0750 root sudo install -v -d -m 1777 tmp -- cgit v1.2.3-54-g00ecf From e27b31bf8f9009309403d86c09610e498abcbe74 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 08:50:32 -0500 Subject: Don't remove doc, info and man during cleanup. --- chapter8/cleanup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chapter8/cleanup.sh b/chapter8/cleanup.sh index ed62e18..8d78f03 100644 --- a/chapter8/cleanup.sh +++ b/chapter8/cleanup.sh @@ -20,9 +20,9 @@ else sudo sed '/tester/d' -i "${LFS}"/etc/passwd sudo rm -rfv "${LFS}"/home/tester - sudo rm -rfv "${LFS}"/usr/share/doc - sudo rm -rfv "${LFS}"/usr/share/info - sudo rm -rfv "${LFS}"/usr/share/man + #sudo rm -rfv "${LFS}"/usr/share/doc + #sudo rm -rfv "${LFS}"/usr/share/info + #sudo rm -rfv "${LFS}"/usr/share/man # Place debugging symbols for selected libraries in seprate files save_lib="ld-2.33.so libc-2.33.so libpthread-2.33.so libthread_db-1.0.so" -- cgit v1.2.3-54-g00ecf -- cgit v1.2.3-54-g00ecf From 0c89bb8a41a00f06cc29687ca308eb3c7160ce13 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 09:10:17 -0500 Subject: Upgrade kernel to 5.10.29. --- packages.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.csv b/packages.csv index e91bb0f..f50e3b7 100644 --- a/packages.csv +++ b/packages.csv @@ -44,8 +44,8 @@ libffi,3.3,https://sourceware.org/pub/libffi/libffi-@.tar.gz,6313289e32f1d38a9df libpipeline,1.5.3,http://download.savannah.gnu.org/releases/libpipeline/libpipeline-@.tar.gz,dad443d0911cf9f0f1bd90a334bc9004 libstdc++,10.3.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,443c15b92614a3ce8f22e3b24ca2226a libtool,2.4.6,http://ftp.gnu.org/gnu/libtool/libtool-@.tar.xz,1bfb9b923f2c1339b4d2ce1807064aa5 -linux,5.10.28,https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,e537f7035e3ae63ea494c83015af1447 -linux-api-headers,5.10.28,cdn://www.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,e537f7035e3ae63ea494c83015af1447 +linux,5.10.29,https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,63f0246acd0b35983190d1206640fab0 +linux-api-headers,5.10.29,cdn://www.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,63f0246acd0b35983190d1206640fab0 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 -- cgit v1.2.3-54-g00ecf From 13c6afd35cab1e3f4d96857d549e02cfd1e23acd Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 12 Apr 2021 10:56:09 -0500 Subject: Really fix the run and run lock creation. --- createdirs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/createdirs.sh b/createdirs.sh index 0e6995d..ad95ab5 100644 --- a/createdirs.sh +++ b/createdirs.sh @@ -72,9 +72,9 @@ else { sudo mkdir -pv var/lib/color sudo mkdir -pv var/lib/misc sudo mkdir -pv var/lib/locate - - sudo ln -sfv run /var/run - sudo ln -sfv run/lock /var/lock + + sudo ln -sfv ../run var/run + sudo ln -sfv ../run/lock var/lock sudo install -v -d -m 0750 root sudo install -v -d -m 1777 tmp -- cgit v1.2.3-54-g00ecf