vars/build.vars:minipix: adds {grep,pcre,sed}_minipix.

vars/build.vars:minipix: remove and merge unnecessary package variables, split dependencies.
vars/build.vars:native_packages_etc: adds debianutils v4.8.4 (via Redfoxmoon.)

2 files changed, 25 insertions, 47 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 60bb6c5a..df6d74a2 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -958,11 +958,17 @@ patch patchutils perl python2 python3 ruby smallbasic tcl";
 #
 # Packages list native_packages_etc
 NATIVE_PACKAGES_ETC_PACKAGES="
-cron hexcurse htop infounzip infozip john less mc mintty nano ncdu
+cron debianutils hexcurse htop infounzip infozip john less mc mintty nano ncdu
 p7zip procps_ng qpdf rw rxvt_unicode st tmux vim xeyes xorriso xterm xwd";
 : ${PKG_CRON_URLS_GIT:="pkg-cron.git=git://anonscm.debian.org/pkg-cron/pkg-cron.git@debian/3.0pl1-128"};
 : ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"};
 : ${PKG_CRON_IN_TREE:=1};
+: ${PKG_DEBIANUTILS_SHA256SUM:=c061ab99aea61f892043b7624b021ab5b193e9c6bbfd474da0fbcdd506be1eb2};
+: ${PKG_DEBIANUTILS_VERSION:=4.8.4};
+: ${PKG_DEBIANUTILS_URL:=http://http.debian.net/debian/pool/main/d/debianutils/debianutils_${PKG_DEBIANUTILS_VERSION}.tar.xz};
+: ${PKG_DEBIANUTILS_SUBDIR:=debianutils};
+: ${PKG_DEBIANUTILS_BUILD_STEPS_DISABLE:=install_make};
+: ${PKG_DEBIANUTILS_INSTALL_FILES:="../obj/run-parts=bin/ ../debianutils/run-parts.8=share/man/man8/"};
 : ${PKG_HEXCURSE_URLS_GIT:="hexcurse=https://github.com/LonnyGomes/hexcurse@master"};
 : ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
 : ${PKG_HTOP_SHA256SUM:=f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666};
@@ -1193,92 +1199,63 @@ NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python";
 #
 MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
-MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE} -mvrfs";
+MINIPIX_LDFLAGS_BUILD="--sysroot=${PREFIX_NATIVE} -mvrfs";
 MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 MINIPIX_PACKAGES="
-bzip2_minipix gzip_minipix tar_minipix xz_minipix
-bash_minipix coreutils_minipix curl_minipix dash_minipix diffutils_minipix findutils_minipix gawk_minipix less_minipix nano_minipix patch_minipix vim_minipix which_minipix
+bzip2_minipix gzip_minipix pcre_minipix xz_minipix
+bash_minipix coreutils_minipix curl_minipix dash_minipix diffutils_minipix findutils_minipix gawk_minipix grep_minipix less_minipix nano_minipix patch_minipix sed_minipix tar_minipix vim_minipix which_minipix
 mintty_minipix ntctty_minipix perk_minipix ptycon_minipix";
 MINIPIX_PARALLELISE=1;
 MINIPIX_PREFIX="${PREFIX}/minipix_dist";
+
+#
+# Dependencies
 : ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2};
-: ${PKG_BZIP2_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/bzip2-build-minipix};
 : ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"};
 : ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"};
-: ${PKG_BZIP2_MINIPIX_LDFLAGS_BUILD_EXTRA:="--sysroot=${PREFIX_NATIVE} -mvrfs"};
 : ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"};
 : ${PKG_GZIP_MINIPIX_INHERIT_FROM:=gzip};
