diff options
| -rw-r--r-- | subr/pkg_setup_env.subr | 2 | ||||
| -rw-r--r-- | vars/dist_digest.vars (renamed from vars/dist_digest.subr) | 2 | ||||
| -rw-r--r-- | vars/dist_etc.subr | 11 | ||||
| -rw-r--r-- | vars/dist_etc.vars | 12 | ||||
| -rw-r--r-- | vars/dist_tarballs.vars (renamed from vars/dist_tarballs.subr) | 14 |
5 files changed, 21 insertions, 20 deletions
diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr index c8058e86..6f2ef2cb 100644 --- a/subr/pkg_setup_env.subr +++ b/subr/pkg_setup_env.subr @@ -6,7 +6,7 @@ pkg_setup_env() { if [ -z "${PKG_URL}" ]\ && [ -z "${PKG_URLS_GIT}" ]\ && [ -z "${PKG_VERSION}" ]\ - && ! test_cmd "${PKG_NAME}_all"; then + && ! test_cmd "pkg_${PKG_NAME}_all"; then log_msg failexit "Error: package \`${PKG_NAME}' missing in build.vars."; elif [ "${PKG_DISABLED:-0}" -eq 1 ]; then log_msg vnfo "Skipping disabled package \`${PKG_NAME}.'"; diff --git a/vars/dist_digest.subr b/vars/dist_digest.vars index 1b98fb6d..10377e07 100644 --- a/vars/dist_digest.subr +++ b/vars/dist_digest.vars @@ -2,7 +2,7 @@ # set -o errexit -o noglob are assumed. # -dist_digest_all() { +pkg_dist_digest_all() { local __; if [ "${ARG_TARBALL:-0}" -eq 1 ]; then log_msg info "Compiling SHA256 sums..."; diff --git a/vars/dist_etc.subr b/vars/dist_etc.subr deleted file mode 100644 index e7e0a92a..00000000 --- a/vars/dist_etc.subr +++ /dev/null @@ -1,11 +0,0 @@ -# -# set -o errexit -o noglob are assumed. -# - -dist_etc_all() { - tar -C etc -cpf - midipix.sh README midipix_shortcut.vbs |\ - tar -C ${PREFIX} -xpf -; - chmod +x ${PREFIX}/midipix.sh; -}; - -# vim:filetype=sh diff --git a/vars/dist_etc.vars b/vars/dist_etc.vars new file mode 100644 index 00000000..6ed6f80a --- /dev/null +++ b/vars/dist_etc.vars @@ -0,0 +1,12 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_dist_etc_all() { + tar -C "${MIDIPIX_BUILD_PWD}/etc" -cpf - \ + midipix.sh README midipix_shortcut.vbs |\ + tar -C "${PREFIX}" -xpf -; + chmod +x "${PREFIX}/midipix.sh"; +}; + +# vim:filetype=sh diff --git a/vars/dist_tarballs.subr b/vars/dist_tarballs.vars index 7cf075a0..5c918656 100644 --- a/vars/dist_tarballs.subr +++ b/vars/dist_tarballs.vars @@ -2,7 +2,7 @@ # set -o errexit -o noglob are assumed. # -postp_tarball_dist() { +pkgp_dist_tarball_dist() { TARBALL_FNAME="${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}"; tar -cpf - $(find . -maxdepth 2 -mindepth 1 -type d \ -not -path ./${PREFIX_BASENAME} \ @@ -20,7 +20,7 @@ postp_tarball_dist() { fi; }; -postp_tarball_toolchain() { +pkgp_dist_tarball_toolchain() { TARBALL_CROSS_FNAME="${TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}"; tar -cpf - bin include lib lib64 libexec share "${TARGET}" |\ "${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_CROSS_FNAME}"; @@ -33,7 +33,7 @@ postp_tarball_toolchain() { fi; }; -postp_tarball_minipix() { +pkgp_dist_tarball_minipix() { TARBALL_MINIPIX_FNAME="${TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}"; tar -cpf - minipix \ midipix_shortcut.vbs midipix.sh README |\ @@ -47,7 +47,7 @@ postp_tarball_minipix() { fi; }; -postp_tarball_src() { +pkgp_dist_tarball_src() { TARBALL_SRC_FNAME="${TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}"; log_msg info "Building source tarball..."; tar -cpf - $(find tmp -mindepth 2 -maxdepth 2 \ @@ -65,7 +65,7 @@ postp_tarball_src() { fi; }; -dist_tarballs_all() { +pkg_dist_tarballs_all() { if [ "${ARG_TARBALL:-0}" -eq 1 ]; then log_msg info "Building distribution tarballs..."; case "${TARBALL_SUFFIX}" in @@ -84,9 +84,9 @@ dist_tarballs_all() { *) log_msg failexit "Unknown tarball suffix \`.${TARBALL_SUFFIX}'."; esac; build_fileop cd "${PREFIX}"; PREFIX_BASENAME="${PREFIX_NATIVE##*/}"; - postp_tarball_dist; postp_tarball_toolchain; postp_tarball_minipix; + pkgp_dist_tarball_dist; pkgp_dist_tarball_toolchain; pkgp_dist_tarball_minipix; if [ "${BUILD}" = "debug" ]; then - postp_tarball_src; + pkgp_dist_tarball_src; fi; fi; }; |