summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/build-packages5
-rwxr-xr-xbin/return-assignment7
2 files changed, 5 insertions, 7 deletions
diff --git a/bin/build-packages b/bin/build-packages
index b54fdcf..859069f 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -6,7 +6,6 @@
# TODOs:
# use different build commands for different repositories - do we need this actually?
-# sign packages
# send logs of failed builds
# handle failed uploads to the build master
@@ -58,7 +57,9 @@ while true; do
rm -f *.pkg.tar.xz
if staging-i686-build ${parameters}; then
# build successful
- tar -c *.pkg.tar.xz | \
+ ls -1 *.pkg.tar.xz | \
+ xargs -rn1 gpg --detach-sign
+ tar -c *.pkg.tar.xz{,.sig} | \
ssh \
-i "${master_build_server_identity}" \
-p "${master_build_server_port}" \
diff --git a/bin/return-assignment b/bin/return-assignment
index fccdf85..5b24502 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -9,7 +9,6 @@
# TODO:
# properly handle if built package is out of date
-# sign package database
# use lock file(s)
# remove old version(s) of newly compiled packages
@@ -48,10 +47,8 @@ fi
# extract package
mkdir -p "${master_mirror_directory}/$4-staging/"
cd "${master_mirror_directory}/$4-staging/"
-new_files="$(tar -xv --wildcards '*.pkg.tar.xz')"
-repo-add "$4-staging.db.tar.gz" $(echo "${new_files}" | grep '\.pkg\.tar\.xz$')
-#new_files="$(tar -xv --wildcards '*.pkg.tar.xz'{,.sig})"
-#repo-add -v -s -k "${repo_key}" "$4-staging.tar.gz" $(echo "${new_files}" | grep '\.pkg\.tar\.xz$')
+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\)\?$')
# remove all loops which are broken by this package
sed '1d' "${work_dir}/package-states/$1.$2.$3.$4.locked" | \