diff options
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/env.vars | 15 | ||||
| -rw-r--r-- | vars/invariants_tarballs.vars | 89 |
2 files changed, 5 insertions, 99 deletions
diff --git a/vars/env.vars b/vars/env.vars index 64728b6c..eb58b8b6 100644 --- a/vars/env.vars +++ b/vars/env.vars @@ -21,14 +21,14 @@ DEFAULT_BUILD_VARS=" CXX CXXFLAGS_CONFIGURE_EXTRA DEPENDS DESTDIR DISABLED \ ENV_VARS_EXTRA FNAME GITROOT INHERIT_FROM INSTALL_FILES \ INSTALL_FILES INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA \ - INSTALL_TARGET INSTALL_TARGET_EXTRA IN_ORDER IN_TREE \ + INSTALL_TARGET INSTALL_TARGET_EXTRA IN_TREE \ LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA \ LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \ MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL \ MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_PATH PKGLIST_DISABLE \ - PREFIX RANLIB RPM_DISABLE SHA256SUM SRC_TARBALL_DISABLE SUBDIR \ - TARGET URL URL_TYPE URLS_GIT VERSION"; + PREFIX RANLIB RPM_DISABLE SHA256SUM SUBDIR TARGET URL URL_TYPE \ + URLS_GIT VERSION"; # Path names : ${PREFIX_ROOT:=${HOME}/midipix}; @@ -40,10 +40,8 @@ DEFAULT_BUILD_VARS=" : ${PREFIX_RPM:=${PREFIX}/rpm}; : ${BUILD_DLCACHEDIR:=${PREFIX_ROOT}/dlcache}; : ${BUILD_WORKDIR:=${PREFIX}/tmp}; -: ${DEFAULT_CHECK_PATH_VARS:=" - PREFIX PREFIX_NATIVE PREFIX_CROSS BUILD_DLCACHEDIR BUILD_WORKDIR"}; -: ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:=" - HOME PATH TERM DEFAULT_TARBALL_SIGN_GPG_KEY USER"}; +: ${DEFAULT_CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS BUILD_DLCACHEDIR BUILD_WORKDIR"}; +: ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:="HOME PATH TERM USER"}; : ${DEFAULT_CLEAR_PREFIX_PATHS:=" bin i686-nt32-midipix doc include info lib lib64 libexec man minipix minipix_dist native rpm sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32 pkglist.cross pkglist.host @@ -125,9 +123,6 @@ DEFAULT_BUILD_VARS=" : ${DEFAULT_BUILD_LOG_FNAME:=${PREFIX}/build.log}; : ${DEFAULT_BUILD_LOG_LAST_FNAME:=${PREFIX}/build.log.last}; : ${DEFAULT_BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS}; -: ${DEFAULT_TARBALL_CROSS_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}_cross.}; -: ${DEFAULT_TARBALL_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}.}; -: ${DEFAULT_TARBALL_MINIPIX_FNAME_PREFIX:=minipix-${ARCH}-${BUILD}.}; : ${DEFAULT_ZIPDIST_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}.}; # GNU autotools cache diff --git a/vars/invariants_tarballs.vars b/vars/invariants_tarballs.vars deleted file mode 100644 index 998a1b54..00000000 --- a/vars/invariants_tarballs.vars +++ /dev/null @@ -1,89 +0,0 @@ -# -# set -o errexit -o noglob are assumed. -# - -pkgp_invariants_tarball_dist() { - local _tarball_compress_cmd="${1}" _tarball_compress_args="${2}" _tarball_suffix="${3}"; - local _tarball_fname="${DEFAULT_TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${_tarball_suffix}"; - tar -cpf - $(find . -maxdepth 1 -mindepth 1 -type d \ - -not -path ./minipix \ - -not -path ./minipix_dist \ - -not -path ./rpm \ - -not -path ./tmp | sort) \ - midipix_shortcut.vbs midipix.sh README SHA256SUMS |\ - "${_tarball_compress_cmd}" ${_tarball_compress_args} -c > "${_tarball_fname}"; - ex_rtl_log_msg info "Finished building binary distribution tarball."; - if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] && \ - gpg --list-keys "${DEFAULT_TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then - gpg --armor --passphrase-file /dev/null \ - --local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${_tarball_fname}"; - ex_rtl_log_msg info "Signed binary distribution tarball."; - fi; -}; - -pkgp_invariants_tarball_toolchain() { - local _tarball_compress_cmd="${1}" _tarball_compress_args="${2}" _tarball_suffix="${3}"; - local _tarball_cross_fname="${DEFAULT_TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${_tarball_suffix}"; - tar -cpf - bin include lib lib64 libexec share "${PKG_TARGET}" |\ - "${_tarball_compress_cmd}" ${_tarball_compress_args} -c > "${_tarball_cross_fname}"; - ex_rtl_log_msg info "Finished building toolchain tarball."; - if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] && \ - gpg --list-keys "${DEFAULT_TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then - gpg --armor --passphrase-file /dev/null \ - --local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${_tarball_cross_fname}"; - ex_rtl_log_msg info "Signed toolchain tarball."; - fi; -}; - -pkgp_invariants_tarball_minipix() { - local _tarball_compress_cmd="${1}" _tarball_compress_args="${2}" _tarball_suffix="${3}"; - local _tarball_minipix_fname="${DEFAULT_TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${_tarball_suffix}"; - tar -cpf - minipix \ - midipix_shortcut.vbs midipix.sh README |\ - "${_tarball_compress_cmd}" ${_tarball_compress_args} -c > "${_tarball_minipix_fname}"; - ex_rtl_log_msg info "Finished building binary Minipix distribution tarball."; - if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] && \ - gpg --list-keys "${DEFAULT_TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then - gpg --armor --passphrase-file /dev/null \ - --local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${_tarball_minipix_fname}"; - ex_rtl_log_msg info "Signed binary Minipix distribution tarball."; - fi; -}; - -pkg_invariants_tarballs_all() { - local _tarball_compress_args="" _tarball_compress_cmd="" _tarball_suffix="" _tarball_suffixes="" _tarball_type="" _tarball_types=""; - if ex_rtl_lmatch "${ARG_DIST}" , tbz2; then - _tarball_suffixes="${_tarball_suffixes:+${_tarball_suffixes} }bz2"; - fi; - if ex_rtl_lmatch "${ARG_DIST}" , tgz; then - _tarball_suffixes="${_tarball_suffixes:+${_tarball_suffixes} }gz"; - fi; - if ex_rtl_lmatch "${ARG_DIST}" , txz; then - _tarball_suffixes="${_tarball_suffixes:+${_tarball_suffixes} }xz"; - fi; - for _tarball_suffix in ${_tarball_suffixes}; do - ex_rtl_log_msg info "Building ${_tarball_suffix}-compressed distribution tarballs..."; - case "${_tarball_suffix}" in - bz2) if [ -n "$(which pbzip2 2>/dev/null)" ]; then - _tarball_compress_cmd="pbzip2"; - else - _tarball_compress_cmd="bzip2"; - fi; ;; - gz) if [ -n "$(which pigz 2>/dev/null)" ]; then - _tarball_compress_cmd="pigz"; - else - _tarball_compress_cmd="gzip"; - fi; ;; - xz) _tarball_compress_cmd="xz"; - _tarball_compress_args="-T0"; ;; - *) ex_rtl_log_msg failexit "Unknown tarball suffix \`${_tarball_suffix}'."; - esac; - ex_rtl_fileop cd "${PREFIX}"; PREFIX_BASENAME="${PREFIX_NATIVE##*/}"; - _tarball_types="dist toolchain minipix"; - for _tarball_type in ${_tarball_types}; do - pkgp_invariants_tarball_${_tarball_type} "${_tarball_compress_cmd}" "${_tarball_compress_args}" "${_tarball_suffix}"; - done; - done; -}; - -# vim:filetype=sh |