aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2018-06-15 12:27:07 -0400
committerRob Austein <sra@hactrn.net>2018-06-15 12:27:07 -0400
commit24d90023742273179a4f7816a62d973188f7c3ed (patch)
tree9442de88e369478f61a8e705771485871c4e8c97
parent50adbbb50b77c4ca0e183efc4fee6753e56f3ef4 (diff)
Add host builds for Debian Stretch and Ubuntu Bionic.
NB: this change is not by itself enough to prep the build environment for new platforms, one must also (manually): a) Update the conf/distributions files in the reprepro repositories to include the new codenames; b) Install an updated version of the debootstrap package on the build machine so that it knows how to construct the base environment for the new codenames; and c) Create the initial pbuilder environments fot the new codenames using `pbuilder-dist create`. There may be other steps I've forgotten, it's been a while since we last added a new codename. Per recommendation in the Debian Wiki, the debootstrap package I expect to use for this was manually backported (so that our existing build machine can know how to build for codenames newer than what the build machine itself is running). In this case I'm using the stretch-backports version (to get Ubuntu Bionic).
-rw-r--r--Makefile3
-rw-r--r--reprepro-conf/distributions16
2 files changed, 18 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8435111..131df63 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,8 @@ REPO_UMASK := 002
# Debian clean-room package builder setup
PBUILDER_BASE := ${HOME}/pbuilder
-PBUILDER_TARGETS := debian/jessie/i386 debian/jessie/amd64 ubuntu/xenial/i386 ubuntu/xenial/amd64
+PBUILDER_DISTS := debian/jessie debian/stretch ubuntu/xenial ubuntu/bionic
+PBUILDER_TARGETS := $(foreach D,${PBUILDER_DISTS}, ${D}/i386 ${D}/amd64)
# Where we upload the final results (if we do)
diff --git a/reprepro-conf/distributions b/reprepro-conf/distributions
index 4d06b15..bbfc925 100644
--- a/reprepro-conf/distributions
+++ b/reprepro-conf/distributions
@@ -13,3 +13,19 @@ Architectures: i386 amd64 source
Components: main
Description: cryptech.is APT Repository
SignWith: yes
+
+Origin: cryptech.is
+Label: cryptech.is APT repository
+Codename: stretch
+Architectures: i386 amd64 source
+Components: main
+Description: cryptech.is APT Repository
+SignWith: yes
+
+Origin: cryptech.is
+Label: cryptech.is APT repository
+Codename: bionic
+Architectures: i386 amd64 source
+Components: main
+Description: cryptech.is APT Repository
+SignWith: yes