From da1860a27b6328eefa4c5545f4e7fafa3abe64d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Fri, 18 Jan 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.

---
 subr/pkg_install.subr     | 3 ++-
 subr/pkg_install_rpm.subr | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'subr')

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
-- 
cgit v1.2.3