summaryrefslogtreecommitdiffhomepage
path: root/vars/invariants_zipdist.vars
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2019-01-19 00:41:41 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2019-01-19 00:41:41 +0000
commitd377356690d60ab79e07354cdaeb7d2102557173 (patch)
tree74b873a7a555e25c16777e51fca2f60dc6b588a4 /vars/invariants_zipdist.vars
parent36c4a8a8340e5c739148cb7a7121bf6110d0a173 (diff)
downloadmidipix_build-d377356690d60ab79e07354cdaeb7d2102557173.tar.bz2
midipix_build-d377356690d60ab79e07354cdaeb7d2102557173.tar.xz
subr/pkg_install{,_rpm}.subr: honour ${PKG_{PKGLIST,RPM}_DISABLE}.
vars/build.vars:host_tools: moves mpackage from dist as mpackage_host. vars/build.vars:{ntctty,psxscl{,_strace},ptycon}: specify ${PKG_SRC_TARBALL_DISABLE:=1}. vars/build.vars:minipix: specify ${{PKGLIST,RPM}=1}. vars/dist_etc.vars: removed. vars/env.vars: adds {PKGLIST,RPM,SRC_TARBALL}_DISABLE. vars/invariants_tarballs.vars:pkgp_dist_tarball_src(): honour ${PKG_SRC_TARBALL_DISABLE}. vars/invariants_zipdist.vars: ensure build directories for packages in the pkglist.native exist. vars/{invariants_zipdist,mpackage_host}.vars: {reference,provide} mpackage/ symlink.
Diffstat (limited to 'vars/invariants_zipdist.vars')
-rw-r--r--vars/invariants_zipdist.vars12
1 files changed, 8 insertions, 4 deletions
diff --git a/vars/invariants_zipdist.vars b/vars/invariants_zipdist.vars
index b1f84b24..246e5562 100644
--- a/vars/invariants_zipdist.vars
+++ b/vars/invariants_zipdist.vars
@@ -3,21 +3,25 @@
#
pkg_invariants_zipdist_all() {
- local _dist_fname="" _mpackage_dname="";
+ local _dist_fname="" _pkg_name="" _pkglist_fname="${PREFIX}/pkglist.native";
if [ -z "${ARG_ZIPDIST}" ]; then
exit 0;
else
ex_rtl_log_msg info "Building deployable distribution ZIP archive...";
+ for _pkg_name in $(cat "${_pkglist_fname}"); do
+ if ! stat "${BUILD_WORKDIR}/${_pkg_name}-native-${DEFAULT_TARGET}" >/dev/null 2>&1; then
+ ex_rtl_log_msg failexit "Error: missing package build directory for package \`${_pkg_name}'.";
+ fi;
+ done;
_dist_fname="${DEFAULT_ZIPDIST_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.zip";
- _mpackage_dname="${BUILD_WORKDIR}/mpackage-native-${DEFAULT_TARGET}/mpackage";
- "${_mpackage_dname}/mpackage.sh" \
+ "${BUILD_WORKDIR}/mpackage/mpackage.sh" \
--defroot=/dev/fs/c/midipix \
--flysyms \
--minroot="${PREFIX_MINIPIX}" \
--objroot="${BUILD_WORKDIR}" \
--pkgroot="${BUILD_WORKDIR}/pkgroot" \
--product=Midipix \
- --subset="${PREFIX}/pkglist.native" \
+ --subset="${_pkglist_fname}" \
--symbols \
--sysroot="${BUILD_WORKDIR}/sysroot" \
--target="${DEFAULT_TARGET}" \