summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-05-17 09:32:41 +0200
committerErich Eckner <git@eckner.net>2017-05-17 09:32:41 +0200
commit7442c80a6961aa71e46bb23b83ca2a7e10bbd53e (patch)
treeec581422e628f9481588a83da2119c705b0f2d66
parentd1dfd2d0e335c53e04c3b1c14c40f7bb9b6c9282 (diff)
downloadbuilder-7442c80a6961aa71e46bb23b83ca2a7e10bbd53e.tar.xz
bin/return-assignment, conf/default.conf: prepare for multiple architecture builds/repositories
-rwxr-xr-xbin/return-assignment4
-rwxr-xr-xconf/default.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index 92f99c1..172eb04 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -46,8 +46,8 @@ fi
# the build was successful on the build slave
# extract package
-mkdir -p "${master_mirror_directory}/$4-staging/"
-cd "${master_mirror_directory}/$4-staging/"
+mkdir -p "${master_mirror_directory}/i486/$4-staging/"
+cd "${master_mirror_directory}/i486/$4-staging/"
new_files="$(tar -xv --wildcards '*.pkg.tar.xz'{,.sig})"
repo-add -v -s -k "${repo_key}" "$4-staging.db.tar.gz" $(echo "${new_files}" | grep '\.pkg\.tar\.xz\(\.sig\)\?$')
diff --git a/conf/default.conf b/conf/default.conf
index 3a06e27..dfc9905 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -30,7 +30,7 @@ master_build_server_identity="${work_dir}/.ssh/id_rsa"
max_parallel_build_per_client=2
repo_key='0xdeadbeef'
-master_mirror_directory='/path/to/master/mirror/i486'
+master_mirror_directory='/path/to/master/mirror'
# possibly pull in custom modifications