From ec42183ec2fb5bee567f61e1dbdbba41a5b59f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sat, 19 Jan 2019 15:36:55 +0000
Subject: vars/invariants_zipdist.vars:pkg_invariants_zipdist_all(): move
 beneath ${BUILD_WORKDIR}/zipdist/ & remove temporary mpackage directories.
 vars/midipix.vars: adds ${DEFAULT_ZIPDIST_DEFROOT}.

---
 vars/invariants_zipdist.vars | 28 ++++++++++++++++------------
 vars/midipix.vars            |  1 +
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'vars')

diff --git a/vars/invariants_zipdist.vars b/vars/invariants_zipdist.vars
index 9a90b1a5..66f38a64 100644
--- a/vars/invariants_zipdist.vars
+++ b/vars/invariants_zipdist.vars
@@ -12,18 +12,22 @@ pkg_invariants_zipdist_all() {
 			fi;
 		done;
 		_dist_fname="${DEFAULT_ZIPDIST_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.zip";
-		"${BUILD_WORKDIR}/mpackage/mpackage.sh"		\
-			--defroot=/dev/fs/c/midipix		\
-			--flysyms				\
-			--minroot="${PREFIX_MINIPIX}"		\
-			--objroot="${BUILD_WORKDIR}"		\
-			--pkgroot="${BUILD_WORKDIR}/pkgroot"	\
-			--product=Midipix			\
-			--subset="${_pkglist_fname}"		\
-			--symbols				\
-			--sysroot="${BUILD_WORKDIR}/sysroot"	\
-			--target="${DEFAULT_TARGET}"		\
-			--tmproot="${BUILD_WORKDIR}/tmproot"	\
+		if [ -e "${BUILD_WORKDIR}/zipdist" ]; then
+			ex_rtl_fileop rm "${BUILD_WORKDIR}/zipdist";
+		fi;
+		ex_rtl_fileop mkdir "${BUILD_WORKDIR}/zipdist";
+		"${BUILD_WORKDIR}/mpackage/mpackage.sh"			\
+			--defroot="${DEFAULT_ZIPDIST_DEFROOT}"		\
+			--flysyms					\
+			--minroot="${PREFIX_MINIPIX}"			\
+			--objroot="${BUILD_WORKDIR}"			\
+			--pkgroot="${BUILD_WORKDIR}/zipdist/pkgroot"	\
+			--product=Midipix				\
+			--subset="${_pkglist_fname}"			\
+			--symbols					\
+			--sysroot="${BUILD_WORKDIR}/zipdist/sysroot"	\
+			--target="${DEFAULT_TARGET}"			\
+			--tmproot="${BUILD_WORKDIR}/zipdist/tmproot"	\
 			--zipfile="${PREFIX}/${_dist_fname}";
 	fi;
 };
diff --git a/vars/midipix.vars b/vars/midipix.vars
index 471670ca..669c0c3b 100644
--- a/vars/midipix.vars
+++ b/vars/midipix.vars
@@ -53,6 +53,7 @@
 : ${DEFAULT_MAKEFLAGS_BUILD:=-j${DEFAULT_BUILD_CPUS}};
 : ${DEFAULT_GIT_ARGS:=""};
 : ${DEFAULT_WGET_ARGS:="--no-check-certificate"};
+: ${DEFAULT_ZIPDIST_DEFROOT:="/dev/fs/c/midipix"};
 
 # Target-relative defaults
 : ${DEFAULT_CROSS_AR:=${DEFAULT_TARGET}-ar};
-- 
cgit v1.2.3