4 files changed, 31 insertions, 17 deletions
diff --git a/vars/build.vars b/vars/build.vars
index 39ed6e75..4f4047cc 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1138,18 +1138,18 @@ NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python";
 
 #
-# Build target dist_minipix
+# Build target minipix
 #
-DIST_MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
-DIST_MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
-DIST_MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
-DIST_MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
-DIST_MINIPIX_PACKAGES="
+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_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+MINIPIX_PACKAGES="
 bzip2_minipix gzip_minipix xz_minipix bash_minipix coreutils_minipix
 dash_minipix nano_minipix tar_minipix mintty_minipix ntctty_minipix
 ptycon_minipix";
-DIST_MINIPIX_PARALLELISE=1;
-DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist";
+MINIPIX_PARALLELISE=1;
+MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 : ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2};
 : ${PKG_BZIP2_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/bzip2-build-minipix};
 : ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"};
@@ -1201,10 +1201,16 @@ DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 : ${PKG_PTYCON_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 
 #
-# Build target dist_target
+# Build target dist
 #
-DIST_TARGET_NO_LOG_VARS=1;
-DIST_TARGET_PACKAGES="dist_minipix_dist dist_etc dist_digest dist_gitref dist_tarballs";
+DIST_NO_LOG_VARS=1;
+DIST_PACKAGES="dist_minipix_dist dist_etc";
+
+#
+# Build target invariants
+#
+INVARIANTS_NO_LOG_VARS=1;
+INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_tarballs";
 
 #
 # Build targets
@@ -1214,6 +1220,6 @@ host_tools host_toolchain_deps host_toolchain host_toolchain_mingw32
 native_tools native_toolchain_deps native_toolchain native_toolchain_mingw32 native_runtime
 host_packages_deps native_packages_deps native_packages_deps_x11
 native_packages
-dist_minipix dist_target";
+minipix dist";
 
 # vim:filetype=sh textwidth=0
diff --git a/vars/dist_digest.vars b/vars/invariants_digest.vars
index d831beb9..9d29d59f 100644
--- a/vars/dist_digest.vars
+++ b/vars/invariants_digest.vars
@@ -2,9 +2,13 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_dist_digest_all() {
+pkg_invariants_digest_all() {
 	local __;
-	ex_rtl_log_msg info "Compiling SHA256 sums...";
+	if [ -z "${ARG_TARBALL}" ]; then
+		exit 0;
+	else
+		ex_rtl_log_msg info "Compiling SHA256 sums...";
+	fi;
 	if [ -e "${PREFIX}/SHA256SUMS" ]; then
 		ex_rtl_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last";
 	fi;
diff --git a/vars/dist_gitref.vars b/vars/invariants_gitref.vars
index 4ebab3db..7af5c4a3 100644
--- a/vars/dist_gitref.vars
+++ b/vars/invariants_gitref.vars
@@ -2,7 +2,7 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_dist_gitref_all() {
+pkg_invariants_gitref_all() {
 	(ex_rtl_fileop cd "${MIDIPIX_BUILD_PWD}" && git rev-parse HEAD > "${PREFIX}/build.gitref");
 };
 
diff --git a/vars/dist_tarballs.vars b/vars/invariants_tarballs.vars
index a63bc0f2..3516b79a 100644
--- a/vars/dist_tarballs.vars
+++ b/vars/invariants_tarballs.vars
@@ -64,8 +64,12 @@ pkgp_dist_tarball_src() {
 	fi;
 };
 
-pkg_dist_tarballs_all() {
-	ex_rtl_log_msg info "Building distribution tarballs...";
+pkg_invariants_tarballs_all() {
+	if [ -z "${ARG_TARBALL}" ]; then
+		exit 0;
+	else
+		ex_rtl_log_msg info "Building distribution tarballs...";
+	fi;
 	case "${DEFAULT_TARBALL_SUFFIX}" in
 	bz2)	if [ -n "$(which pbzip2 2>/dev/null)" ]; then
 			TARBALL_COMPRESS_CMD="pbzip2";