From 5ee71e1fa68e872833e71d770b1065a5592ed738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Tue, 15 Nov 2016 23:49:18 +0100 Subject: build.sh: copy etc/ files after a successful build. --- subr/build.subr | 6 ++++++ subr/tarballs.subr | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'subr') diff --git a/subr/build.subr b/subr/build.subr index 98bd4555..2a9f80fa 100644 --- a/subr/build.subr +++ b/subr/build.subr @@ -63,6 +63,12 @@ clean_prefix() { fi; }; +copy_etc() { + tar -C etc -cpf - midipix_check.sh midipix.sh README midipix_shortcut.vbs |\ + tar -C ${PREFIX} -xpf -; + chmod +x ${PREFIX}/midipix.sh; +}; + create_dirs() { insecure_mkdir ${PREFIX} ${PREFIX_NATIVE} ${PREFIX_CROSS} ${PREFIX_TARGET}/lib ${DLCACHEDIR} ${WORKDIR}; for __ in ${PREFIX}/usr ${PREFIX_NATIVE}/usr; do diff --git a/subr/tarballs.subr b/subr/tarballs.subr index 7bde6642..abcbad07 100644 --- a/subr/tarballs.subr +++ b/subr/tarballs.subr @@ -20,7 +20,7 @@ do_tarball_dist() { tar -cpf - $(find . -maxdepth 2 -mindepth 1 -type d \ -not -path ./native -not -path ./native/lib.bak \ -not -path ./tmp -not -path ./tmp/\*) \ - etc/midipix_shortcut.vbs etc/midipix.sh etc/README |\ + midipix_shortcut.vbs midipix.sh README |\ ${TARBALL_COMPRESS_CMD} ${TARBALL_COMPRESS_ARGS} -c > ${TARBALL_FNAME}; log_msg info "Finished building binary distribution tarball."; if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&\ @@ -49,7 +49,7 @@ do_tarball_toolchain() { do_tarball_minipix() { TARBALL_MINIPIX_FNAME=${TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}; tar -cpf - minipix \ - etc/midipix_shortcut.vbs etc/midipix.sh etc/README |\ + midipix_shortcut.vbs midipix.sh README |\ ${TARBALL_COMPRESS_CMD} ${TARBALL_COMPRESS_ARGS} -c > ${TARBALL_MINIPIX_FNAME}; log_msg info "Finished building binary Minipix distribution tarball."; if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_MINIPIX_SIGN_GPG_KEY}" ] &&\ -- cgit v1.2.3