aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-06-21 07:52:35 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-06-21 07:52:35 +0000
commitb8b17791dddfe650a20feaa3d870b1f35e7ee59d (patch)
tree3cde67b361ef51a748b3850ec18b860af1e5f7e7
parenteee35447587632660770b5debf34cb762295740a (diff)
downloadalpine_aports-b8b17791dddfe650a20feaa3d870b1f35e7ee59d.tar.bz2
alpine_aports-b8b17791dddfe650a20feaa3d870b1f35e7ee59d.tar.xz
alpine_aports-b8b17791dddfe650a20feaa3d870b1f35e7ee59d.zip
main/aports-build: allow set options to rsync via rsync_opts
This makes it possible to set ---bwlimit and other options that may only be relevant for some of the builders
-rw-r--r--main/aports-build/APKBUILD4
-rw-r--r--main/aports-build/aports-build4
2 files changed, 4 insertions, 4 deletions
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 8ee71e1187..81a2ee12ff 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,7 +1,7 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=aports-build 2pkgname=aports-build
3pkgver=1.3 3pkgver=1.3
4pkgrel=4 4pkgrel=5
5pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux" 5pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
6url="https://alpinelinux.org" 6url="https://alpinelinux.org"
7arch="noarch" 7arch="noarch"
@@ -40,7 +40,7 @@ package() {
40 "$pkgdir"/etc/buildrepo/plugins.d/report-build-errors.lua 40 "$pkgdir"/etc/buildrepo/plugins.d/report-build-errors.lua
41} 41}
42 42
43sha512sums="47a98da8ccad3ea923e35286fa3bc31a8dd76b943b5fae65c5a3b4528b30548a00d398497156b2504fcac20c84c97a65b299e0eb167d3b3c9cfb6be779cfa787 aports-build 43sha512sums="b3b175f8aa5326830572ed595e21a96df5005ad1301f32e92c8749c46d851bfd37f153b4c7c3946ced782556f7a4fe85d13f5eeef0ab1d85fbf605d4dc1596ff aports-build
44821035bda47152c341ec94bf960fa67e3377051826712ceb74f39103e6e422777b6e082231bfb87865653d2b93b7d3154cfc24abf65a52e3e66da69412dd7e41 aports-build.initd 44821035bda47152c341ec94bf960fa67e3377051826712ceb74f39103e6e422777b6e082231bfb87865653d2b93b7d3154cfc24abf65a52e3e66da69412dd7e41 aports-build.initd
4562ed5cb6d1fef03fa707512c8c99c572a91e64706ebcc2e7097108811818615618bab908292d0ba0ad2afe93a27333d9c91deb347d6c99703eb8983d1ee5f480 mqtt-exec.aports-build.confd 4562ed5cb6d1fef03fa707512c8c99c572a91e64706ebcc2e7097108811818615618bab908292d0ba0ad2afe93a27333d9c91deb347d6c99703eb8983d1ee5f480 mqtt-exec.aports-build.confd
46ded99f4c9474e4dc91605de71919deebbeb8e2e3ebcc9d61890f327bb6220d891a9f2a6c615929cc53bd8007b1a1dbd827bc55cd5cbdd1a6661fcdafa4912950 report-build-errors.lua" 46ded99f4c9474e4dc91605de71919deebbeb8e2e3ebcc9d61890f327bb6220d891a9f2a6c615929cc53bd8007b1a1dbd827bc55cd5cbdd1a6661fcdafa4912950 report-build-errors.lua"
diff --git a/main/aports-build/aports-build b/main/aports-build/aports-build
index 05c67f5d37..c331927cb8 100644
--- a/main/aports-build/aports-build
+++ b/main/aports-build/aports-build
@@ -74,7 +74,7 @@ create_release() {
74 74
75 if $use_network; then 75 if $use_network; then
76 ssh $upload_host mkdir -p "${upload_iso#${upload_host}:}" 76 ssh $upload_host mkdir -p "${upload_iso#${upload_host}:}"
77 rsync -ruva "$releasedir"/* "$upload_iso" || return 1 77 rsync -ruva $rsync_opts "$releasedir"/* "$upload_iso" || return 1
78 fi 78 fi
79 abuild-apk del .alpine-release-deps 79 abuild-apk del .alpine-release-deps
80} 80}
@@ -172,7 +172,7 @@ while true; do
172 172
173 log "uploading packages to $repo" 173 log "uploading packages to $repo"
174 $use_network && for i in $upload_pkg; do 174 $use_network && for i in $upload_pkg; do
175 rsync -rui --delete-delay --delay-updates \ 175 rsync -rui --delete-delay --delay-updates $rsync_opts \
176 $repo/$arch $i/$repo/ > /tmp/upload-$repo 176 $repo/$arch $i/$repo/ > /tmp/upload-$repo
177 if [ $? -ne 0 ]; then 177 if [ $? -ne 0 ]; then
178 rc=1 178 rc=1