diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-01-18 23:18:44 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-01-18 23:18:44 +0000 |
| commit | 36c4a8a8340e5c739148cb7a7121bf6110d0a173 (patch) | |
| tree | 4b185089c459ce81f63f3622db1e563c05f0a15b /vars | |
| parent | da1860a27b6328eefa4c5545f4e7fafa3abe64d8 (diff) | |
| download | midipix_build-36c4a8a8340e5c739148cb7a7121bf6110d0a173.tar.bz2 midipix_build-36c4a8a8340e5c739148cb7a7121bf6110d0a173.tar.xz | |
vars/build.vars:invariants: adds invariants_zipdist.
etc/build.usage, subr/build_args.subr: adds -z.
vars/invariants_tarballs.vars:pkgp_dist_tarball_src(): only include package build directories.
vars/invariants_zipdist.vars: added.
vars/midipix.vars: adds ${DEFAULT_ZIPDIST_FNAME_PREFIX}.
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/build.vars | 2 | ||||
| -rw-r--r-- | vars/invariants_tarballs.vars | 11 | ||||
| -rw-r--r-- | vars/invariants_zipdist.vars | 29 | ||||
| -rw-r--r-- | vars/midipix.vars | 1 |
4 files changed, 37 insertions, 6 deletions
diff --git a/vars/build.vars b/vars/build.vars index 1d4cff88..fa1f54c9 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1631,7 +1631,7 @@ DIST_PACKAGES="dist_minipix_dist dist_etc mpackage"; # Build target invariants # INVARIANTS_NO_LOG_VARS=1; -INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_tarballs"; +INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_tarballs invariants_zipdist"; # # Build targets diff --git a/vars/invariants_tarballs.vars b/vars/invariants_tarballs.vars index 98020827..d9a6aaad 100644 --- a/vars/invariants_tarballs.vars +++ b/vars/invariants_tarballs.vars @@ -50,11 +50,12 @@ pkgp_dist_tarball_minipix() { pkgp_dist_tarball_src() { TARBALL_SRC_FNAME="${DEFAULT_TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${DEFAULT_TARBALL_SUFFIX}"; ex_rtl_log_msg info "Building source tarball..."; - tar -cpf - $(find tmp -mindepth 2 -maxdepth 2 \ - -not -path tmp/.\* \ - -not -path tmp/ntctty\* \ - -not -path tmp/psxscl\* \ - -not -path tmp/ptycon\*) |\ + tar -C "${BUILD_WORKDIR}" -cpf - $(cd "${BUILD_WORKDIR}" && find \ + -maxdepth 1 -mindepth 1 \ + -name \*-\*-\* \ + \( -not -name ntctty\* \) \ + \( -not -name psxscl\* \) \ + \( -not -name ptycon\* \)) |\ "${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_SRC_FNAME}"; ex_rtl_log_msg info "Finished building source tarball."; if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] && \ diff --git a/vars/invariants_zipdist.vars b/vars/invariants_zipdist.vars new file mode 100644 index 00000000..b1f84b24 --- /dev/null +++ b/vars/invariants_zipdist.vars @@ -0,0 +1,29 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_invariants_zipdist_all() { + local _dist_fname="" _mpackage_dname=""; + if [ -z "${ARG_ZIPDIST}" ]; then + exit 0; + else + ex_rtl_log_msg info "Building deployable distribution ZIP archive..."; + _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" \ + --defroot=/dev/fs/c/midipix \ + --flysyms \ + --minroot="${PREFIX_MINIPIX}" \ + --objroot="${BUILD_WORKDIR}" \ + --pkgroot="${BUILD_WORKDIR}/pkgroot" \ + --product=Midipix \ + --subset="${PREFIX}/pkglist.native" \ + --symbols \ + --sysroot="${BUILD_WORKDIR}/sysroot" \ + --target="${DEFAULT_TARGET}" \ + --tmproot="${BUILD_WORKDIR}/tmproot" \ + --zipfile="${PREFIX}/${_dist_fname}"; + fi; +}; + +# vim:filetype=sh diff --git a/vars/midipix.vars b/vars/midipix.vars index 3406f6fe..f17a046f 100644 --- a/vars/midipix.vars +++ b/vars/midipix.vars @@ -85,6 +85,7 @@ : ${DEFAULT_TARBALL_MINIPIX_FNAME_PREFIX:=minipix-${ARCH}-${BUILD}.}; : ${DEFAULT_TARBALL_SRC_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}_src.}; : ${DEFAULT_TARBALL_SUFFIX:=xz}; +: ${DEFAULT_ZIPDIST_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}.}; # Check & clear predicates : ${DEFAULT_CHECK_PATH_VARS:=" |