From 2c8204d6325a1a6607392d5905227b9043da17cc Mon Sep 17 00:00:00 2001 From: William Harrington Date: Sat, 11 Dec 2021 00:52:08 -0600 Subject: Major updates. --- chapter6/backup.sh | 56 ++++++++++++++++++------------------ chapter6/bash.sh | 24 ++++++++-------- chapter6/binutils.sh | 34 +++++++++++----------- chapter6/cleanup.sh | 54 +++++++++++++++++----------------- chapter6/coreutils.sh | 36 +++++++++++------------ chapter6/diffutils.sh | 16 +++++------ chapter6/file.sh | 42 +++++++++++++-------------- chapter6/findutils.sh | 26 ++++++++--------- chapter6/gawk.sh | 18 ++++++------ chapter6/gcc.sh | 80 +++++++++++++++++++++++++-------------------------- chapter6/grep.sh | 16 +++++------ chapter6/gzip.sh | 16 +++++------ chapter6/m4.sh | 30 +++++++++---------- chapter6/make.sh | 18 ++++++------ chapter6/ncurses.sh | 54 +++++++++++++++++----------------- chapter6/patch.sh | 16 +++++------ chapter6/sed.sh | 16 +++++------ chapter6/tar.sh | 18 ++++++------ chapter6/xz.sh | 26 ++++++++--------- 19 files changed, 298 insertions(+), 298 deletions(-) (limited to 'chapter6') diff --git a/chapter6/backup.sh b/chapter6/backup.sh index f9a761c..f93f37d 100644 --- a/chapter6/backup.sh +++ b/chapter6/backup.sh @@ -1,28 +1,28 @@ -#!/bin/bash -set -e - -file="${LFS_VER}-ch6-backup.tar.xz" -directories=(bin etc lib lib64 sbin tools usr var) - -if [ -f "${LFS}/sources/chapter6/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 - # 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=$? - if [ "$retval" -ne 0 ]; then - fail "FAILED!" - exit "${retval}" - else - # shellcheck disable=SC2024 - sudo chown -v "${USER}":"$(id -g)" "${HOME}"/"${file}" >>"${LFS}"/sources/log/chapter6/backup.log - success "OK" - fi - popd > /dev/null || exit 1 - - touch "${LFS}"/sources/chapter6/backup -fi +#!/bin/bash +set -e + +file="${LFS_VER}-ch6-backup.tar.xz" +directories=(bin etc lib lib64 sbin tools usr var) + +if [ -f "${LFS}/sources/chapter6/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 + # 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=$? + if [ "$retval" -ne 0 ]; then + fail "FAILED!" + exit "${retval}" + else + # shellcheck disable=SC2024 + sudo chown -v "${USER}":"$(id -g)" "${HOME}"/"${file}" >>"${LFS}"/sources/log/chapter6/backup.log + success "OK" + fi + popd > /dev/null || exit 1 + + touch "${LFS}"/sources/chapter6/backup +fi diff --git a/chapter6/bash.sh b/chapter6/bash.sh index 9251a89..1c53aad 100644 --- a/chapter6/bash.sh +++ b/chapter6/bash.sh @@ -1,12 +1,12 @@ -#!/bin/bash -set -e - -patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && -./configure --prefix=/usr \ - --build="$(support/config.guess)" \ - --host="${LFS_TGT}" \ - --without-bash-malloc && -make && -make DESTDIR="${LFS}" -j1 install && -mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash && -ln -sv bash "${LFS}"/bin/sh +#!/bin/bash +set -e + +patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && +./configure --prefix=/usr \ + --build="$(support/config.guess)" \ + --host="${LFS_TGT}" \ + --without-bash-malloc && +make && +make DESTDIR="${LFS}" -j1 install && +mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash && +ln -sv bash "${LFS}"/bin/sh diff --git a/chapter6/binutils.sh b/chapter6/binutils.sh index 3e4af1d..e896208 100644 --- a/chapter6/binutils.sh +++ b/chapter6/binutils.sh @@ -1,17 +1,17 @@ -#!/bin/bash -set -e - -mkdir -v build -cd build || exit 1 - -../configure \ - --prefix=/usr \ - --build="$(../config.guess)" \ - --host="${LFS_TGT}" \ - --disable-nls \ - --enable-shared \ - --disable-werror \ - --enable-64-bit-bfd && -make && -make DESTDIR="${LFS}" -j1 install && -install -vm755 libctf/.libs/libctf.so.0.0.0 "${LFS}"/usr/lib +#!/bin/bash +set -e + +mkdir -v build +cd build || exit 1 + +../configure \ + --prefix=/usr \ + --build="$(../config.guess)" \ + --host="${LFS_TGT}" \ + --disable-nls \ + --enable-shared \ + --disable-werror \ + --enable-64-bit-bfd && +make && +make DESTDIR="${LFS}" -j1 install && +install -vm755 libctf/.libs/libctf.so.0.0.0 "${LFS}"/usr/lib diff --git a/chapter6/cleanup.sh b/chapter6/cleanup.sh index 2266d06..5c56319 100644 --- a/chapter6/cleanup.sh +++ b/chapter6/cleanup.sh @@ -1,27 +1,27 @@ -#!/bin/bash -set -e - -if [ -f "${LFS}/sources/chapter6/cleanup" ]; then - printf "%b" " ${IGRN}Cleanup already performed${RST}\n" -else - - printf "%b" "${GRN}Cleaning up ${YLW}${LFS}${RST}... " - - { - find "${LFS}"/usr/lib -name \*.la -delete - find "${LFS}"/usr/libexec -name \*.la -delete - - rm -rfv "${LFS}"/usr/share/doc - rm -rfv "${LFS}"/usr/share/info - rm -rfv "${LFS}"/usr/share/man - - strip --strip-debug "${LFS}"/usr/lib/* || true - strip --strip-unneeded "${LFS}"/usr/bin/* || true - strip --strip-unneeded "${LFS}"/usr/sbin/* || true - strip --strip-unneeded "${LFS}"/tools/bin/* || true - -} >"${LFS}"/sources/log/chapter6/cleanup.log 2>&1 - - success "OK" - touch "${LFS}"/sources/chapter6/cleanup -fi +#!/bin/bash +set -e + +if [ -f "${LFS}/sources/chapter6/cleanup" ]; then + printf "%b" " ${IGRN}Cleanup already performed${RST}\n" +else + + printf "%b" "${GRN}Cleaning up ${YLW}${LFS}${RST}... " + + { + find "${LFS}"/usr/lib -name \*.la -delete + find "${LFS}"/usr/libexec -name \*.la -delete + + rm -rfv "${LFS}"/usr/share/doc + rm -rfv "${LFS}"/usr/share/info + rm -rfv "${LFS}"/usr/share/man + + strip --strip-debug "${LFS}"/usr/lib/* || true + strip --strip-unneeded "${LFS}"/usr/bin/* || true + strip --strip-unneeded "${LFS}"/usr/sbin/* || true + strip --strip-unneeded "${LFS}"/tools/bin/* || true + +} >"${LFS}"/sources/log/chapter6/cleanup.log 2>&1 + + success "OK" + touch "${LFS}"/sources/chapter6/cleanup +fi diff --git a/chapter6/coreutils.sh b/chapter6/coreutils.sh index 5231b45..a455395 100644 --- a/chapter6/coreutils.sh +++ b/chapter6/coreutils.sh @@ -1,18 +1,18 @@ -#!/bin/bash -set -e - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(build-aux/config.guess)" \ - --enable-install-program=hostname \ - --enable-no-install-program=kill,uptime && -make && -make DESTDIR="${LFS}" -j1 install && -mv -v "${LFS}"/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} "${LFS}"/bin && -mv -v "${LFS}"/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} "${LFS}"/bin && -mv -v "${LFS}"/usr/bin/{rmdir,stty,sync,true,uname} "${LFS}"/bin && -mv -v "${LFS}"/usr/bin/{head,nice,sleep,touch} "${LFS}"/bin && -mv -v "${LFS}"/usr/bin/chroot "${LFS}"/usr/sbin && -mkdir -pv "${LFS}"/usr/share/man/man8 && -mv -v "${LFS}"/usr/share/man/man1/chroot.1 "${LFS}"/usr/share/man/man8/chroot.8 && -sed -i 's/"1"/"8"/' "${LFS}"/usr/share/man/man8/chroot.8 +#!/bin/bash +set -e + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" \ + --enable-install-program=hostname \ + --enable-no-install-program=kill,uptime && +make && +make DESTDIR="${LFS}" -j1 install && +mv -v "${LFS}"/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} "${LFS}"/bin && +mv -v "${LFS}"/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} "${LFS}"/bin && +mv -v "${LFS}"/usr/bin/{rmdir,stty,sync,true,uname} "${LFS}"/bin && +mv -v "${LFS}"/usr/bin/{head,nice,sleep,touch} "${LFS}"/bin && +mv -v "${LFS}"/usr/bin/chroot "${LFS}"/usr/sbin && +mkdir -pv "${LFS}"/usr/share/man/man8 && +mv -v "${LFS}"/usr/share/man/man1/chroot.1 "${LFS}"/usr/share/man/man8/chroot.8 && +sed -i 's/"1"/"8"/' "${LFS}"/usr/share/man/man8/chroot.8 diff --git a/chapter6/diffutils.sh b/chapter6/diffutils.sh index 580d795..d4fe4a9 100644 --- a/chapter6/diffutils.sh +++ b/chapter6/diffutils.sh @@ -1,8 +1,8 @@ -#!/bin/bash -set -e - -sed 's/help2man -i/help2man --no-discard-stderr -i /' -i man/Makefile.in -HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr \ - --host="${LFS_TGT}" && -make && -make DESTDIR="${LFS}" -j1 install +#!/bin/bash +set -e + +sed 's/help2man -i/help2man --no-discard-stderr -i /' -i man/Makefile.in +HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr \ + --host="${LFS_TGT}" && +make && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/file.sh b/chapter6/file.sh index f73bc18..065bf6d 100644 --- a/chapter6/file.sh +++ b/chapter6/file.sh @@ -1,21 +1,21 @@ -#!/bin/bash -set -e - -mkdir build -pushd build > /dev/null || exit 1 - -../configure --disable-bzlib \ - --disable-libseccomp \ - --disable-xzlib \ - --disable-zlib && -make && -popd > /dev/null || exit 1 - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(./config.guess)" && -make FILE_COMPILE="$(pwd)"/build/src/file && -make DESTDIR="${LFS}" -j1 install && - -mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib && -ln -sfv ../../lib/"$(readlink /usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so +#!/bin/bash +set -e + +mkdir build +pushd build > /dev/null || exit 1 + +../configure --disable-bzlib \ + --disable-libseccomp \ + --disable-xzlib \ + --disable-zlib && +make && +popd > /dev/null || exit 1 + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(./config.guess)" && +make FILE_COMPILE="$(pwd)"/build/src/file && +make DESTDIR="${LFS}" -j1 install && + +mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib && +ln -sfv ../../lib/"$(readlink /usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so diff --git a/chapter6/findutils.sh b/chapter6/findutils.sh index 5617c10..7427760 100644 --- a/chapter6/findutils.sh +++ b/chapter6/findutils.sh @@ -1,13 +1,13 @@ -#!/bin/bash -set -e - -# shellcheck disable=SC2016 -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(build-aux/config.guess)" && - -make && -make DESTDIR="${LFS}" -j1 install && - -mv -v "${LFS}"/usr/bin/find "${LFS}"/bin && -sed -i 's|find:=${BINDIR}|find:=/bin|' "${LFS}"/usr/bin/updatedb +#!/bin/bash +set -e + +# shellcheck disable=SC2016 +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" && + +make && +make DESTDIR="${LFS}" -j1 install && + +mv -v "${LFS}"/usr/bin/find "${LFS}"/bin && +sed -i 's|find:=${BINDIR}|find:=/bin|' "${LFS}"/usr/bin/updatedb diff --git a/chapter6/gawk.sh b/chapter6/gawk.sh index 1d18cdc..ef1a98f 100644 --- a/chapter6/gawk.sh +++ b/chapter6/gawk.sh @@ -1,9 +1,9 @@ -#!/bin/bash -set -e - -sed -i 's/extras//' Makefile.in && -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(./config.guess)" && -make && -make DESTDIR="${LFS}" -j1 install +#!/bin/bash +set -e + +sed -i 's/extras//' Makefile.in && +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(./config.guess)" && +make && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/gcc.sh b/chapter6/gcc.sh index 020649e..b84ba90 100644 --- a/chapter6/gcc.sh +++ b/chapter6/gcc.sh @@ -1,40 +1,40 @@ -#!/bin/bash -set -e - -mkdir -p isl mpfr gmp mpc -tar -xf ../isl-*.tar.xz -C isl --strip-components=1 && -tar -xf ../mpfr-*.tar.xz -C mpfr --strip-components=1 && -tar -xf ../gmp-*.tar.xz -C gmp --strip-components=1 && -tar -xf ../mpc-*.tar.gz -C mpc --strip-components=1 && - -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 - -mkdir -pv "${LFS_TGT}"/libgcc && -ln -s ../../../libgcc/gthr-posix.h "${LFS_TGT}"/libgcc/gthr-default.h && -../configure \ - --build="$(../config.guess)" \ - --host="${LFS_TGT}" \ - --prefix=/usr \ - CC_FOR_TARGET="${LFS_TGT}"-gcc \ - --with-build-sysroot="${LFS}" \ - --enable-initfini-array \ - --disable-nls \ - --disable-multilib \ - --disable-decimal-float \ - --disable-libatomic \ - --disable-libgomp \ - --disable-libquadmath \ - --disable-libssp \ - --disable-libvtv \ - --disable-libstdcxx \ - --enable-languages=c,c++ && -make && -make DESTDIR="${LFS}" -j1 install && -ln -sv gcc "${LFS}"/usr/bin/cc +#!/bin/bash +set -e + +mkdir -p isl mpfr gmp mpc +tar -xf ../isl-*.tar.xz -C isl --strip-components=1 && +tar -xf ../mpfr-*.tar.xz -C mpfr --strip-components=1 && +tar -xf ../gmp-*.tar.xz -C gmp --strip-components=1 && +tar -xf ../mpc-*.tar.gz -C mpc --strip-components=1 && + +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 + +mkdir -pv "${LFS_TGT}"/libgcc && +ln -s ../../../libgcc/gthr-posix.h "${LFS_TGT}"/libgcc/gthr-default.h && +../configure \ + --build="$(../config.guess)" \ + --host="${LFS_TGT}" \ + --prefix=/usr \ + CC_FOR_TARGET="${LFS_TGT}"-gcc \ + --with-build-sysroot="${LFS}" \ + --enable-initfini-array \ + --disable-nls \ + --disable-multilib \ + --disable-decimal-float \ + --disable-libatomic \ + --disable-libgomp \ + --disable-libquadmath \ + --disable-libssp \ + --disable-libvtv \ + --disable-libstdcxx \ + --enable-languages=c,c++ && +make && +make DESTDIR="${LFS}" -j1 install && +ln -sv gcc "${LFS}"/usr/bin/cc diff --git a/chapter6/grep.sh b/chapter6/grep.sh index 7aaa38a..b908225 100644 --- a/chapter6/grep.sh +++ b/chapter6/grep.sh @@ -1,8 +1,8 @@ -#!/bin/bash -set -e - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --bindir=/bin && -make && -make DESTDIR="${LFS}" -j1 install +#!/bin/bash +set -e + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --bindir=/bin && +make && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/gzip.sh b/chapter6/gzip.sh index e3ce2e9..339b853 100644 --- a/chapter6/gzip.sh +++ b/chapter6/gzip.sh @@ -1,8 +1,8 @@ -#!/bin/bash -set -e - -./configure --prefix=/usr \ - --host="${LFS_TGT}" && -make && -make DESTDIR="${LFS}" -j1 install && -mv -v "${LFS}"/usr/bin/gzip "${LFS}"/bin +#!/bin/bash +set -e + +./configure --prefix=/usr \ + --host="${LFS_TGT}" && +make && +make DESTDIR="${LFS}" -j1 install && +mv -v "${LFS}"/usr/bin/gzip "${LFS}"/bin diff --git a/chapter6/m4.sh b/chapter6/m4.sh index aeb1024..05855ab 100644 --- a/chapter6/m4.sh +++ b/chapter6/m4.sh @@ -1,15 +1,15 @@ -#!/bin/bash -set -e - -sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c && -echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h && - -export CFLAGS="-Wabi=11 -fpermissive" - -sed '/^HELP2MAN/s/$/ --no-discard-stderr/' -i doc/Makefile.in - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(build-aux/config.guess)" && -make && -make DESTDIR="${LFS}" -j1 install +#!/bin/bash +set -e + +sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c && +echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h && + +export CFLAGS="-Wabi=11 -fpermissive" + +sed '/^HELP2MAN/s/$/ --no-discard-stderr/' -i doc/Makefile.in + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" && +make && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/make.sh b/chapter6/make.sh index 0b2ace4..e6297ff 100644 --- a/chapter6/make.sh +++ b/chapter6/make.sh @@ -1,9 +1,9 @@ -#!/bin/bash -set -e - -./configure --prefix=/usr \ - --without-guile \ - --host="${LFS_TGT}" \ - --build="$(build-aux/config.guess)" && -make && -make DESTDIR="${LFS}" -j1 install +#!/bin/bash +set -e + +./configure --prefix=/usr \ + --without-guile \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" && +make && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/ncurses.sh b/chapter6/ncurses.sh index 1bf8824..a63a617 100644 --- a/chapter6/ncurses.sh +++ b/chapter6/ncurses.sh @@ -1,27 +1,27 @@ -#!/bin/bash -set -e - -sed -i s/mawk// configure && - -mkdir build -pushd build > /dev/null || exit 1 - ../configure && - make -C include && - make -C progs tic && -popd > /dev/null || exit 1 - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(./config.guess)" \ - --mandir=/usr/share/man \ - --with-manpage-format=normal \ - --with-shared \ - --without-debug \ - --without-ada \ - --without-normal \ - --enable-widec && -make && -make DESTDIR="${LFS}" TIC_PATH="$(pwd)"/build/progs/tic -j1 install && -echo "INPUT(-lncursesw)" > "${LFS}"/usr/lib/libncurses.so && -mv -v "${LFS}"/usr/lib/libncursesw.so.6* "${LFS}"/lib && -ln -sfv ../../lib/"$(readlink "${LFS}"/usr/lib/libncursesw.so)" "${LFS}"/usr/lib/libncursesw.so +#!/bin/bash +set -e + +sed -i s/mawk// configure && + +mkdir build +pushd build > /dev/null || exit 1 + ../configure && + make -C include && + make -C progs tic && +popd > /dev/null || exit 1 + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(./config.guess)" \ + --mandir=/usr/share/man \ + --with-manpage-format=normal \ + --with-shared \ + --without-debug \ + --without-ada \ + --without-normal \ + --enable-widec && +make && +make DESTDIR="${LFS}" TIC_PATH="$(pwd)"/build/progs/tic -j1 install && +echo "INPUT(-lncursesw)" > "${LFS}"/usr/lib/libncurses.so && +mv -v "${LFS}"/usr/lib/libncursesw.so.6* "${LFS}"/lib && +ln -sfv ../../lib/"$(readlink "${LFS}"/usr/lib/libncursesw.so)" "${LFS}"/usr/lib/libncursesw.so diff --git a/chapter6/patch.sh b/chapter6/patch.sh index 42add5e..853e6b6 100644 --- a/chapter6/patch.sh +++ b/chapter6/patch.sh @@ -1,8 +1,8 @@ -#!/bin/bash -set -e - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(build-aux/config.guess)" && -make && -make DESTDIR="${LFS}" -j1 install +#!/bin/bash +set -e + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" && +make && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/sed.sh b/chapter6/sed.sh index 7aaa38a..b908225 100644 --- a/chapter6/sed.sh +++ b/chapter6/sed.sh @@ -1,8 +1,8 @@ -#!/bin/bash -set -e - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --bindir=/bin && -make && -make DESTDIR="${LFS}" -j1 install +#!/bin/bash +set -e + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --bindir=/bin && +make && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/tar.sh b/chapter6/tar.sh index 28aea9c..411480b 100644 --- a/chapter6/tar.sh +++ b/chapter6/tar.sh @@ -1,9 +1,9 @@ -#!/bin/bash -set -e - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(build-aux/config.guess)" \ - --bindir=/bin && -make && -make DESTDIR="${LFS}" -j1 install +#!/bin/bash +set -e + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" \ + --bindir=/bin && +make && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/xz.sh b/chapter6/xz.sh index a519ebd..fa6b3e6 100644 --- a/chapter6/xz.sh +++ b/chapter6/xz.sh @@ -1,13 +1,13 @@ -#!/bin/bash -set -e - -./configure --prefix=/usr \ - --host="${LFS_TGT}" \ - --build="$(build-aux/config.guess)" \ - --disable-static \ - --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 && -mv -v "${LFS}"/usr/lib/liblzma.so.* "${LFS}"/lib && -ln -svf ../../lib/"$(readlink "${LFS}"/usr/lib/liblzma.so)" "${LFS}"/usr/lib/liblzma.so +#!/bin/bash +set -e + +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" \ + --disable-static \ + --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 && +mv -v "${LFS}"/usr/lib/liblzma.so.* "${LFS}"/lib && +ln -svf ../../lib/"$(readlink "${LFS}"/usr/lib/liblzma.so)" "${LFS}"/usr/lib/liblzma.so -- cgit v1.2.3-54-g00ecf