finished rewrite, working on builing GRUB et al, and then the kernel

.gitignore

@@ -1 +1,2 @@
 *.img
+*.swp

config.sh

@@ -8,6 +8,7 @@ export MAKEFLAGS=-j8
 export PACKAGE_LIST=$FULLPATH/pkgs.sh
 export PACKAGE_DIR=$FULLPATH/pkgs
 export LOG_DIR=$FULLPATH/logs
+export KEEP_LOGS=false
 export LFS=/mnt/lfs
 export LFS_TGT=$(uname -m)-lfs-linux-gnu
 export LFS_FS=ext4
@@ -15,14 +16,13 @@ export LFS_IMG=$FULLPATH/lfs.img
 export LFS_IMG_SIZE=$((10*1024*1024*1024)) # 10 GiB
 export ROOT_PASSWD=password
 export RUN_TESTS=false
-export BUILDLOG_DIR=$FULLPATH/buildlogs
 export TESTLOG_DIR=$FULLPATH/testlogs
 export LFSHOSTNAME=lfs
 export LFSROOTLABEL=LFSROOT
 export LFSEFILABEL=LFSEFI
 export LFSFSTYPE=ext4
 
-KEYS="MAKEFLAGS PACKAGE_LIST PACKAGE_DIR LOG_DIR"\
+KEYS="MAKEFLAGS PACKAGE_LIST PACKAGE_DIR LOG_DIR KEEP_LOGS"\
 " LFS LFS_TGT LFS_FS LFS_IMG LFS_IMG_SIZE ROOT_PASSWD RUN_TESTS TESTLOG_DIR"\
 " LFSHOSTNAME LFSROOTLABEL LFSEFILABEL LFSFSTYPE"
 

main.sh

@@ -4,13 +4,13 @@ cd $(dirname $0)
 
 source ./config.sh
 
+./clean_img.sh
+
 while read pkg;
 do
     eval $pkg
     export $(echo $pkg | cut -d"=" -f1)
-done < ./pkgs.sh
-
-./clean_img.sh
+done < $PACKAGE_LIST
 
 
 # #########
@@ -60,22 +60,6 @@ function check_dependency {
     fi
 }
 
