From da1860a27b6328eefa4c5545f4e7fafa3abe64d8 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
Date: Jan 18 2019 22:43:16 +0000
Subject: vars/build.vars:dist: adds mpackage (master.)

subr/pkg_install.subr:pkg_install(): exclude mpackage from package list files.
subr/pkg_install_rpm.subr:pkg_install_rpm(): exclude mpackage from RPM generation.

---

diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr
index c706cfc..36ff31d 100644
--- a/subr/pkg_install.subr
+++ b/subr/pkg_install.subr
@@ -18,7 +18,8 @@ pkg_install() {
 		tar -C "${PKG_DESTDIR}" -cpf - .	|\
 			gzip -c -9 - > "${PKG_BASE_DIR}/${PKG_NAME}.tgz"
 	fi;
-	if [ "${PKG_NAME%_minipix}" = "${PKG_NAME}" ]; then
+	if [ "${PKG_NAME%_minipix}" = "${PKG_NAME}" ]	\
+	&& [ "${PKG_NAME}" != "mpackage" ]; then
 		if [ ! -e "${PREFIX}/pkglist.${PKG_BUILD_TYPE}" ]; then
 			touch "${PREFIX}/pkglist.${PKG_BUILD_TYPE}";
 		fi;
diff --git a/subr/pkg_install_rpm.subr b/subr/pkg_install_rpm.subr
index 9fe67f3..8da1023 100644
--- a/subr/pkg_install_rpm.subr
+++ b/subr/pkg_install_rpm.subr
@@ -5,7 +5,8 @@
 pkg_install_rpm() {
 	local _pkg_url="" _pkg_version_full="" _pkg_version_rpm="";
 	if [ "${ARG_RPM:-0}" -eq 0 ]\
-	|| ! [ -x "$(which rpmbuild 2>/dev/null)" ]; then
+	|| ! [ -x "$(which rpmbuild 2>/dev/null)" ]\
+	|| [ "${PKG_NAME}" = "mpackage" ]; then
 		return 0;
 	fi; 
 	if [ -n "${PKG_URL}" ]; then
diff --git a/vars/build.vars b/vars/build.vars
index 9fb9760..1d4cff8 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1621,7 +1621,11 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 # Build target dist
 #
 DIST_NO_LOG_VARS=1;
-DIST_PACKAGES="dist_minipix_dist dist_etc";
+DIST_PACKAGES="dist_minipix_dist dist_etc mpackage";
+: ${PKG_MPACKAGE_URLS_GIT:=mpackage=${DEFAULT_GITROOT}/mpackage};
+: ${PKG_MPACKAGE_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
+: ${PKG_MPACKAGE_IN_TREE:=1};
+: ${PKG_MPACKAGE_PREFIX:=${PREFIX_NATIVE}};
 
 #
 # Build target invariants