- Additionally install ncursesw and ntctty into ${PREFIX_MINIPIX} and create Minipix tarball

  in 999.tarballs.build which solely contains ${PREFIX_MINIPIX}.
- Adds {bash,coreutils}_static which are linked statically and installed to ${PREFIX_MINIPIX}
  as opposed to {bash_coreutils} which are not linked statically and installed to ${PREFIX_NATIVE}.
- Adds file v5.28.
- Add support for ${PREFIX_MINIPIX} to midipix.sh (either automatically detected or specified via -m.)
- Adds verbosity flag -v wrt. secure_{cd,rm}() and insecure_mkdir().
- Build slibtool{_host,} w/ `--prefix='.
- Export ${ARG_TARBALL} instead of special-casing build level 9.
- Fix mc configure failure (error: could not determine how to read list of mounted file systems.)

1 files changed, 26 insertions, 6 deletions

diff --git a/build.vars b/build.vars
index 79019c11..5dd2d3b6 100644
--- a/build.vars
+++ b/build.vars
@@ -31,6 +31,7 @@ fi;
 
 : ${PREFIX_ROOT:=${HOME}/midipix};
 : ${PREFIX:=${PREFIX_ROOT}/${ARCH}/${BUILD}};
+: ${PREFIX_MINIPIX:=${PREFIX}/minipix};
 : ${PREFIX_NATIVE:=${PREFIX}/native};
 : ${PREFIX_CROSS:=${PREFIX}/${TARGET}};
 : ${DLCACHEDIR:=${PREFIX_ROOT}/dlcache};
@@ -43,7 +44,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${CHECK_PREREQ_CMDS:="aclocal autoconf autopoint awk basename bunzip2 find flex git groff gunzip install libtool lzma make makeinfo nl nroff openssl patch sed sha256sum sort tar tee tr uname wget xz"};
 : ${CHECK_PREREQ_FILES:="/usr/include/gmpxx.h /usr/include/mpc.h /usr/include/mpfr.h"};
 : ${CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS DLCACHEDIR WORKDIR"};
-: ${CLEAR_ENV_VARS_EXCEPT:="HOME PATH SHELL TERM USER"};
+: ${CLEAR_ENV_VARS_EXCEPT:="ARG_TARBALL ARG_VERBOSE HOME PATH SHELL TERM USER"};
 : ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec native share tmp x86_64-nt64-midipix"};
 : ${GITROOT:=git://midipix.org};
 : ${GITROOT_HEAD:=git://midipix.org};
@@ -54,6 +55,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${LOG_MSG_WARN_COLOUR:=96};
 : ${TARBALL_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}.};
 : ${TARBALL_SIGN_GPG_KEY:=};
+: ${TARBALL_MINIPIX_FNAME_PREFIX:=minipix-${ARCH}-${BUILD}.};
+: ${TARBALL_MINIPIX_SIGN_GPG_KEY:=};
 : ${TARBALL_SRC_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}_src.};
 : ${TARBALL_SRC_SIGN_GPG_KEY:=};
 : ${TARBALL_SUFFIX:=xz};
@@ -108,7 +111,8 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_PSXSTUB_URL_TYPE:=git};
 : ${PKG_SLIBTOOL_HOST_URL:=git://midipix.org/slibtool};
 : ${PKG_SLIBTOOL_HOST_URL_TYPE:=git};
-: ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--host= --prefix=${PREFIX}};
+: ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--host= --prefix=};
+: ${PKG_SLIBTOOL_HOST_MAKEFLAGS_INSTALL=DESTDIR=${PREFIX}};
 
 #
 # Build level 1 (native toolchain)
@@ -151,7 +155,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_PKGCONF_INSTALL_FILES:=/=lib/pkgconfig};
 : ${PKG_SLIBTOOL_URL:=git://midipix.org/slibtool};
 : ${PKG_SLIBTOOL_URL_TYPE:=git};
-: ${PKG_SLIBTOOL_CONFIGURE_ARGS="--host=${TARGET} --prefix=/ --target=${TARGET}"};
+: ${PKG_SLIBTOOL_CONFIGURE_ARGS="--host=${TARGET} --prefix= --target=${TARGET}"};
 
 #
 # Build level 2 (runtime components)
@@ -161,6 +165,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_NTCON_URL:=${GITROOT}/ntcon};
 : ${PKG_NTCTTY_URL:=${GITROOT_HEAD}/ntctty};
 : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0};
+: ${PKG_NTCTTY_PREFIX_EXTRA:=DESTDIR=${PREFIX_MINIPIX}};
 : ${PKG_PEMAGINE_URL:=${GITROOT}/pemagine};
 : ${PKG_PEMAGINE_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PSXSCL_URL:=${GITROOT_HEAD}/psxscl};
@@ -246,6 +251,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_NCURSESW_BUILD_DIR:=ncursesw-${PKG_NCURSESW_VERSION}-native-${TARGET}};
 : ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --program-prefix= --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --with-manpages --with-progs --without-tests --enable-widec --without-pthread"};
 : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
+: ${PKG_NCURSESW_PREFIX_EXTRA:=DESTDIR=${PREFIX_MINIPIX}};
 : ${PKG_PCRE_VERSION:=8.39};
 : ${PKG_PCRE_SHA256SUM:=ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7};
 : ${PKG_PCRE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PKG_PCRE_VERSION}.tar.gz};
@@ -344,12 +350,23 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_BASH_VERSION:=4.3};
 : ${PKG_BASH_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4};
 : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
-: ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"};
+: ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"};
+: ${PKG_BASH_STATIC_VERSION:=4.3};
+: ${PKG_BASH_STATIC_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4};
+: ${PKG_BASH_STATIC_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
+: ${PKG_BASH_STATIC_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"};
+: ${PKG_BASH_STATIC_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}/"};
+: ${PKG_BASH_STATIC_PREFIX=${PREFIX_MINIPIX}};
 : ${PKG_COREUTILS_VERSION:=8.23};
 : ${PKG_COREUTILS_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
-: ${PKG_COREUTILS_LDFLAGS_BUILD_EXTRA:=-static};
-: ${PKG_COREUTILS_MAKEFLAGS_BUILD_EXTRA:=SHARED=0};
+: ${PKG_COREUTILS_STATIC_VERSION:=8.23};
+: ${PKG_COREUTILS_STATIC_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
+: ${PKG_COREUTILS_STATIC_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
+: ${PKG_COREUTILS_STATIC_LDFLAGS_BUILD_EXTRA:=-static};
+: ${PKG_COREUTILS_STATIC_MAKEFLAGS_BUILD_EXTRA:=SHARED=0};
+: ${PKG_COREUTILS_STATIC_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}/"};
+: ${PKG_COREUTILS_STATIC_PREFIX=${PREFIX_MINIPIX}};
 : ${PKG_CRON_URL:=git://anonscm.debian.org/pkg-cron/pkg-cron.git};
 : ${PKG_CRON_URL_TYPE:=git};
 : ${PKG_CRON_BUILD_DIR:=pkg-cron.git};
@@ -370,6 +387,9 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_DIFFUTILS_VERSION:=3.3};
 : ${PKG_DIFFUTILS_SHA256SUM:=a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c};
 : ${PKG_DIFFUTILS_URL:=https://ftp.gnu.org/gnu/diffutils/diffutils-${PKG_DIFFUTILS_VERSION}.tar.xz};
+: ${PKG_FILE_VERSION:=5.28};
+: ${PKG_FILE_SHA256SUM:=0ecb5e146b8655d1fa84159a847ee619fc102575205a0ff9c6cc60fc5ee2e012};
+: ${PKG_FILE_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_VERSION}.tar.gz};
 : ${PKG_FINDUTILS_VERSION:=4.5.14};
 : ${PKG_FINDUTILS_SHA256SUM:=0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2};
 : ${PKG_FINDUTILS_URL:=http://alpha.gnu.org/gnu/findutils/findutils-${PKG_FINDUTILS_VERSION}.tar.gz};