-function get_packages {
-    PACKAGE_URLS=$(cat $PACKAGE_LIST | cut -d"=" -f2)
-    PACKAGES=$(ls ./pkgs)
-
-    # check if packages have already been downloaded
-    if [ -z "$PACKAGES" ]
-    then
-# no indent because here-doc
-wget --quiet --directory-prefix $PACKAGE_DIR --input-file - <<EOF
-$PACKAGE_URLS
-EOF
-    fi
-
-    cp $PACKAGE_DIR/* $LFS/sources
-}
-
 function install_static {
     FILENAME=$1
     FULLPATH="$LFS/$(basename $FILENAME | sed 's/__/\//g')"
@@ -96,28 +80,25 @@ function install_template {
 }
 
 function build_package {
-    NAME=$1
-    OVERRIDE=$2
+    local NAME=$1
+    local NAME_OVERRIDE=$2
 
     echo -n "Building $NAME phase $PHASE... "
 
-    PKG_NAME=PKG_$([ -n "$OVERRIDE" ] && echo $OVERRIDE || echo $NAME | tr a-z A-Z)
+    local PKG_NAME=PKG_$([ -n "$NAME_OVERRIDE" ] && echo $NAME_OVERRIDE || echo $NAME | tr a-z A-Z)
     PKG_NAME=$(basename ${!PKG_NAME})
 
-    PATCH_NAME=PATCH_$([ -n "$OVERRIDE" ] && echo $OVERRIDE || echo $NAME | tr a-z A-Z)
-    PATCH_NAME=$([ -n "${!PATCH_NAME}" ] && basename ${!PATCH_NAME} || echo "")
+    local LOG_FILE=$LOG_DIR/${NAME}_phase${PHASE}.log
 
-    DIR_NAME=${PKG_NAME%.tar*}
-    LOG_FILE=$LOG_DIR/${NAME}_phase${PHASE}.log
-
-    BUILD_INSTR="
+    local BUILD_INSTR="
         set -e
         pushd sources > /dev/null
-        tar -xf $PKG_NAME
-        cd $DIR_NAME
+        mkdir $NAME
+        tar -xf $PKG_NAME -C $NAME --strip-components=1
+        cd $NAME
         $(cat ./phase${PHASE}/${NAME}.sh)
         popd
-        rm -r sources/$DIR_NAME
+        rm -r sources/$NAME
     "
 
     pushd $LFS > /dev/null
@@ -127,11 +108,11 @@ function build_package {
                 HOME=/root \
                 TERM=$TERM \
                 PATH=/usr/bin:/usr/sbin &> $LOG_FILE \
-                LFS_TGT=$LFS_TGT \
+                MAKEFLAGS=$MAKEFLAGS \
                 ROOT_PASSWD=$ROOT_PASSWD \
                 RUN_TESTS=$RUN_TESTS \
-                "$(cat $PACKAGE_LIST)" \
-                /bin/bash +h -c "$BUILD_INSTR" &> $LOG_FILE
+                $(cat $PACKAGE_LIST) \
+                /usr/bin/bash +h -c "$BUILD_INSTR" &> $LOG_FILE
         then
             echo -e "\nERROR: $NAME Phase $PHASE failed:"
             tail $LOG_FILE
@@ -145,7 +126,12 @@ function build_package {
     fi
     popd > /dev/null
 
-    (cd $LOG_DIR && gzip $LOG_FILE)
+    if $KEEP_LOGS
+    then
+        (cd $LOG_DIR && gzip $LOG_FILE)
+    else
+        rm $LOG_FILE
+    fi
 
     echo "done."
 
@@ -294,7 +280,7 @@ echo "done."
 
 echo -n "Creating basic directory layout... "
 
-mkdir -p $LFS/{bin,boot,dev,etc,home,lib64,media,mnt,opt,proc,run,srv,sys,tools,usr,var}
+mkdir -p $LFS/{boot,dev,etc,home,lib64,media,mnt,opt,proc,run,srv,sys,tools,usr,var}
 mkdir -p $LFS/boot/grub
 mkdir -p $LFS/etc/{modprobe.d,opt,sysconfig}
 mkdir -p $LFS/media/{cdrom,floppy}
@@ -358,7 +344,10 @@ fi
 echo "done."
 
 echo -n "Downloading packages to $LFS/sources... "
-get_packages
+wget --quiet --no-clobber --directory-prefix $PACKAGE_DIR --input-file - <<EOF
+$(cat $PACKAGE_LIST | cut -d"=" -f2)
+EOF
+cp ./pkgs/*.tar.* ./pkgs/*.patch $LFS/sources
 echo "done."
 
 
@@ -440,8 +429,6 @@ echo -e \
 "# Phase 4\n"\
 "# ~~~~~~~"
 
-exit
-
 PHASE=4
 build_package manpages
 build_package ianaetc
@@ -519,11 +506,11 @@ build_package sysvinit
 build_package lfsbootscripts
 
 # UEFI Boot Dependencies
-build_pakcage popt
-build_package mandoc
-build_package efivar
-build_package efibootmgr
-build_package grub
+#build_pakcage popt
+#build_package mandoc
+#build_package efivar
+#build_package efibootmgr
+#build_package grub
 
 # delete tmp files created during builds
 rm -rf $LFS/tmp/*

phase1/binutils.sh

@@ -1,4 +1,7 @@
 # Bintuils Phase 1
+
+echo $PATCH_BINUTILS
+
 mkdir build
 cd build
 

phase1/glibc.sh

@@ -29,19 +29,5 @@ make DESTDIR=$LFS install
 
 sed '/RTLDLIST=/s@/usr@@g' -i $LFS/usr/bin/ldd
 
-# check that everything is good
-echo 'int main(){}' > dummy.c
-$LFS_TGT-gcc dummy.c
-OUTPUT=$(readelf -l a.out | grep '/ld-linux')
-EXPECTED='[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]'
-if [[ "$OUTPUT" != *"${EXPECTED}"* ]]
-then
-    echo "ERROR: OUTPUT does not contain expected value.\n" \
-         "OUTPUT=$OUTPUT\n" \
-         "EXPECTED=$EXPECTED"
-    exit -1
-fi
-rm dummy.c a.out
-
 $LFS/tools/libexec/gcc/$LFS_TGT/11.2.0/install-tools/mkheaders
 

phase3/bison.sh

@@ -1,6 +1,6 @@
 # Bison Phase 3
 ./configure --prefix=/usr \
-            --docdir=/usr/share/doc/${PKG_BISON%.tar*}
+            --docdir=/usr/share/doc/bison-3.8.2
 
 make
 make install

phase4/acl.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Acl Stage 6
-# ~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep ACL $PACKAGE_LIST)"
-PKG_ACL=$(basename $PKG_ACL)
-
-tar -xf $PKG_ACL
-cd ${PKG_ACL%.tar*}
-
+# Acl Phase 4
 ./configure --prefix=/usr         \
             --disable-static      \
             --docdir=/usr/share/doc/acl-2.3.1
@@ -19,6 +7,3 @@ make
 
 make install
 
-cd /sources
-rm -rf ${PKG_ACL%.tar*}
-

phase4/attr.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Attr Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep ATTR $PACKAGE_LIST)"
-PKG_ATTR=$(basename $PKG_ATTR)
-
-tar -xf $PKG_ATTR
-cd ${PKG_ATTR%.tar*}
-
+# Attr Phase 4
 ./configure --prefix=/usr     \
             --disable-static  \
             --sysconfdir=/etc \
@@ -21,12 +9,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/attr.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_ATTR%.tar*}
-

phase4/autoconf.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Autoconf Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep AUTOCONF $PACKAGE_LIST)"
-PKG_AUTOCONF=$(basename $PKG_AUTOCONF)
-
-tar -xf $PKG_AUTOCONF
-cd ${PKG_AUTOCONF%.tar*}
-
+# Autoconf Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check TESTSUITEFLAGS=-j4 &> $TESTLOG_DIR/autoconf.log
+    make check TESTSUITEFLAGS=-j4
     set -e
 fi
 
 make install 
 
-cd /sources
-rm -rf ${PKG_AUTOCONF%.tar*}
-

phase4/automake.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Automake Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep AUTOMAKE $PACKAGE_LIST)"
-PKG_AUTOMAKE=$(basename $PKG_AUTOMAKE)
-
-tar -xf $PKG_AUTOMAKE
-cd ${PKG_AUTOMAKE%.tar*}
-
+# Automake Phase 4
 ./configure --prefix=/usr --docdir=/usr/share/doc/automake-1.16.5
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make -j4 check &> TESTLOG_DIR/automake.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_AUTOMAKE%.tar*}
-

phase4/bash.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Bash Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep BASH $PACKAGE_LIST)"
-PKG_BASH=$(basename $PKG_BASH)
-
-tar -xf $PKG_BASH
-cd ${PKG_BASH%.tar*}
-
+# Bash Phase 4
 ./configure --prefix=/usr                      \
             --docdir=/usr/share/doc/bash-5.1.16 \
             --without-bash-malloc              \
@@ -23,18 +11,15 @@ chown -R tester .
 if $RUN_TESTS
 then
     set +e
-su -s /usr/bin/expect tester &> $TESTLOG_DIR/bash.log << EOF
-    set timeout -1
-    spawn make tests
-    expect eof
-    lassign [wait] _ _ _ value
-    exit $value
+su -s /usr/bin/expect tester << EOF
+set timeout -1
+spawn make tests
+expect eof
+lassign [wait] _ _ _ value
+exit $value
 EOF
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_BASH%.tar*}
-

phase4/bc.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Bc Stage 6
-# ~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep BC $PACKAGE_LIST)"
-PKG_BC=$(basename $PKG_BC)
-
-tar -xf $PKG_BC
-cd ${PKG_BC%.tar*}
-
+# Bc Phase 4
 CC=gcc ./configure --prefix=/usr -G -O3
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make test &> $TESTLOG_DIR/bc.log
+    make test
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_BC%.tar*}
-

phase4/binutils.sh

@@ -1,18 +1,5 @@
-#!/usr/bin/env bash
-# Binutils Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep BINUTILS $PACKAGE_LIST)"
-PKG_BINUTILS=$(basename $PKG_BINUTILS)
-PATCH_BINUTILS=$(basename $PATCH_BINUTILS)
-
-tar -xf $PKG_BINUTILS
-cd ${PKG_BINUTILS%.tar*}
-
-patch -Np1 -i ../$PATCH_BINUTILS
+# Binutils Phase 4
+patch -Np1 -i ../$(basename $PATCH_BINUTILS)
 
 sed -e '/R_386_TLS_LE /i \   || (TYPE) == R_386_TLS_IE \\' \
     -i ./bfd/elfxx-x86.h
@@ -34,7 +21,7 @@ make tooldir=/usr
 if $RUN_TESTS
 then
     set +e
-    make -k check &> $TESTLOG_DIR/binutils.log
+    make -k check 
     set -e
 fi
 
@@ -42,6 +29,3 @@ make tooldir=/usr install
 
 rm -f /usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.a
 
-cd /sources
-rm -rf ${PKG_BINUTILS%.tar*}
-

phase4/bison.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Bison Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep BISON $PACKAGE_LIST)"
-PKG_BISON=$(basename $PKG_BISON)
-
-tar -xf $PKG_BISON
-cd ${PKG_BISON%.tar*}
-
+# Bison Phase 4
 ./configure --prefix=/usr --docdir=/usr/share/doc/bison-3.8.2
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/bison.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_BISON%.tar*}
-

phase4/bzip2.sh

@@ -1,5 +1,5 @@
 # Bzip2 Phase 4
-patch -Np1 -i ../$PATCH_BZIP2
+patch -Np1 -i ../$(basename $PATCH_BZIP2)
 
 sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile
 sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile

phase4/check.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Check Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep CHECK $PACKAGE_LIST)"
-PKG_CHECK=$(basename $PKG_CHECK)
-
-tar -xf $PKG_CHECK
-cd ${PKG_CHECK%.tar*}
-
+# Check Phase 4
 ./configure --prefix=/usr --disable-static
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/check.log
+    make check
     set -e
 fi
 
 make docdir=/usr/share/doc/check-0.15.2 install
 
-cd /sources
-rm -rf ${PKG_CHECK%.tar*}
-

phase4/coreutils.sh

@@ -1,20 +1,6 @@
-#!/usr/bin/env bash
-# Coreutils Stage 6
-# ~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep COREUTILS $PACKAGE_LIST)"
-PKG_COREUTILS=$(basename $PKG_COREUTILS)
-PATCH_COREUTILS=$(basename $PATCH_COREUTILS)
-PATCH_COREUTILS_CHMOD=$(basename $PATCH_COREUTILS_CHMOD)
-
-tar -xf $PKG_COREUTILS
-cd ${PKG_COREUTILS%.tar*}
-
-patch -Np1 -i ../$PATCH_COREUTILS
-patch -Np1 -i ../$PATCH_COREUTILS_CHMOD
+# Coreutils Phase 4
+patch -Np1 -i ../$(basename $PATCH_COREUTILS)
+patch -Np1 -i ../$(basename $PATCH_COREUTILS_CHMOD)
 
 autoreconf -fi
 FORCE_UNSAFE_CONFIGURE=1 ./configure \
@@ -26,13 +12,11 @@ make
 if $RUN_TESTS
 then
     set +e
-    {
-        make NON_ROOT_USERNAME=tester check-root
-        echo "dummy:x:102:tester" >> /etc/group
-        chown -R tester . 
-        su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"
-        sed -i '/dummy/d' /etc/group
-    } &> $TESTLOG_DIR/coreutils.log
+    make NON_ROOT_USERNAME=tester check-root
+    echo "dummy:x:102:tester" >> /etc/group
+    chown -R tester . 
+    su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"
+    sed -i '/dummy/d' /etc/group
     set -e
 fi
 
@@ -42,6 +26,3 @@ mv /usr/bin/chroot /usr/sbin
 mv /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8
 sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8
 
-cd /sources
-rm -rf ${PKG_COREUTILS%.tar*}
-

phase4/dejagnu.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# DejaGNU Stage 6
-# ~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep DEJAGNU $PACKAGE_LIST)"
-PKG_DEJAGNU=$(basename $PKG_DEJAGNU)
-
-tar -xf $PKG_DEJAGNU
-cd ${PKG_DEJAGNU%.tar*}
-
+# DejaGNU Phase 4
 mkdir build
 cd       build
 
@@ -25,10 +13,7 @@ install -m644   doc/dejagnu.{html,txt} /usr/share/doc/dejagnu-1.6.3
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/dejagnu.log
+    make check
     set -e
 fi
 
-cd /sources
-rm -rf ${PKG_DEJAGNU%.tar*}
-

phase4/diffutils.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Diffutils Stage 6
-# ~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep DIFFUTILS $PACKAGE_LIST)"
-PKG_DIFFUTILS=$(basename $PKG_DIFFUTILS)
-
-tar -xf $PKG_DIFFUTILS
-cd ${PKG_DIFFUTILS%.tar*}
-
+# Diffutils Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/diffutils.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_DIFFUTILS%.tar*}
-

phase4/e2fsprogs.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# E2fsprogs Stage 6
-# ~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep E2FSPROGS $PACKAGE_LIST)"
-PKG_E2FSPROGS=$(basename $PKG_E2FSPROGS)
-
-tar -xf $PKG_E2FSPROGS
-cd ${PKG_E2FSPROGS%.tar*}
-
+# E2fsprogs Phase 4
 mkdir build
 cd build
 
@@ -27,7 +15,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/e2fsprogs.log
+    make check
     set -e
 fi
 
@@ -42,6 +30,3 @@ makeinfo -o      doc/com_err.info ../lib/et/com_err.texinfo
 install -m644 doc/com_err.info /usr/share/info
 install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info
 
-cd /sources
-rm -rf ${PKG_E2FSPROGS%.tar*}
-

phase4/efibootmgr.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# efibootmanager Stage 6
-# ~~~~~~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep EFIBOOTMGR $PACKAGE_LIST)"
-PKG_EFIBOOTMGR=$(basename $PKG_EFIBOOTMGR)
-
-tar -xf $PKG_EFIBOOTMGR
-cd ${PKG_EFIBOOTMGR%.tar*}
-
+# efibootmanager Phase 4
 sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
 
 sed 's/-Werror//' -i Make.defaults
@@ -19,6 +7,3 @@ make EFIDIR=LFS EFI_LOADER=grubx64.efi
 
 make install EFIDIR=LFS
 
-cd /sources
-rm -rf ${PKG_EFIBOOTMGR%.tar*}
-

phase4/efivar.sh

@@ -1,22 +1,7 @@
-#!/usr/bin/env bash
-# efivar Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep EFIVAR $PACKAGE_LIST)"
-PKG_EFIVAR=$(basename $PKG_EFIVAR)
-
-tar -xf $PKG_EFIVAR
-cd ${PKG_EFIVAR%.tar*}
-
+# efivar Phase 4
 sed '/prep :/a\\ttouch prep' -i src/Makefile
 
 make
 
 make install LIBDIR=/usr/lib
 
-cd /sources
-rm -rf ${PKG_EFIVAR%.tar*}
-

phase4/elfutils.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Elfutils Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep ELFUTILS $PACKAGE_LIST)"
-PKG_ELFUTILS=$(basename $PKG_ELFUTILS)
-
-tar -xf $PKG_ELFUTILS
-cd ${PKG_ELFUTILS%.tar*}
-
+# Elfutils Phase 4
 ./configure --prefix=/usr                \
             --disable-debuginfod         \
             --enable-libdebuginfod=dummy
@@ -20,7 +8,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/elfutils.log
+    make check
     set -e
 fi
 
@@ -28,6 +16,3 @@ make -C libelf install
 install -m644 config/libelf.pc /usr/lib/pkgconfig
 rm /usr/lib/libelf.a
 
-cd /sources
-rm -rf ${PKG_ELFUTILS%.tar*}
-

phase4/eudev.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Eudev Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep EUDEV $PACKAGE_LIST)"
-PKG_EUDEV=$(basename $PKG_EUDEV)
-
-tar -xf $PKG_EUDEV
-cd ${PKG_EUDEV%.tar*}
-
+# Eudev Phase 4
 ./configure --prefix=/usr           \
             --bindir=/usr/sbin      \
             --sysconfdir=/etc       \
@@ -25,7 +13,7 @@ mkdir -p /etc/udev/rules.d
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/eudev.log
+    make check
     set -e
 fi
 
@@ -36,6 +24,3 @@ make -f udev-lfs-20171102/Makefile.lfs install
 
 udevadm hwdb --update
 
-cd /sources
-rm -rf ${PKG_EUDEV%.tar*}
-

phase4/expat.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Expat Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep EXPAT $PACKAGE_LIST)"
-PKG_EXPAT=$(basename $PKG_EXPAT)
-
-tar -xf $PKG_EXPAT
-cd ${PKG_EXPAT%.tar*}
-
+# Expat Phase 4
 ./configure --prefix=/usr    \
             --disable-static \
             --docdir=/usr/share/doc/expat-2.4.6
@@ -20,7 +8,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/expat.log
+    make check
     set -e
 fi
 
@@ -28,6 +16,3 @@ make install
 
 install -m644 doc/*.{html,css} /usr/share/doc/expat-2.4.6
 
-cd /sources
-rm -rf ${PKG_EXPAT%.tar*}
-

phase4/expect.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Expect Stage 6
-# ~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep EXPECT $PACKAGE_LIST)"
-PKG_EXPECT=$(basename $PKG_EXPECT)
-
-tar -xf $PKG_EXPECT
-cd ${PKG_EXPECT%.tar*}
-
+# Expect Phase 4
 ./configure --prefix=/usr           \
             --with-tcl=/usr/lib     \
             --enable-shared         \
@@ -22,7 +10,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make test &> $TESTLOG_DIR/expect.log
+    make test 
     set -e
 fi
 
@@ -30,6 +18,3 @@ make install
 
 ln -sf expect5.45.4/libexpect5.45.4.so /usr/lib
 
-cd /sources
-rm -rf ${PKG_EXPECT%.tar*}
-

phase4/findutils.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Findutils Stage 6
-# ~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep FINDUTILS $PACKAGE_LIST)"
-PKG_FINDUTILS=$(basename $PKG_FINDUTILS)
-
-tar -xf $PKG_FINDUTILS
-cd ${PKG_FINDUTILS%.tar*}
-
+# Findutils Phase 4
 case $(uname -m) in
     i?86)   TIME_T_32_BIT_OK=yes ./configure --prefix=/usr --localstatedir=/var/lib/locate ;;
     x86_64) ./configure --prefix=/usr --localstatedir=/var/lib/locate ;;
@@ -22,12 +10,9 @@ if $RUN_TESTS
 then
     set +e
     chown -R tester .
-    su tester -c "PATH=$PATH make check" &> $TESTLOG_DIR/findutils.log
+    su tester -c "PATH=$PATH make check"
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_FINDUTILS%.tar*}
-

phase4/flex.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Flex Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep FLEX $PACKAGE_LIST)"
-PKG_FLEX=$(basename $PKG_FLEX)
-
-tar -xf $PKG_FLEX
-cd ${PKG_FLEX%.tar*}
-
+# Flex Phase 4
 ./configure --prefix=/usr \
             --docdir=/usr/share/doc/flex-2.6.4 \
             --disable-static
@@ -20,7 +8,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/flex.log
+    make check 
     set -e
 fi
 
@@ -28,6 +16,3 @@ make install
 
 ln -s flex /usr/bin/lex
 
-cd /sources
-rm -rf ${PKG_FLEX%.tar*}
-

phase4/gawk.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Gawk Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GAWK $PACKAGE_LIST)"
-PKG_GAWK=$(basename $PKG_GAWK)
-
-tar -xf $PKG_GAWK
-cd ${PKG_GAWK%.tar*}
-
+# Gawk Phase 4
 sed -i 's/extras//' Makefile.in
 
 ./configure --prefix=/usr
@@ -20,7 +8,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/gawk.log
+    make check
     set -e
 fi
 
@@ -29,6 +17,3 @@ make install
 mkdir -p /usr/share/doc/gawk-5.1.1
 cp doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-5.1.1
 
-cd /sources
-rm -rf ${PKG_GAWK%.tar*}
-

phase4/gcc.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# GCC Stage 6
-# ~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GCC $PACKAGE_LIST)"
-PKG_GCC=$(basename $PKG_GCC)
-
-tar -xf $PKG_GCC
-cd ${PKG_GCC%.tar*}
-
+# GCC Phase 4
 sed -e '/static.*SIGSTKSZ/d' \
     -e 's/return kAltStackSize/return SIGSTKSZ * 4/' \
     -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp
@@ -38,10 +26,10 @@ ulimit -s 32768
 
 if $RUN_TESTS
 then
-    echo "seems like RUN_TESTS is 'true'"
     set +e
     chown -R tester .
-    su tester -c "PATH=$PATH make -k check" &> $TESTLOG_DIR/gcc.log
+    su tester -c "PATH=$PATH make -k check"
+    ../contrib/test_summary
     set -e
 fi
 
@@ -56,14 +44,6 @@ ln -sr /usr/bin/cpp /usr/lib
 ln -sf ../../libexec/gcc/$(gcc -dumpmachine)/11.2.0/liblto_plugin.so \
         /usr/lib/bfd-plugins/
 
-echo 'int main(){}' > dummy.c
-cc dummy.c -Wl,--verbose &> dummy.log
-
-rm dummy.c a.out dummy.log
-
 mkdir -p /usr/share/gdb/auto-load/usr/lib
 mv /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
 
-cd /sources
-rm -rf ${PKG_GCC%.tar*}
-

phase4/gdbm.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# GDBM Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GDBM $PACKAGE_LIST)"
-PKG_GDBM=$(basename $PKG_GDBM)
-
-tar -xf $PKG_GDBM
-cd ${PKG_GDBM%.tar*}
-
+# GDBM Phase 4
 ./configure --prefix=/usr    \
             --disable-static \
             --enable-libgdbm-compat
@@ -20,12 +8,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/gdbm.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_GDBM%.tar*}
-

phase4/gettext.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Gettext Stage 6
-# ~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GETTEXT $PACKAGE_LIST)"
-PKG_GETTEXT=$(basename $PKG_GETTEXT)
-
-tar -xf $PKG_GETTEXT
-cd ${PKG_GETTEXT%.tar*}
-
+# Gettext Phase 4
 ./configure --prefix=/usr    \
             --disable-static \
             --docdir=/usr/share/doc/gettext-0.21
@@ -20,13 +8,10 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIG/gettext.log
+    make check
     set -e
 fi
 
 make install
 chmod 0755 /usr/lib/preloadable_libintl.so
 
-cd /sources
-rm -rf ${PKG_GETTEXT%.tar*}
-

phase4/glibc.sh

@@ -1,5 +1,5 @@
 # Glibc Phase 4
-patch -Np1 -i ../$PATCH_GLIBC
+patch -Np1 -i ../$(basename $PATCH_GLIBC)
 
 mkdir build
 cd build
@@ -66,21 +66,7 @@ localedef -i zh_CN -f GB18030 zh_CN.GB18030
 localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS
 localedef -i zh_TW -f UTF-8 zh_TW.UTF-8
 
-cat > /etc/nsswitch.conf << "EOF"
-passwd: files
-group: files
-shadow: files
-
-hosts: files dns
-networks: files
-
-protocols: files
-services: files
-ethers: files
-rpc: files
-EOF
-
-tar -xf ../../tzdata2021e.tar.gz
+tar -xf ../../$(basename $PKG_TZDATA)
 
 ZONEINFO=/usr/share/zoneinfo
 mkdir -p $ZONEINFO/{posix,right}
@@ -98,8 +84,3 @@ unset ZONEINFO
 
 ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
 
-cat > /etc/ld.so.conf << "EOF"
-/usr/local/lib
-/opt/lib
-EOF
-

phase4/gmp.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# GMP Stage 6
-# ~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GMP $PACKAGE_LIST)"
-PKG_GMP=$(basename $PKG_GMP)
-
-tar -xf $PKG_GMP
-cd ${PKG_GMP%.tar*}
-
+# GMP Phase 4
 ./configure --prefix=/usr    \
             --enable-cxx     \
             --disable-static \
@@ -22,7 +10,7 @@ make html
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/gmp_test.log
+    make check 
     set -e
 fi
 
@@ -36,6 +24,3 @@ fi
 make install
 make install-html
 
-cd /sources
-rm -rf ${PKG_GMP%.tar*}
-

phase4/gperf.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Gperf Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GPERF $PACKAGE_LIST)"
-PKG_GPERF=$(basename $PKG_GPERF)
-
-tar -xf $PKG_GPERF
-cd ${PKG_GPERF%.tar*}
-
+# Gperf Phase 4
 ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-3.1
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make -j1 check &> $TESTLOG_DIR/gperf.log
+    make -j1 check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_GPERF%.tar*}
-

phase4/grep.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Grep Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GREP $PACKAGE_LIST)"
-PKG_GREP=$(basename $PKG_GREP)
-
-tar -xf $PKG_GREP
-cd ${PKG_GREP%.tar*}
-
+# Grep Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/grep.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_GREP%.tar*}
-

phase4/groff.sh

@@ -1,22 +1,7 @@
-#!/usr/bin/env bash
-# Groff Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GROFF $PACKAGE_LIST)"
-PKG_GROFF=$(basename $PKG_GROFF)
-
-tar -xf $PKG_GROFF
-cd ${PKG_GROFF%.tar*}
-
+# Groff Phase 4
 PAGE=letter ./configure --prefix=/usr
 
 make -j1
 
 make install
 
-cd /sources
-rm -rf ${PKG_GROFF%.tar*}
-

phase4/grub.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# GRUB Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GRUB $PACKAGE_LIST)"
-PKG_GRUB=$(basename $PKG_GRUB)
-
-tar -xf $PKG_GRUB
-cd ${PKG_GRUB%.tar*}
-
+# GRUB Phase 4
 mkdir -pv /usr/share/fonts/unifont &&
 gunzip -c ../unifont-14.0.01.pcf.gz > /usr/share/fonts/unifont/unifont.pcf
 
@@ -40,6 +28,3 @@ then
     exit -1
 fi
 
-cd /sources
-rm -rf ${PKG_GRUB%.tar*}
-

phase4/gzip.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Gzip Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep GZIP $PACKAGE_LIST)"
-PKG_GZIP=$(basename $PKG_GZIP)
-
-tar -xf $PKG_GZIP
-cd ${PKG_GZIP%.tar*}
-
+# Gzip Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/gzip.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_GZIP%.tar*}
-

phase4/inetutils.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Inetutils Stage 6
-# ~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep INETUTILS $PACKAGE_LIST)"
-PKG_INETUTILS=$(basename $PKG_INETUTILS)
-
-tar -xf $PKG_INETUTILS
-cd ${PKG_INETUTILS%.tar*}
-
+# Inetutils Phase 4
 ./configure --prefix=/usr        \
             --bindir=/usr/bin    \
             --localstatedir=/var \
@@ -27,7 +15,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/inetutils.log
+    make check
     set -e
 fi
 
@@ -35,6 +23,3 @@ make install
 
 mv /usr/{,s}bin/ifconfig
 
-cd /sources
-rm -rf ${PKG_INETUTILS%.tar*}
-

phase4/intltool.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Intltool Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep INTLTOOL $PACKAGE_LIST)"
-PKG_INTLTOOL=$(basename $PKG_INTLTOOL)
-
-tar -xf $PKG_INTLTOOL
-cd ${PKG_INTLTOOL%.tar*}
-
+# Intltool Phase 4
 sed -i 's:\\\${:\\\$\\{:' intltool-update.in
 
 ./configure --prefix=/usr
@@ -20,13 +8,10 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/intltool.log
+    make check
     set -e
 fi
 
 make install
 install -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-0.51.0/I18N-HOWTO
 
-cd /sources
-rm -rf ${PKG_INTLTOOL%.tar*}
-

phase4/iproute2.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# IPRoute2 Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep IPROUTE2 $PACKAGE_LIST)"
-PKG_IPROUTE2=$(basename $PKG_IPROUTE2)
-
-tar -xf $PKG_IPROUTE2
-cd ${PKG_IPROUTE2%.tar*}
-
+# IPRoute2 Phase 4
 sed -i /ARPD/d Makefile
 rm -f man/man8/arpd.8
 
@@ -21,6 +9,3 @@ make SBINDIR=/usr/sbin install
 mkdir -p             /usr/share/doc/iproute2-5.16.0
 cp COPYING README* /usr/share/doc/iproute2-5.16.0
 
-cd /sources
-rm -rf ${PKG_IPROUTE2%.tar*}
-

phase4/kbd.sh

@@ -1,18 +1,5 @@
-#!/usr/bin/env bash
-# Kbd Stage 6
-# ~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep KBD $PACKAGE_LIST)"
-PKG_KBD=$(basename $PKG_KBD)
-PATCH_KBD=$(basename $PATCH_KBD)
-
-tar -xf $PKG_KBD
-cd ${PKG_KBD%.tar*}
-
-patch -Np1 -i ../kbd-2.4.0-backspace-1.patch
+# Kbd Phase 4
+patch -Np1 -i ../$(basename $PATCH_KBD)
 
 sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure
 sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in
@@ -24,7 +11,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/kbd.log
+    make check
     set -e
 fi
 
@@ -33,6 +20,3 @@ make install
 mkdir -pv           /usr/share/doc/kbd-2.4.0
 cp -R -v docs/doc/* /usr/share/doc/kbd-2.4.0
 
-cd /sources
-rm -rf ${PKG_KBD%.tar*}
-

phase4/kmod.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Kmod Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep KMOD $PACKAGE_LIST)"
-PKG_KMOD=$(basename $PKG_KMOD)
-
-tar -xf $PKG_KMOD
-cd ${PKG_KMOD%.tar*}
-
+# Kmod Phase 4
 ./configure --prefix=/usr          \
             --sysconfdir=/etc      \
             --with-openssl         \
@@ -28,6 +16,3 @@ done
 
 ln -sf kmod /usr/bin/lsmod
 
-cd /sources
-rm -rf ${PKG_KMOD%.tar*}
-

phase4/less.sh

@@ -1,22 +1,7 @@
-#!/usr/bin/env bash
-# Less Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep LESS $PACKAGE_LIST)"
-PKG_LESS=$(basename $PKG_LESS)
-
-tar -xf $PKG_LESS
-cd ${PKG_LESS%.tar*}
-
+# Less Phase 4
 ./configure --prefix=/usr --sysconfdir=/etc
 
 make
 
 make install
 
-cd /sources
-rm -rf ${PKG_LESS%.tar*}
-

phase4/lfsbootscripts.sh

@@ -1,21 +1,6 @@
-#!/usr/bin/env bash
-# LFS Boot Scripts Stage 6
-# ~~~~~~~~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep LFSBOOTSCRIPTS $PACKAGE_LIST)"
-PKG_LFSBOOTSCRIPTS=$(basename $PKG_LFSBOOTSCRIPTS)
-
-tar -xf $PKG_LFSBOOTSCRIPTS
-cd ${PKG_LFSBOOTSCRIPTS%.tar*}
-
+# LFS Boot Scripts Phase 4
 make install
 
 # generate network interface name rules
 bash /usr/lib/udev/init-net-rules.sh
 
-cd /sources
-rm -rf ${PKG_LFSBOOTSCRIPTS%.tar*}
-

phase4/libcap.sh

@@ -1,28 +1,13 @@
-#!/usr/bin/env bash
-# Libcap Stage 6
-# ~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep LIBCAP $PACKAGE_LIST)"
-PKG_LIBCAP=$(basename $PKG_LIBCAP)
-
-tar -xf $PKG_LIBCAP
-cd ${PKG_LIBCAP%.tar*}
-
+# Libcap Phase 4
 sed -i '/install -m.*STA/d' libcap/Makefile
 make prefix=/usr lib=lib
 
 if $RUN_TESTS
 then
     set +e
-    make test &> $TESTLOG_DIR/libcap.log
+    make test
     set -e
 fi
 
 make prefix=/usr lib=lib install
 
-cd /sources
-rm -rf ${PKG_LIBCAP%.tar*}
-

phase4/libffi.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Libffi Stage 6
-# ~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep LIBFFI $PACKAGE_LIST)"
-PKG_LIBFFI=$(basename $PKG_LIBFFI)
-
-tar -xf $PKG_LIBFFI
-cd ${PKG_LIBFFI%.tar*}
-
+# Libffi Phase 4
 ./configure --prefix=/usr          \
             --disable-static       \
             --with-gcc-arch=native \
@@ -21,12 +9,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/libffi.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_LIBFFI%.tar*}
-

phase4/libpipeline.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Libpipeline Stage 6
-# ~~~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep LIBPIPELINE $PACKAGE_LIST)"
-PKG_LIBPIPELINE=$(basename $PKG_LIBPIPELINE)
-
-tar -xf $PKG_LIBPIPELINE
-cd ${PKG_LIBPIPELINE%.tar*}
-
+# Libpipeline Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/libpipeline.sh
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_LIBPIPELINE%.tar*}
-

phase4/libtool.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Libtool Stage 6
-# ~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep LIBTOOL $PACKAGE_LIST)"
-PKG_LIBTOOL=$(basename $PKG_LIBTOOL)
-
-tar -xf $PKG_LIBTOOL
-cd ${PKG_LIBTOOL%.tar*}
-
+# Libtool Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,7 +6,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check TESTSUITEFLAGS=-j4 &> $TESTLOG_DIR/libtool.log
+    make check TESTSUITEFLAGS=-j4
     set -e
 fi
 
@@ -26,6 +14,3 @@ make install
 
 rm -f /usr/lib/libltdl.a
 
-cd /sources
-rm -rf ${PKG_LIBTOOL%.tar*}
-

phase4/linux.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# LINUX Stage 6
+# LINUX Phase 4
 # ~~~~~~~~~~~~~
 set -e
 

phase4/m4.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# M4 Stage 6
-# ~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep M4 $PACKAGE_LIST)"
-PKG_M4=$(basename $PKG_M4)
-
-tar -xf $PKG_M4
-cd ${PKG_M4%.tar*}
-
+# M4 Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/m4.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_M4%.tar*}
-

phase4/make.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Make Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep MAKE $PACKAGE_LIST)"
-PKG_MAKE=$(basename $PKG_MAKE)
-
-tar -xf $PKG_MAKE
-cd ${PKG_MAKE%.tar*}
-
+# Make Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/make.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_MAKE%.tar*}
-

phase4/mandb.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Man-DB Stage 6
-# ~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep MANDB $PACKAGE_LIST)"
-PKG_MANDB=$(basename $PKG_MANDB)
-
-tar -xf $PKG_MANDB
-cd ${PKG_MANDB%.tar*}
-
+# Man-DB Phase 4
 ./configure --prefix=/usr                         \
             --docdir=/usr/share/doc/man-db-2.10.1 \
             --sysconfdir=/etc                     \
@@ -27,12 +15,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/mandb.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_MANDB%.tar*}
-

phase4/mandoc.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# mandoc Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep MANDOC $PACKAGE_LIST)"
-PKG_MANDOC=$(basename $PKG_MANDOC)
-
-tar -xf $PKG_MANDOC
-cd ${PKG_MANDOC%.tar*}
-
+# mandoc Phase 4
 ./configure
 
 make mandoc
@@ -18,13 +6,10 @@ make mandoc
 if $RUN_TESTS
 then
     set +e
-    make regress &> $TESTLOG_DIR/mandoc.log
+    make regress
     set -e
 fi
 
 install -vm755 mandoc   /usr/bin
 install -vm644 mandoc.1 /usr/share/man/man1
 
-cd /sources
-rm -rf ${PKG_MANDOC%.tar*}
-

phase4/meson.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Meson Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep MESON $PACKAGE_LIST)"
-PKG_MESON=$(basename $PKG_MESON)
-
-tar -xf $PKG_MESON
-cd ${PKG_MESON%.tar*}
-
+# Meson Phase 4
 python3 setup.py build
 
 python3 setup.py install --root=dest
@@ -18,6 +6,3 @@ cp -r dest/* /
 install -Dm644 data/shell-completions/bash/meson /usr/share/bash-completion/completions/meson
 install -Dm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/_meson
 
-cd /sources
-rm -rf ${PKG_MESON%.tar*}
-

phase4/mpc.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# MPC Stage 6
-# ~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep MPC $PACKAGE_LIST)"
-PKG_MPC=$(basename $PKG_MPC)
-
-tar -xf $PKG_MPC
-cd ${PKG_MPC%.tar*}
-
+# MPC Phase 4
 ./configure --prefix=/usr    \
             --disable-static \
             --docdir=/usr/share/doc/mpc-1.2.1
@@ -21,13 +9,10 @@ make html
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/mpc.log
+    make check
     set -e
 fi
 
 make install
 make install-html
 
-cd /sources
-rm -rf ${PKG_MPC%.tar*}
-

phase4/mpfr.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# MPFR Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep MPFR $PACKAGE_LIST)"
-PKG_MPFR=$(basename $PKG_MPFR)
-
-tar -xf $PKG_MPFR
-cd ${PKG_MPFR%.tar*}
-
+# MPFR Phase 4
 ./configure --prefix=/usr        \
             --disable-static     \
             --enable-thread-safe \
@@ -22,13 +10,10 @@ make html
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/mpfr.log
+    make check
     set -e
 fi
 
 make install
 make install-html
 
-cd /sources
-rm -rf ${PKG_MPFR%.tar*}
-

phase4/ncurses.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Ncurses Stage 6
-# ~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep NCURSES $PACKAGE_LIST)"
-PKG_NCURSES=$(basename $PKG_NCURSES)
-
-tar -xf $PKG_NCURSES
-cd ${PKG_NCURSES%.tar*}
-
+# Ncurses Phase 4
 ./configure --prefix=/usr           \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -40,6 +28,3 @@ ln -sf libncurses.so      /usr/lib/libcurses.so
 mkdir -p      /usr/share/doc/ncurses-6.3
 cp -R doc/* /usr/share/doc/ncurses-6.3
 
-cd /sources
-rm -rf ${PKG_NCURSES%.tar*}
-

phase4/ninja.sh

@@ -1,15 +1,5 @@
-#!/usr/bin/env bash
-# Ninja Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep NINJA $PACKAGE_LIST)"
-PKG_NINJA=$(basename $PKG_NINJA)
-
-tar -xf $PKG_NINJA
-cd ${PKG_NINJA%.tar*}
+# Ninja Phase 4
+export NINJAJOBS=4
 
 sed -i '/int Guess/a \
   int   j = 0;\
@@ -24,7 +14,7 @@ if $RUN_TESTS
 then
     set +e
     ./ninja ninja_test
-    ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots &> $TESTLOG_DIR/ninja.log
+    ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots
     set -e
 fi
 
@@ -32,6 +22,3 @@ install -m755 ninja /usr/bin/
 install -Dm644 misc/bash-completion /usr/share/bash-completion/completions/ninja
 install -Dm644 misc/zsh-completion  /usr/share/zsh/site-functions/_ninja
 
-cd /sources
-rm -rf ${PKG_NINJA%.tar*}
-

phase4/openssl.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# OpenSSL Stage 6
-# ~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep OPENSSL $PACKAGE_LIST)"
-PKG_OPENSSL=$(basename $PKG_OPENSSL)
-
-tar -xf $PKG_OPENSSL
-cd ${PKG_OPENSSL%.tar*}
-
+# OpenSSL Phase 4
 ./config --prefix=/usr         \
          --openssldir=/etc/ssl \
          --libdir=lib          \
@@ -22,7 +10,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make test &> $TESTLOG_DIR/openssl.log
+    make test
     set -e
 fi
 
@@ -33,6 +21,3 @@ mv /usr/share/doc/openssl /usr/share/doc/openssl-3.0.1
 
 cp -fr doc/* /usr/share/doc/openssl-3.0.1
 
-cd /sources
-rm -rf ${PKG_OPENSSL%.tar*}
-

phase4/patch.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Patch Stage 6
-# ~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep PATCH $PACKAGE_LIST)"
-PKG_PATCH=$(basename $PKG_PATCH)
-
-tar -xf $PKG_PATCH
-cd ${PKG_PATCH%.tar*}
-
+# Patch Phase 4
 ./configure --prefix=/usr
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/patch.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_PATCH%.tar*}
-

phase4/perl.sh

@@ -1,18 +1,5 @@
-#!/usr/bin/env bash
-# Perl Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep PERL $PACKAGE_LIST)"
-PKG_PERL=$(basename $PKG_PERL)
-PATCH_PERL=$(basename $PATCH_PERL)
-
-tar -xf $PKG_PERL
-cd ${PKG_PERL%.tar*}
-
-patch -Np1 -i ../$PATCH_PERL
+# Perl Phase 4
+patch -Np1 -i ../$(basename $PATCH_PERL)
 
 export BUILD_ZLIB=False
 export BUILD_BZIP2=0
@@ -37,12 +24,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make test &> $TESTLOG_DIR/perl.log
+    make test
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_PERL%.tar*}
-

phase4/pkgconfig.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Pkg-config Stage 6
-# ~~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep PKGCONFIG $PACKAGE_LIST)"
-PKG_PKGCONFIG=$(basename $PKG_PKGCONFIG)
-
-tar -xf $PKG_PKGCONFIG
-cd ${PKG_PKGCONFIG%.tar*}
-
+# Pkg-config Phase 4
 ./configure --prefix=/usr              \
             --with-internal-glib       \
             --disable-host-tool        \
@@ -21,12 +9,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/pkgconfig.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_PKGCONFIG%.tar*}
-

phase4/popt.sh

@@ -1,22 +1,7 @@
-#!/usr/bin/env bash
-# Popt Stage 6
-# ~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep POPT $PACKAGE_LIST)"
-PKG_POPT=$(basename $PKG_POPT)
-
-tar -xf $PKG_POPT
-cd ${PKG_POPT%.tar*}
-
+# Popt Phase 4
 ./configure --prefix=/usr --disable-static
 
 make
 
 make install
 
-cd /sources
-rm -rf ${PKG_POPT%.tar*}
-

phase4/procps.sh

@@ -1,17 +1,4 @@
-#!/usr/bin/env bash
-# Procps-ng Stage 6
-# ~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep PROCPS $PACKAGE_LIST)"
-PKG_PROCPS=$(basename $PKG_PROCPS)
-
-tar -xf $PKG_PROCPS
-#cd ${PKG_PROCPS%.tar*}
-cd procps-3.3.17
-
+# Procps-ng Phase 4
 ./configure --prefix=/usr                            \
             --docdir=/usr/share/doc/procps-ng-3.3.17 \
             --disable-static                         \
@@ -22,13 +9,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/procps.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-#rm -rf ${PKG_PROCPS%.tar*}
-rm -rf procps-3.3.17
-

phase4/psmisc.sh

@@ -1,22 +1,7 @@
-#!/usr/bin/env bash
-# Psmisc Stage 6
-# ~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep PSMISC $PACKAGE_LIST)"
-PKG_PSMISC=$(basename $PKG_PSMISC)
-
-tar -xf $PKG_PSMISC
-cd ${PKG_PSMISC%.tar*}
-
+# Psmisc Phase 4
 ./configure --prefix=/usr
 
 make
 
 make install
 
-cd /sources
-rm -rf ${PKG_PSMISC%.tar*}
-

phase4/python.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Python Stage 6
-# ~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep PYTHON $PACKAGE_LIST)"
-PKG_PYTHON=$(basename $PKG_PYTHON)
-
-tar -xf $PKG_PYTHON
-cd ${PKG_PYTHON%.tar*}
-
+# Python Phase 4
 ./configure --prefix=/usr        \
             --enable-shared      \
             --with-system-expat  \
@@ -30,6 +18,3 @@ tar --strip-components=1  \
     -C /usr/share/doc/python-3.10.2/html \
     -xvf ../python-3.10.2-docs-html.tar.bz2
 
-cd /sources
-rm -rf ${PKG_PYTHON%.tar*}
-

phase4/readline.sh

@@ -1,29 +1,14 @@
-#!/usr/bin/env bash
-# Readline Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep READLINE $PACKAGE_LIST)"
-PKG_READLINE=$(basename $PKG_READLINE)
-
-tar -xf $PKG_READLINE
-cd ${PKG_READLINE%.tar*}
-
+# Readline Phase 4
 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/${PKG_READLINE%.tar*}
+            --docdir=/usr/share/doc/readline-8.1.2
 
 make SHLIB_LIBS="-lncursesw"
 make SHLIB_LIBS="-lncursesw" install
 
 install -m644 doc/*.{ps,pdf,html,dvi} /usr/share/doc/readline-8.1.2
 
-cd /sources
-rm -rf ${PKG_READLINE%.tar*}
-

phase4/sed.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Sed Stage 6
-# ~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep SED $PACKAGE_LIST)"
-PKG_SED=$(basename $PKG_SED)
-
-tar -xf $PKG_SED
-cd ${PKG_SED%.tar*}
-
+# Sed Phase 4
 ./configure --prefix=/usr
 
 make
@@ -20,7 +8,7 @@ if $RUN_TESTS
 then
     set +e
     chown -R tester .
-    su tester -c "PATH=$PATH make check" &> $TESTLOG_DIR/sed.log
+    su tester -c "PATH=$PATH make check"
     set -e
 fi
 
@@ -28,6 +16,3 @@ make install
 install -d -m755 /usr/share/doc/sed-4.8
 install -m644 doc/sed.html /usr/share/doc/sed-4.8
 
-cd /sources
-rm -rf ${PKG_SED%.tar*}
-

phase4/shadow.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Shadow Stage 6
-# ~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep SHADOW $PACKAGE_LIST)"
-PKG_SHADOW=$(basename $PKG_SHADOW)
-
-tar -xf $PKG_SHADOW
-cd ${PKG_SHADOW%.tar*}
-
+# Shadow Phase 4
 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 / /' {} \;
@@ -38,6 +26,3 @@ useradd -D --gid 999
 
 echo "root:$ROOT_PASSWD" | chpasswd
 
-cd /sources
-rm -rf ${PKG_SHADOW%.tar*}
-

phase4/sysklogd.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Sysklogd Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep SYSKLOGD $PACKAGE_LIST)"
-PKG_SYSKLOGD=$(basename $PKG_SYSKLOGD)
-
-tar -xf $PKG_SYSKLOGD
-cd ${PKG_SYSKLOGD%.tar*}
-
+# Sysklogd Phase 4
 sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c
 sed -i 's/union wait/int/' syslogd.c
 
@@ -18,6 +6,3 @@ make
 
 make BINDIR=/sbin install
 
-cd /sources
-rm -rf ${PKG_SYSKLOGD%.tar*}
-

phase4/sysvinit.sh

@@ -1,23 +1,7 @@
-#!/usr/bin/env bash
-# Sysvinit Stage 6
-# ~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep SYSVINIT $PACKAGE_LIST)"
-PKG_SYSVINIT=$(basename $PKG_SYSVINIT)
-PATCH_SYSVINIT=$(basename $PATCH_SYSVINIT)
-
-tar -xf $PKG_SYSVINIT
-cd ${PKG_SYSVINIT%.tar*}
-
-patch -Np1 -i ../$PATCH_SYSVINIT
+# Sysvinit Phase 4
+patch -Np1 -i ../$(basename $PATCH_SYSVINIT)
 
 make
 
 make install
 
-cd /sources
-rm -rf ${PKG_SYSVINIT%.tar*}
-

phase4/tar.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Tar Stage 6
-# ~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep TAR $PACKAGE_LIST)"
-PKG_TAR=$(basename $PKG_TAR)
-
-tar -xf $PKG_TAR
-cd ${PKG_TAR%.tar*}
-
+# Tar Phase 4
 FORCE_UNSAFE_CONFIGURE=1  \
 ./configure --prefix=/usr
 
@@ -19,7 +7,7 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/tar.log
+    make check 
     set -e
 fi
 
@@ -27,6 +15,3 @@ make install
 
 make -C doc install-html docdir=/usr/share/doc/tar-1.34
 
-cd /sources
-rm -rf ${PKG_TAR%.tar*}
-

phase4/tcl.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Tcl Stage 6
-# ~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep TCL $PACKAGE_LIST)"
-PKG_TCL=$(basename $PKG_TCL)
-
-tar -xf $PKG_TCL
-cd ${PKG_TCL%-src.tar*}
-
+# Tcl Phase 4
 tar -xf ../$(basename $PKG_TCLDOCS) --strip-components=1
 SRCDIR=$(pwd)
 cd unix
@@ -40,7 +28,7 @@ unset SRCDIR
 if $RUN_TESTS
 then
     set +e
-    make test &> $TESTLOG_DIR/tcl.log
+    make test
     set -e
 fi
 
@@ -57,6 +45,3 @@ mv /usr/share/man/man3/{Thread,Tcl_Thread}.3
 mkdir -p /usr/share/doc/tcl-8.6.12
 cp -r  ../html/* /usr/share/doc/tcl-8.6.12
 
-cd /sources
-rm -rf ${PKG_TCL%-src.tar*}
-

phase4/texinfo.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Texinfo Stage 6
-# ~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep TEXINFO $PACKAGE_LIST)"
-PKG_TEXINFO=$(basename $PKG_TEXINFO)
-
-tar -xf $PKG_TEXINFO
-cd ${PKG_TEXINFO%.tar*}
-
+# Texinfo Phase 4
 ./configure --prefix=/usr
 
 sed -e 's/__attribute_nonnull__/__nonnull/' \
@@ -21,12 +9,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make check &> $TESTLOG_DIR/texinfo.log
+    make check
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_TEXINFO%.tar*}
-

phase4/utillinux.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Util-linux Stage 6
-# ~~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep UTILLINUX $PACKAGE_LIST)"
-PKG_UTILLINUX=$(basename $PKG_UTILLINUX)
-
-tar -xf $PKG_UTILLINUX
-cd ${PKG_UTILLINUX%.tar*}
-
+# Util-linux Phase 4
 ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
             --bindir=/usr/bin    \
             --libdir=/usr/lib    \
@@ -34,12 +22,9 @@ if $RUN_TESTS
 then
     set +e
     chown -Rv tester .
-    su tester -c "make -k check" &> $TESTLOG_DIR/utillinux.log
+    su tester -c "make -k check"
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_UTILLINUX%.tar*}
-

phase4/vim.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# Vim Stage 6
-# ~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep VIM $PACKAGE_LIST)"
-PKG_VIM=$(basename $PKG_VIM)
-
-tar -xf $PKG_VIM
-cd ${PKG_VIM%.tar*}
-
+# Vim Phase 4
 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 
 ./configure --prefix=/usr
@@ -21,30 +9,11 @@ if $RUN_TESTS
 then
     set +e
     chown -R tester .
-    su tester -c "LANG=en_US.UTF-8 make -j1 test" &> vim-test.log
+    su tester -c "LANG=en_US.UTF-8 make -j1 test"
     set -e
 fi
 
 make install
 
-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
-
-cd /sources
-rm -rf ${PKG_VIM%.tar*}
+ln -sv ../vim/vim82/doc /usr/share/doc/vim-8.2.4383
 

phase4/xmlparser.sh

@@ -1,16 +1,4 @@
-#!/usr/bin/env bash
-# XML::Parser Stage 6
-# ~~~~~~~~~~~~~~~~~~~
-set -e
-
-cd /sources
-
-eval "$(grep XMLPARSER $PACKAGE_LIST)"
-PKG_XMLPARSER=$(basename $PKG_XMLPARSER)
-
-tar -xf $PKG_XMLPARSER
-cd ${PKG_XMLPARSER%.tar*}
-
+# XML::Parser Phase 4
 perl Makefile.PL
 
 make
@@ -18,12 +6,9 @@ make
 if $RUN_TESTS
 then
     set +e
-    make test &> $TESTLOG_DIR/xmlparser.log
+    make test
     set -e
 fi
 
 make install
 
-cd /sources
-rm -rf ${PKG_XMLPARSER%.tar*}
-

phase4/xz.sh

@@ -1,7 +1,7 @@
 # Xz Phase 4
 ./configure --prefix=/usr    \
             --disable-static \
-            --docdir=/usr/share/doc/${PKG_XZ%.tar*}
+            --docdir=/usr/share/doc/xz-5.2.5
 
 make
 

static/etc__ld.so.conf

@@ -0,0 +1,2 @@
+/usr/local/lib
+/opt/lib

static/etc__nsswitch.conf

@@ -0,0 +1,11 @@
+passwd: files
+group: files
+shadow: files
+
+hosts: files dns
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files

static/etc__syslog.conf

@@ -0,0 +1,8 @@
+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 *
+

static/etc__vimrc

@@ -0,0 +1,12 @@
+" 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
+

test.sh

@@ -1 +0,0 @@
-echo $TEST