aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2015-07-07 16:21:57 -0400
committerRob Austein <sra@hactrn.net>2015-07-07 16:21:57 -0400
commitafe60270d7ffa08b53d968e5b36ecd4038ac5a53 (patch)
treef8f234c37ce56b76cccc60f67e570db7cde49aa3
parent31b6ce8bef7235667e71d830cda98d9350912883 (diff)
Tweak for shared reprepro staging repository and keyring.
-rw-r--r--Makefile27
1 files changed, 18 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index f7129e3..363b2de 100644
--- a/Makefile
+++ b/Makefile
@@ -64,22 +64,31 @@ DCH = test -f debian/changelog || \
dch --create --package cryptech-novena-$(1) --newversion '${CRYPTECH_PACKAGE_VERSION}' \
'Version ${CRYPTECH_VERSION} of Cryptech $(2) for the Novena PVT-1 development board.'
-# Reprepro repository location and release codename. The "reprepro"
-# target will initialize this if it doesn't exist.
+# Parameters controlling maintenance of the reprepro repository. The
+# "reprepro" target initializes the repository if it doesn't exist.
#
# Support for multiple distributions (codenames) not implemented yet.
# Not sure if there's any way to do it without generating separate
# packages for each codename (which would be rather tedious,
# particularly for the RTL package).
-
-REPOSITORY := $(abspath ${HOME}/repository)
-CODENAME := wheezy
-
-# Username and URI for uploading reprepro repository to public server.
-
+#
+# gpg whines about ownership of aptbot's home directory not matching
+# the userid of the release engineer running this Makefile. We could
+# suppress this with another reprepro configuration tweak, but all
+# it's really telling us is that gpg doesn't trust group access. Fair
+# enough, but in this case (dedicated build VM) the risk is lower than
+# the risk of running builds as root or of trying to synchronize
+# separate copies of the release tree for each release engineer.
+
+REPOSITORY := /home/aptbot/novena-repository
+GNUPGHOME := /home/aptbot/gnupg
+CODENAME := wheezy
+REPO_UMASK := 002
UPLOAD_USER := aptbot
UPLOAD_URI := rsync://apt.cryptech.is/novena/
+export GPGHOME
+
all: init sw rtl
@@ -103,7 +112,7 @@ rtl:
cd core; debuild -b -uc -us -aarmhf
reprepro: ${REPOSITORY}/conf/distributions ${REPOSITORY}/conf/options
- for f in *.changes; do reprepro -b ${REPOSITORY} include ${CODENAME} $$f; done
+ umask ${REPO_UMASK}; for f in *.changes; do reprepro -b ${REPOSITORY} include ${CODENAME} $$f; done
${REPOSITORY}/conf/distributions ${REPOSITORY}/conf/options:
install -D reprepro-conf/$(notdir $@) ${REPOSITORY}/conf/$(notdir $@)