Remove references to architectures not supported in any active Ubuntu release.

bash_completion/pbuilder-dist

@@ -36,7 +36,7 @@ _pbuilder-dist()
     for distro in $(ubuntu-distro-info --all; debian-distro-info --all) stable testing unstable; do
         for builder in pbuilder cowbuilder; do
             echo "$builder-$distro"
-            for arch in i386 amd64 armel armhf; do
+            for arch in i386 amd64 armhf; do
                 echo "$builder-$distro-$arch"
             done
         done

debian/changelog

@@ -2,6 +2,8 @@ ubuntu-dev-tools (0.193ubuntu5) UNRELEASED; urgency=medium
 
   * Remove references to deprecated
     http://people.canonical.com/~ubuntu-archive.
+  * Remove references to architectures not supported in any active
+    Ubuntu release.
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 30 May 2023 19:35:57 -0700
 

doc/pbuilder-dist.1

@@ -38,7 +38,7 @@ This optional parameter will attempt to construct a chroot in a foreign
 architecture.
 For some architecture pairs (e.g. i386 on an amd64 install), the chroot
 will be created natively.
-For others (e.g. armel on an i386 install), qemu\-user\-static will be
+For others (e.g. arm64 on an amd64 install), qemu\-user\-static will be
 used.
 Note that some combinations (e.g. amd64 on an i386 install) require
 special separate kernel handling, and may break in unexpected ways.

doc/ubuntu-build.1

@@ -38,8 +38,7 @@ operations.
 \fB\-a\fR ARCHITECTURE, \fB\-\-arch\fR=\fIARCHITECTURE\fR
 Rebuild or rescore a specific architecture. Valid
 architectures are:
-armel, armhf, arm64, amd64, hppa, i386, ia64,
+armhf, arm64, amd64, i386, powerpc, ppc64el, riscv64, s390x.
-lpia, powerpc, ppc64el, riscv64, s390x, sparc.
 .TP
 Batch processing:
 .IP
@@ -62,8 +61,7 @@ Rescore builds to <priority>.
 \fB\-\-arch2\fR=\fIARCHITECTURE\fR
 Affect only 'architecture' (can be used several
 times). Valid architectures are:
-armel, armhf, arm64, amd64, hppa, i386, ia64,
+arm64, amd64, i386, powerpc, ppc64el, riscv64, s390x.
-lpia, powerpc, ppc64el, riscv64, s390x, sparc.
 
 .SH AUTHORS
 \fBubuntu-build\fR was written by Martin Pitt <martin.pitt@canonical.com>, and

mk-sbuild

@@ -166,7 +166,7 @@ while :; do
         --arch)
             CHROOT_ARCH="$2"
             case $2 in
-                armel|armhf|i386|lpia)
+                armhf|i386)
                     if [ -z "$personality" ]; then
                         personality="linux32"
                     fi
@@ -750,7 +750,7 @@ DEBOOTSTRAP_COMMAND=debootstrap
 if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then
     case "$CHROOT_ARCH-$HOST_ARCH" in
     # Sometimes we don't need qemu
-    amd64-i386|amd64-lpia|armel-armhf|armhf-armel|arm64-armel|arm64-armhf|armel-arm64|armhf-arm64|i386-amd64|i386-lpia|lpia-i386|powerpc-ppc64|ppc64-powerpc|sparc-sparc64|sparc64-sparc)
+    amd64-i386|arm64-armhf|armhf-arm64|i386-amd64|powerpc-ppc64|ppc64-powerpc)
         ;;
     # Sometimes we do
     *)

pbuilder-dist

@@ -487,20 +487,10 @@ def main():
             requested_arch,
         ) not in [
             ("amd64", "i386"),
-            ("amd64", "lpia"),
-            ("arm", "armel"),
-            ("armel", "arm"),
-            ("armel", "armhf"),
-            ("armhf", "armel"),
             ("arm64", "arm"),
             ("arm64", "armhf"),
-            ("arm64", "armel"),
-            ("i386", "lpia"),
-            ("lpia", "i386"),
             ("powerpc", "ppc64"),
             ("ppc64", "powerpc"),
-            ("sparc", "sparc64"),
-            ("sparc64", "sparc"),
         ]:
             args += ["--debootstrap", "qemu-debootstrap"]
 

ubuntu-build

@@ -51,19 +51,14 @@ def main():
     # Valid architectures.
     valid_archs = set(
         [
-            "armel",
             "armhf",
             "arm64",
             "amd64",
-            "hppa",
             "i386",
-            "ia64",
-            "lpia",
             "powerpc",
             "ppc64el",
             "riscv64",
             "s390x",
-            "sparc",
         ]
     )