Add arm64 architecture

6 files changed, 21 insertions, 18 deletions

diff --git a/jenkins/ansible/hosts b/jenkins/ansible/hosts
index 8865afc..9171081 100644
--- a/jenkins/ansible/hosts
+++ b/jenkins/ansible/hosts
@@ -1,4 +1,5 @@
 pgdgbuild.dus.dg-i.net chroot_dir=/home/chroot.buexcl run_opts="size=20G"
+pgdgbuild-arm64 chroot_dir=/home/chroot run_opts="size=20G"
 # ppc64el: 24GB is not enough to build postgis with 4 workers (huge B-Ds)
 pgdgbuild-ppc64el chroot_dir=/home/chroot run_opts="size=40G,nr_inodes=800k"
 moe chroot_dir=/var/lib/chroot run_opts="size=20G"
diff --git a/jenkins/schroot-config.sh b/jenkins/schroot-config.sh
index 59c2f12..1f3294f 100755
--- a/jenkins/schroot-config.sh
+++ b/jenkins/schroot-config.sh
@@ -18,6 +18,7 @@ done
 
 case $(dpkg --print-architecture) in
 	amd64) ARCHS="amd64 i386" ;;
+	arm64) ARCHS="arm64" ;;
 	ppc64el) ARCHS="ppc64el" ;;
 esac
 
diff --git a/pgapt-db/sql/pgdg_apt_data.sql b/pgapt-db/sql/pgdg_apt_data.sql
index 565ff4f..f4fa3df 100644
--- a/pgapt-db/sql/pgdg_apt_data.sql
+++ b/pgapt-db/sql/pgdg_apt_data.sql
@@ -3,6 +3,7 @@ BEGIN;
 INSERT INTO architecture VALUES
     ('all'),
     ('amd64'),
+    ('arm64'),
     ('i386'),
     ('ppc64el');
 
diff --git a/pgapt.conf b/pgapt.conf
index 6014feb..3ead70b 100644
--- a/pgapt.conf
+++ b/pgapt.conf
@@ -56,9 +56,9 @@ set_dist_vars () { # args: $1 = distribution
       ;;
     ubuntu)
       mirror="http://archive.ubuntu.com/ubuntu"
-      if [ "${architecture:-}" = "ppc64el" ]; then
-        mirror="http://ports.ubuntu.com/ubuntu-ports"
-      fi
+      case ${architecture:-} in arm64|ppc64el)
+        mirror="http://ports.ubuntu.com/ubuntu-ports" ;;
+      esac
       case $(hostname) in
         pgapt*)
           mirror="http://mirror.hetzner.de/ubuntu/packages"
diff --git a/repo/conf/distributions b/repo/conf/distributions
index d45f0d5..bc1c6a2 100644
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -2,7 +2,7 @@ Codename: sid-pgdg
 Suite: sid-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 i386 ppc64el
+Architectures: source amd64 arm64 i386 ppc64el
 Components: main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13
 SignWith: ACCC4CF8
 Log: sid-pgdg.log
@@ -17,7 +17,7 @@ Codename: sid-pgdg-testing
 Suite: sid-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 i386 ppc64el
+Architectures: source amd64 arm64 i386 ppc64el
 Components: main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13
 SignWith: ACCC4CF8
 Log: sid-pgdg-testing.log
@@ -34,7 +34,7 @@ Codename: bullseye-pgdg
 Suite: bullseye-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 ppc64el
+Architectures: source amd64 arm64 ppc64el
 Components: main 9.4 9.5 9.6 10 11 12
 SignWith: ACCC4CF8
 Log: bullseye-pgdg.log
@@ -49,7 +49,7 @@ Codename: bullseye-pgdg-testing
 Suite: bullseye-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 ppc64el
+Architectures: source amd64 arm64 ppc64el
 Components: main 9.4 9.5 9.6 10 11 12
 SignWith: ACCC4CF8
 Log: bullseye-pgdg-testing.log
@@ -66,7 +66,7 @@ Codename: buster-pgdg
 Suite: buster-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 i386 ppc64el
