summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--vars/invariants_zipdist.vars28
-rw-r--r--vars/midipix.vars1
2 files changed, 17 insertions, 12 deletions
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};