From 5b967c476ac5a1d9fffb7ebf334090659ac9830c 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: Sat, 25 Jun 2016 11:18:34 +0200 Subject: Only obtain {ntctty,psxscl} from ${GITROOT_HEAD} and exclude ${WORKDIR}/tmp/{ntctty,psxscl}/.git from the source tarball. --- 999.tarballs.build | 5 ++++- build.vars | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/999.tarballs.build b/999.tarballs.build index 7ff794a7..3d4829a6 100644 --- a/999.tarballs.build +++ b/999.tarballs.build @@ -57,7 +57,10 @@ log_msg info "Restored ${PREFIX_BASENAME}/lib."; log_msg info "Building source tarball..."; -tar -cpf - $(find tmp -mindepth 1 -maxdepth 1 -type d) |\ +tar -cpf - $(find tmp -mindepth 1 -maxdepth 2 \ + -not -path tmp/.\* \ + -not -path tmp/\*.tar\* -not -path tmp/\*.tgz -not -path tmp/\*.txz \ + -not -path tmp/ntctty/.git -not -path tmp/psxscl/.git) |\ ${TARBALL_COMPRESS_CMD} ${TARBALL_COMPRESS_ARGS} -c > ${TARBALL_SRC_FNAME}; log_msg info "Finished building source tarball."; if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SRC_SIGN_GPG_KEY}" ] &&\ diff --git a/build.vars b/build.vars index d2630bbb..de09ca58 100644 --- a/build.vars +++ b/build.vars @@ -371,14 +371,14 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_ZSH_URL:="https://fourdots.com/mirror/zsh/zsh-${PKG_ZSH_VERSION}.tar.xz"}; : ${PKG_ZSH_FNAME:=zsh-${PKG_ZSH_VERSION}.tar.xz}; -: ${PKG_DALIST_URL:=${GITROOT_HEAD}/dalist}; -: ${PKG_NTAPI_URL:=${GITROOT_HEAD}/ntapi}; -: ${PKG_NTCON_URL:=${GITROOT_HEAD}/ntcon}; +: ${PKG_DALIST_URL:=${GITROOT}/dalist}; +: ${PKG_NTAPI_URL:=${GITROOT}/ntapi}; +: ${PKG_NTCON_URL:=${GITROOT}/ntcon}; : ${PKG_NTCTTY_URL:=${GITROOT_HEAD}/ntctty}; -: ${PKG_PEMAGINE_URL:=${GITROOT_HEAD}/pemagine}; +: ${PKG_PEMAGINE_URL:=${GITROOT}/pemagine}; : ${PKG_PSXSCL_URL:=${GITROOT_HEAD}/psxscl}; : ${PKG_PSXSTUB_URL:=${GITROOT}/psxstub}; : ${PKG_PSXSTUB_URL_TYPE:=git}; -: ${PKG_PSXTYPES_URL:=${GITROOT_HEAD}/psxtypes}; +: ${PKG_PSXTYPES_URL:=${GITROOT}/psxtypes}; # vim:filetype=sh textwidth=0 -- cgit v1.2.3