From d377356690d60ab79e07354cdaeb7d2102557173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sat, 19 Jan 2019 00:41:41 +0000 Subject: 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. --- vars/invariants_tarballs.vars | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'vars/invariants_tarballs.vars') diff --git a/vars/invariants_tarballs.vars b/vars/invariants_tarballs.vars index d9a6aaad..1b89aeb0 100644 --- a/vars/invariants_tarballs.vars +++ b/vars/invariants_tarballs.vars @@ -48,14 +48,21 @@ pkgp_dist_tarball_minipix() { }; pkgp_dist_tarball_src() { + local _build_tgt_lc="" _build_tgt_uc="" _find_filters="" _pkg_name_lc="" _pkg_name_uc=""; 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..."; + for _build_tgt_lc in ${BUILD_TARGETS:-${TARGETS_DEFAULT}}; do + _build_tgt_uc="$(ex_rtl_toupper "${_build_tgt_lc}")"; + for _pkg_name_lc in $(ex_rtl_get_var_unsafe ${_build_tgt_uc}_PACKAGES); do + _pkg_name_uc="$(ex_rtl_toupper "${_pkg_name_lc}")"; + if [ "$(ex_rtl_get_var_unsafe ${_pkg_name_uc}_SRC_TARBALL_DISABLE)" = "1" ]; then + _find_filters="${_find_filters:+${_find_filters} }( -not -name ${_pkg_name}-\*-\* )"; + fi; + done; + done; tar -C "${BUILD_WORKDIR}" -cpf - $(cd "${BUILD_WORKDIR}" && find \ - -maxdepth 1 -mindepth 1 \ - -name \*-\*-\* \ - \( -not -name ntctty\* \) \ - \( -not -name psxscl\* \) \ - \( -not -name ptycon\* \)) |\ + -maxdepth 1 -mindepth 1 -name \*-\*-\* \ + ${_find_filters}) |\ "${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}" ] && \ -- cgit v1.2.3