diff options
Diffstat (limited to 'chapter6')
-rw-r--r-- | chapter6/backup.sh | 12 | ||||
-rw-r--r-- | chapter6/bash.sh | 12 | ||||
-rw-r--r-- | chapter6/binutils.sh | 12 | ||||
-rw-r--r-- | chapter6/cleanup.sh | 16 | ||||
-rw-r--r-- | chapter6/coreutils.sh | 24 | ||||
-rw-r--r-- | chapter6/diffutils.sh | 7 | ||||
-rw-r--r-- | chapter6/file.sh | 14 | ||||
-rw-r--r-- | chapter6/findutils.sh | 12 | ||||
-rw-r--r-- | chapter6/gawk.sh | 8 | ||||
-rw-r--r-- | chapter6/gcc.sh | 20 | ||||
-rw-r--r-- | chapter6/grep.sh | 6 | ||||
-rw-r--r-- | chapter6/gzip.sh | 9 | ||||
-rw-r--r-- | chapter6/m4.sh | 8 | ||||
-rw-r--r-- | chapter6/make.sh | 8 | ||||
-rw-r--r-- | chapter6/ncurses.sh | 18 | ||||
-rw-r--r-- | chapter6/patch.sh | 8 | ||||
-rw-r--r-- | chapter6/sed.sh | 6 | ||||
-rw-r--r-- | chapter6/tar.sh | 8 | ||||
-rw-r--r-- | chapter6/xz.sh | 14 |
19 files changed, 132 insertions, 90 deletions
diff --git a/chapter6/backup.sh b/chapter6/backup.sh index 92a176d..0f474d6 100644 --- a/chapter6/backup.sh +++ b/chapter6/backup.sh @@ -1,3 +1,5 @@ +#!/bin/bash + FILE="${LFS_VER}-ch6-backup.tar.xz" DIRS="bin etc lib lib64 sbin tools usr var" @@ -6,17 +8,17 @@ if [ -f "${LFS}/sources/chapter6/backup" ]; then else echo -ne "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${FILE}${RST}... " - pushd ${LFS} > /dev/null - sudo XZ_OPTS="${NUMPROCS} -e" tar -cJpf /home/${USER}/${FILE} ${DIRS} & pid=$! - spinner "$!" + pushd "${LFS}" > /dev/null || exit 1 + sudo XZ_OPTS="${NUMPROCS} -e" tar -cJpf /home/"${USER}"/"${FILE}" "${DIRS}" & pid=$! + spinner "$pid" retval=$? if [ "$retval" -ne 0 ]; then echo -e "${RED}Backup FAILED!${RST}" else - sudo chown ${USER} /home/${USER}/${FILE} + sudo chown "${USER}" /home/"${USER}"/"${FILE}" echo -e "${GRN}OK${RST}" fi - popd > /dev/null + popd > /dev/null || exit 1 touch "${LFS}/sources/chapter6/backup" fi diff --git a/chapter6/bash.sh b/chapter6/bash.sh index 83a7a89..ae7bb34 100644 --- a/chapter6/bash.sh +++ b/chapter6/bash.sh @@ -1,8 +1,10 @@ +#!/bin/bash + ./configure --prefix=/usr \ - --build=$(support/config.guess) \ - --host=${LFS_TGT} \ + --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 +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 5411f57..9b97c4b 100644 --- a/chapter6/binutils.sh +++ b/chapter6/binutils.sh @@ -1,14 +1,16 @@ +#!/bin/bash + mkdir -v build -cd build +cd build || exit 1 ../configure \ --prefix=/usr \ - --build=$(../config.guess) \ - --host=${LFS_TGT} \ + --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 +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 a457f0d..abe4b0a 100644 --- a/chapter6/cleanup.sh +++ b/chapter6/cleanup.sh @@ -1,21 +1,23 @@ +#!/bin/bash + if [ -f "${LFS}/sources/chapter6/cleanup" ]; then echo -e "${YLW}Chapter 6 ${GRN}cleanup already performed.${RST}" else echo -ne "${GRN}Cleaning up ${YLW}${LFS}${RST}... " - find ${LFS}/usr/lib -name \*.la -delete >/dev/null 2>&1 - find ${LFS}/usr/libexec -name \*.la -delete >/dev/null 2>&1 + find "${LFS}"/usr/lib -name \*.la -delete >/dev/null 2>&1 + find "${LFS}"/usr/libexec -name \*.la -delete >/dev/null 2>&1 rm -rf /usr/share/doc >/dev/null 2>&1 rm -rf /usr/share/info >/dev/null 2>&1 rm -rf /usr/share/man >/dev/null 2>&1 - strip --strip-debug ${LFS}S/usr/lib/* >/dev/null 2>&1 - strip --strip-unneeded ${LFS}/usr/bin/* >/dev/null 2>&1 - strip --strip-unneeded ${LFS}/usr/sbin/* >/dev/null 2>&1 - strip --strip-unneeded ${LFS}/tools/bin/* >/dev/null 2>&1 + strip --strip-debug "${LFS}"S/usr/lib/* >/dev/null 2>&1 + strip --strip-unneeded "${LFS}"/usr/bin/* >/dev/null 2>&1 + strip --strip-unneeded "${LFS}"/usr/sbin/* >/dev/null 2>&1 + strip --strip-unneeded "${LFS}"/tools/bin/* >/dev/null 2>&1 echo -e "${GRN}OK${RST}" - touch ${LFS}/sources/chapter6/cleanup >/dev/null 2>&1 + touch "${LFS}"/sources/chapter6/cleanup >/dev/null 2>&1 fi diff --git a/chapter6/coreutils.sh b/chapter6/coreutils.sh index b9d5079..536fa52 100644 --- a/chapter6/coreutils.sh +++ b/chapter6/coreutils.sh @@ -1,15 +1,17 @@ +#!/bin/bash + ./configure --prefix=/usr \ - --host=${LFS_TGT} \ - --build=$(build-aux/config.guess) \ + --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 +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 1e20581..f6c45af 100644 --- a/chapter6/diffutils.sh +++ b/chapter6/diffutils.sh @@ -1,4 +1,7 @@ +#!/bin/bash + sed 's/help2man -i/help2man --no-discard-stderr -i /' -i man/Makefile.in -HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr --host=${LFS_TGT} && +HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr \ + --host="${LFS_TGT}" && make && -make DESTDIR=${LFS} -j1 install +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/file.sh b/chapter6/file.sh index e2697a9..5323924 100644 --- a/chapter6/file.sh +++ b/chapter6/file.sh @@ -1,13 +1,17 @@ +#!/bin/bash + mkdir build -pushd build > /dev/null +pushd build > /dev/null || exit 1 ../configure --disable-bzlib \ --disable-libseccomp \ --disable-xzlib \ --disable-zlib && make && -popd > /dev/null +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 +./configure --prefix=/usr \ + --host="${LFS_TGT}" \ + --build="$(./config.guess)" && +make FILE_COMPILE="$(pwd)/build/src/file" && +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/findutils.sh b/chapter6/findutils.sh index b587638..9d53587 100644 --- a/chapter6/findutils.sh +++ b/chapter6/findutils.sh @@ -1,8 +1,10 @@ +#!/bin/bash + ./configure --prefix=/usr \ - --host=${LFS_TGT} \ - --build=$(build-aux/config.guess) && + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" && make && -make DESTDIR=${LFS} -j1 install && +make DESTDIR="${LFS}" -j1 install && -mv -v ${LFS}/usr/bin/find ${LFS}/bin && -sed -i 's|find:=${BINDIR}|find:=/bin|' ${LFS}/usr/bin/updatedb +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 5d2fd68..29d7a8b 100644 --- a/chapter6/gawk.sh +++ b/chapter6/gawk.sh @@ -1,6 +1,8 @@ +#!/bin/bash + sed -i 's/extras//' Makefile.in && ./configure --prefix=/usr \ - --host=${LFS_TGT} \ - --build=$(./config.guess) && + --host="${LFS_TGT}" \ + --build="$(./config.guess)" && make && -make DESTDIR=${LFS} -j1 install +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/gcc.sh b/chapter6/gcc.sh index adf4593..881d200 100644 --- a/chapter6/gcc.sh +++ b/chapter6/gcc.sh @@ -1,3 +1,5 @@ +#!/bin/bash + 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 @@ -11,16 +13,16 @@ case $(uname -m) in esac mkdir -v build -cd build +cd build || exit 1 -mkdir -pv ${LFS_TGT}/libgcc && -ln -s ../../../libgcc/gthr-posix.h ${LFS_TGT}/libgcc/gthr-default.h && +mkdir -pv "${LFS_TGT}"/libgcc && +ln -s ../../../libgcc/gthr-posix.h "${LFS_TGT}"/libgcc/gthr-default.h && ../configure \ - --build=$(../config.guess) \ - --host=${LFS_TGT} \ + --build="$(../config.guess)" \ + --host="${LFS_TGT}" \ --prefix=/usr \ - CC_FOR_TARGET=${LFS_TGT}-gcc \ - --with-build-sysroot=${LFS} \ + CC_FOR_TARGET="${LFS_TGT}"-gcc \ + --with-build-sysroot="${LFS}" \ --enable-initfini-array \ --disable-nls \ --disable-multilib \ @@ -33,5 +35,5 @@ ln -s ../../../libgcc/gthr-posix.h ${LFS_TGT}/libgcc/gthr-default.h && --disable-libstdcxx \ --enable-languages=c,c++ && make && -make DESTDIR=${LFS} -j1 install && -ln -sv gcc ${LFS}/usr/bin/cc +make DESTDIR="${LFS}" -j1 install && +ln -sv gcc "${LFS}"/usr/bin/cc diff --git a/chapter6/grep.sh b/chapter6/grep.sh index a768e19..9aab0f4 100644 --- a/chapter6/grep.sh +++ b/chapter6/grep.sh @@ -1,5 +1,7 @@ +#!/bin/bash + ./configure --prefix=/usr \ - --host=${LFS_TGT} \ + --host="${LFS_TGT}" \ --bindir=/bin && make && -make DESTDIR=${LFS} -j1 install +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/gzip.sh b/chapter6/gzip.sh index 853ed7b..f894df6 100644 --- a/chapter6/gzip.sh +++ b/chapter6/gzip.sh @@ -1,4 +1,7 @@ -./configure --prefix=/usr --host=${LFS_TGT} && +#!/bin/bash + +./configure --prefix=/usr \ + --host="${LFS_TGT}" && make && -make DESTDIR=${LFS} -j1 install && -mv -v ${LFS}/usr/bin/gzip ${LFS}/bin +make DESTDIR="${LFS}" -j1 install && +mv -v "${LFS}"/usr/bin/gzip "${LFS}"/bin diff --git a/chapter6/m4.sh b/chapter6/m4.sh index 04ffbcc..2f67ebe 100644 --- a/chapter6/m4.sh +++ b/chapter6/m4.sh @@ -1,3 +1,5 @@ +#!/bin/bash + sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c && echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h && @@ -6,7 +8,7 @@ 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) && + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" && make && -make DESTDIR=${LFS} -j1 install +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/make.sh b/chapter6/make.sh index 69c7e72..4de06b6 100644 --- a/chapter6/make.sh +++ b/chapter6/make.sh @@ -1,6 +1,8 @@ +#!/bin/bash + ./configure --prefix=/usr \ --without-guile \ - --host=${LFS_TGT} \ - --build=$(build-aux/config.guess) + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" && make && -make DESTDIR=${LFS} -j1 install +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/ncurses.sh b/chapter6/ncurses.sh index 91ffa45..6320a9f 100644 --- a/chapter6/ncurses.sh +++ b/chapter6/ncurses.sh @@ -1,15 +1,17 @@ +#!/bin/bash + sed -i s/mawk// configure && mkdir build -pushd build > /dev/null +pushd build > /dev/null || exit 1 ../configure && make -C include && make -C progs tic && -popd > /dev/null +popd > /dev/null || exit 1 ./configure --prefix=/usr \ - --host=${LFS_TGT} \ - --build=$(./config.guess) \ + --host="${LFS_TGT}" \ + --build="$(./config.guess)" \ --mandir=/usr/share/man \ --with-manpage-format=normal \ --with-shared \ @@ -18,7 +20,7 @@ popd > /dev/null --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 +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 55e45aa..fa1dac9 100644 --- a/chapter6/patch.sh +++ b/chapter6/patch.sh @@ -1,5 +1,7 @@ +#!/bin/bash + ./configure --prefix=/usr \ - --host=${LFS_TGT} \ - --build=$(build-aux/config.guess) && + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" && make && -make DESTDIR=${LFS} -j1 install +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/sed.sh b/chapter6/sed.sh index a768e19..9aab0f4 100644 --- a/chapter6/sed.sh +++ b/chapter6/sed.sh @@ -1,5 +1,7 @@ +#!/bin/bash + ./configure --prefix=/usr \ - --host=${LFS_TGT} \ + --host="${LFS_TGT}" \ --bindir=/bin && make && -make DESTDIR=${LFS} -j1 install +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/tar.sh b/chapter6/tar.sh index 1c32e33..730d108 100644 --- a/chapter6/tar.sh +++ b/chapter6/tar.sh @@ -1,6 +1,8 @@ +#!/bin/bash + ./configure --prefix=/usr \ - --host=${LFS_TGT} \ - --build=$(build-aux/config.guess) \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" \ --bindir=/bin && make && -make DESTDIR=${LFS} -j1 install +make DESTDIR="${LFS}" -j1 install diff --git a/chapter6/xz.sh b/chapter6/xz.sh index 7515350..12a43ce 100644 --- a/chapter6/xz.sh +++ b/chapter6/xz.sh @@ -1,10 +1,12 @@ +#!/bin/bash + ./configure --prefix=/usr \ - --host=${LFS_TGT} \ - --build=$(build-aux/config.guess) \ + --host="${LFS_TGT}" \ + --build="$(build-aux/config.guess)" \ --disable-static \ --docdir=/usr/share/doc/xz-5.2.5 && 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 +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 |