summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--subr/pkg_install.subr3
-rw-r--r--subr/pkg_install_rpm.subr3
-rw-r--r--vars/build.vars6
3 files changed, 9 insertions, 3 deletions
diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr
index c706cfc4..36ff31db 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 9fe67f37..8da10232 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 9fb97600..1d4cff88 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