+Architectures: source amd64 arm64 i386 ppc64el
 Components: main 9.3 9.4 9.5 9.6 10 11 12 13
 SignWith: ACCC4CF8
 Log: buster-pgdg.log
@@ -81,7 +81,7 @@ Codename: buster-pgdg-testing
 Suite: buster-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 i386 ppc64el
+Architectures: source amd64 arm64 i386 ppc64el
 Components: main 9.3 9.4 9.5 9.6 10 11 12 13
 SignWith: ACCC4CF8
 Log: buster-pgdg-testing.log
@@ -194,7 +194,7 @@ Codename: focal-pgdg
 Suite: focal-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 ppc64el
+Architectures: source amd64 arm64 ppc64el
 Components: main 9.4 9.5 9.6 10 11 12 13
 SignWith: ACCC4CF8
 Log: focal-pgdg.log
@@ -209,7 +209,7 @@ Codename: focal-pgdg-testing
 Suite: focal-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 ppc64el
+Architectures: source amd64 arm64 ppc64el
 Components: main 9.4 9.5 9.6 10 11 12 13
 SignWith: ACCC4CF8
 Log: focal-pgdg-testing.log
@@ -290,7 +290,7 @@ Codename: bionic-pgdg
 Suite: bionic-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 i386 ppc64el
+Architectures: source amd64 arm64 i386 ppc64el
 Components: main 9.3 9.4 9.5 9.6 10 11 12 13
 SignWith: ACCC4CF8
 Log: bionic-pgdg.log
@@ -305,7 +305,7 @@ Codename: bionic-pgdg-testing
 Suite: bionic-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 i386 ppc64el
+Architectures: source amd64 arm64 i386 ppc64el
 Components: main 9.3 9.4 9.5 9.6 10 11 12 13
 SignWith: ACCC4CF8
 Log: bionic-pgdg-testing.log
diff --git a/repo/conf/distributions.sh b/repo/conf/distributions.sh
index 519f20c..967cfed 100755
--- a/repo/conf/distributions.sh
+++ b/repo/conf/distributions.sh
@@ -17,11 +17,11 @@ for DIST in $DISTRIBUTIONS ; do
 				COMPONENTS="main         8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12" ;;
 			stretch) ARCHS="amd64 i386 ppc64el"
 				COMPONENTS="main                     9.2 9.3 9.4 9.5 9.6 10 11 12 13" ;;
-			buster) ARCHS="amd64 i386 ppc64el"
+			buster) ARCHS="amd64 arm64 i386 ppc64el"
 				COMPONENTS="main                         9.3 9.4 9.5 9.6 10 11 12 13" ;;
-			bullseye) ARCHS="amd64 ppc64el"
+			bullseye) ARCHS="amd64 arm64 ppc64el"
 				COMPONENTS="main                             9.4 9.5 9.6 10 11 12" ;;
-			sid)    ARCHS="amd64 i386 ppc64el"
+			sid)    ARCHS="amd64 arm64 i386 ppc64el"
 				COMPONENTS="main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13" ;;
 			# Ubuntu
 			precise) ARCHS="amd64 i386"
@@ -30,13 +30,13 @@ for DIST in $DISTRIBUTIONS ; do
 				COMPONENTS="main         8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11" ;;
 			xenial) ARCHS="amd64 i386 ppc64el"
 				COMPONENTS="main                 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13" ;;
-			bionic) ARCHS="amd64 i386 ppc64el"
+			bionic) ARCHS="amd64 arm64 i386 ppc64el"
 				COMPONENTS="main                         9.3 9.4 9.5 9.6 10 11 12 13" ;;
 			disco)  ARCHS="amd64"
 				COMPONENTS="main                             9.4 9.5 9.6 10 11 12" ;;
 			eoan)   ARCHS="amd64"
 				COMPONENTS="main                             9.4 9.5 9.6 10 11 12" ;;
-			focal)  ARCHS="amd64 ppc64el"
+			focal)  ARCHS="amd64 arm64 ppc64el"
 				COMPONENTS="main                             9.4 9.5 9.6 10 11 12 13" ;;
 			*)
 				echo "$D missing in COMPONENTS list" >&2