-: ${PKG_GZIP_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/gzip-build-minipix};
 : ${PKG_GZIP_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
-: ${PKG_GZIP_MINIPIX_LDFLAGS_BUILD_EXTRA:="-mvrfs"};
-: ${PKG_GZIP_MINIPIX_LDFLAGS_INSTALL_EXTRA:="-mvrfs"};
 : ${PKG_GZIP_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="OBJA="};
-: ${PKG_TAR_MINIPIX_INHERIT_FROM:=tar};
-: ${PKG_TAR_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/tar-build-minipix};
-: ${PKG_TAR_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
-: ${PKG_TAR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"};
+: ${PKG_PCRE_MINIPIX_INHERIT_FROM:=pcre};
 : ${PKG_XZ_MINIPIX_INHERIT_FROM:=xz};
-: ${PKG_XZ_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/xz-build-minipix};
-: ${PKG_XZ_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 
+#
+# 3rd party packages
 : ${PKG_BASH_MINIPIX_INHERIT_FROM:=bash};
-: ${PKG_BASH_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/bash-build-minipix};
 : ${PKG_BASH_MINIPIX_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_BASH_MINIPIX_INSTALL_FILES:="../obj/bash=bin/ ../obj/bashbug=bin/"};
-: ${PKG_BASH_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils};
-: ${PKG_COREUTILS_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/coreutils-build-minipix};
 : ${PKG_COREUTILS_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
-: ${PKG_COREUTILS_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip};
 : ${PKG_CURL_MINIPIX_INHERIT_FROM:=curl};
-: ${PKG_CURL_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/curl-build-minipix};
-: ${PKG_CURL_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_DASH_MINIPIX_INHERIT_FROM:=dash};
-: ${PKG_DASH_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/dash-build-minipix};
 : ${PKG_DASH_MINIPIX_INSTALL_FILES:=bin/dash=bin/sh};
-: ${PKG_DASH_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_DIFFUTILS_MINIPIX_INHERIT_FROM:=diffutils};
-: ${PKG_DIFFUTILS_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/diffutils-build-minipix};
-: ${PKG_DIFFUTILS_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_FINDUTILS_MINIPIX_INHERIT_FROM:=findutils};
-: ${PKG_FINDUTILS_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/findutils-build-minipix};
-: ${PKG_FINDUTILS_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_GAWK_MINIPIX_INHERIT_FROM:=gawk};
-: ${PKG_GAWK_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/gawk-build-minipix};
-: ${PKG_GAWK_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
+: ${PKG_GREP_MINIPIX_INHERIT_FROM:=grep};
 : ${PKG_LESS_MINIPIX_INHERIT_FROM:=less};
-: ${PKG_LESS_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/less-build-minipix};
-: ${PKG_LESS_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_NANO_MINIPIX_INHERIT_FROM:=nano};
-: ${PKG_NANO_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/nano-build-minipix};
-: ${PKG_NANO_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_PATCH_MINIPIX_INHERIT_FROM:=patch};
-: ${PKG_PATCH_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/patch-build-minipix};
-: ${PKG_PATCH_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
+: ${PKG_SED_MINIPIX_INHERIT_FROM:=sed};
+: ${PKG_TAR_MINIPIX_INHERIT_FROM:=tar};
+: ${PKG_TAR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"};
 : ${PKG_VIM_MINIPIX_INHERIT_FROM:=vim};
-: ${PKG_VIM_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/vim-build-minipix};
-: ${PKG_VIM_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_WHICH_MINIPIX_INHERIT_FROM:=which};
-: ${PKG_WHICH_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/which-build-minipix};
-: ${PKG_WHICH_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 
+#
+# Midipix tools
 : ${PKG_MINTTY_MINIPIX_INHERIT_FROM:=mintty};
-: ${PKG_MINTTY_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/mintty-build-minipix};
 : ${PKG_MINTTY_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib -mvrfs"};
 : ${PKG_NTCTTY_MINIPIX_INHERIT_FROM:=ntctty};
-: ${PKG_NTCTTY_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/ntctty-build-minipix};
 : ${PKG_NTCTTY_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
 : ${PKG_NTCTTY_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"};
-: ${PKG_NTCTTY_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_PERK_MINIPIX_INHERIT_FROM:=perk};
-: ${PKG_PERK_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/perk-build-minipix};
-: ${PKG_PERK_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_PTYCON_MINIPIX_INHERIT_FROM:=ptycon};
-: ${PKG_PTYCON_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/ptycon-build-minipix};
 : ${PKG_PTYCON_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"};
 : ${PKG_PTYCON_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
-: ${PKG_PTYCON_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 
 #
 # Build target dist
diff --git a/vars/dist_minipix_dist.vars b/vars/dist_minipix_dist.vars
index a9c5a57c..478158d8 100644
--- a/vars/dist_minipix_dist.vars
+++ b/vars/dist_minipix_dist.vars
@@ -12,7 +12,8 @@ pkg_dist_minipix_dist_all() {
 		ex_rtl_fileop cp_follow "${_bin_pname}"	"${_dist_pfx}/bin";
 	done;
 	for _lib_name in libc.so libcurl.so.0 liblzma.so.5 libmagic.so.1		\
-			libncursesw.so.6 libpsxscl.so libu16ports.so.0 libz.so.1; do
+			libncursesw.so.6 libpcre.so.1 libpsxscl.so libu16ports.so.0	\
+			libz.so.1; do
 		ex_rtl_fileop cp_follow							\
 			"${PREFIX_NATIVE}/lib/${_lib_name}" "${_dist_pfx}/bin";
 	done;