From dcd396bec86f38eae147e0242a6519ef41d45a63 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 14 Aug 2019 20:17:05 +0200 Subject: make local-build-package only touch files of the specified architecture --- bin/local-build-package | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/local-build-package b/bin/local-build-package index 53d9515..c990042 100755 --- a/bin/local-build-package +++ b/bin/local-build-package @@ -2,7 +2,7 @@ # build one package to test if modifications are ok (before opening a pull # request in https://github.com/archlinux32/packages) -# package is built directly on a i486/i586/i686 host without any chroots +# package is built directly on a i486/i686/pentium4 host without any chroots # shellcheck source=../lib/load-configuration . "${0%/*}/../lib/load-configuration" @@ -166,7 +166,7 @@ if ! ${nobuild}; then extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}" - rm -f ./*".pkg.tar.xz" ./*".pkg.tar.xz.sig" + rm -f ./*"${arch}.pkg.tar.xz" ./*"${arch}.pkg.tar.xz.sig" cd "${tmp_dir}" || exit 1 @@ -183,7 +183,9 @@ else fi if ${bootstrap}; then - find . -maxdepth 1 -type f -name '*.pkg.tar.xz' \ + rm -f ./*"${arch}.pkg.tar.xz.sig" + + find . -maxdepth 1 -type f -name "*${arch}.pkg.tar.xz" \ -execdir gpg --local-user="${signkey}" --detach-sign '{}' \; case "$repository" in @@ -198,8 +200,8 @@ if ${bootstrap}; then ;; esac - scp -P "${bootstrap_port}" -rC "${tmp_dir}/"*.pkg.tar.xz "${tmp_dir}/"*.pkg.tar.xz.sig "${bootstrap_host}:${bootstrap_dir}/${staging_repo}/." - ssh -p "${bootstrap_port}" "${bootstrap_host}" bash -l -c "'cd ${bootstrap_dir}/${staging_repo} && repo-add -n bootstrap-${staging_repo}.db.tar.gz *.pkg.tar.xz'" + scp -P "${bootstrap_port}" -rC "${tmp_dir}/"*${arch}.pkg.tar.xz "${tmp_dir}/"*${arch}.pkg.tar.xz.sig "${bootstrap_host}:${bootstrap_dir}/${staging_repo}/." + ssh -p "${bootstrap_port}" "${bootstrap_host}" bash -l -c "'cd ${bootstrap_dir}/${staging_repo} && repo-add -n bootstrap-${staging_repo}.db.tar.gz *${arch}.pkg.tar.xz'" fi # do not delete build reports, why might actually to want to have a look for things -- cgit v1.2.3-70-g09d2