From fc9ddd974e1b9c24709b2a8007f6e9c67af8f115 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Tue, 29 Nov 2011 11:42:40 +0200
Subject: [PATCH] mk-sbuild, pbuilder-dist, ubuntu-build: Add armhf.
---
bash_completion/pbuilder-dist | 2 +-
debian/changelog | 1 +
doc/ubuntu-build.1 | 4 ++--
mk-sbuild | 6 +++---
pbuilder-dist | 13 +++++++------
ubuntu-build | 4 ++--
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/bash_completion/pbuilder-dist b/bash_completion/pbuilder-dist
index 4a12d0e..139e1d7 100644
--- a/bash_completion/pbuilder-dist
+++ b/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; do
+ for arch in i386 amd64 armel armhf; do
echo "$builder-$distro-$arch"
done
done
diff --git a/debian/changelog b/debian/changelog
index 8aeb5f3..0737ce4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ ubuntu-dev-tools (0.137) UNRELEASED; urgency=low
test-building syncs.
* sponsor-patch: Check the bug's title, not the task, when determining
source series for syncs.
+ * mk-sbuild, pbuilder-dist, ubuntu-build: Add armhf.
[ Andreas Moog ]
* sponsor-patch: Check permission to unsubscribe sponsors-team (LP: #896884)
diff --git a/doc/ubuntu-build.1 b/doc/ubuntu-build.1
index 27d722d..38ae1c6 100644
--- a/doc/ubuntu-build.1
+++ b/doc/ubuntu-build.1
@@ -44,7 +44,7 @@ operations.
\fB\-a\fR ARCHITECTURE, \fB\-\-arch\fR=\fIARCHITECTURE\fR
Rebuild or rescore a specific architecture. Valid
architectures include: amd64, sparc, powerpc, i386,
-armel, ia64, lpia, hppa.
+armel, armhf, ia64, lpia, hppa.
.TP
Batch processing:
.IP
@@ -67,7 +67,7 @@ Rescore builds to <priority>.
\fB\-\-arch2\fR=\fIARCHITECTURE\fR
Affect only 'architecture' (can be used several
times). Valid architectures are: amd64, sparc,
-powerpc, i386, armel, ia64, lpia, hppa.
+powerpc, i386, armel, armhf, ia64, lpia, hppa.
.SH AUTHORS
\fBubuntu-build\fR was written by Martin Pitt <martin.pitt@canonical.com>, and
diff --git a/mk-sbuild b/mk-sbuild
index 689b62f..eade0d2 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -399,7 +399,7 @@ ubuntu)
amd64 | i386)
DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu"
;;
- armel | hppa | ia64 | lpia | sparc)
+ armhf | armel | hppa | ia64 | lpia | sparc)
DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
;;
powerpc)
@@ -422,7 +422,7 @@ ubuntu)
amd64 | i386)
SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu"
;;
- armel | hppa | ia64 | lpia | sparc)
+ armhf | armel | hppa | ia64 | lpia | sparc)
SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports"
;;
powerpc)
@@ -495,7 +495,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|arm-armel|armel-arm|i386-amd64|i386-lpia|lpia-i386|powerpc-ppc64|ppc64-powerpc|sparc-sparc64|sparc64-sparc)
+ amd64-i386|amd64-lpia|arm-armel|armel-arm|armel-armhf|armhf-armel|i386-amd64|i386-lpia|lpia-i386|powerpc-ppc64|ppc64-powerpc|sparc-sparc64|sparc64-sparc)
;;
# Sometimes we do
*)
diff --git a/pbuilder-dist b/pbuilder-dist
index 587654b..535aa70 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -394,9 +394,9 @@ def main():
if len(parts) > 2:
requested_arch = parts[2]
elif len(args) > 0 and args[0] in (
- 'alpha', 'amd64', 'arm', 'armeb', 'armel', 'i386', 'lpia', 'm68k',
- 'mips', 'mipsel', 'powerpc', 'ppc64', 'sh4', 'sh4eb', 'sparc',
- 'sparc64'):
+ 'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'i386', 'lpia',
+ 'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64', 'sh4', 'sh4eb',
+ 'sparc', 'sparc64'):
requested_arch = args.pop(0)
else:
requested_arch = None
@@ -407,9 +407,10 @@ def main():
if (requested_arch != app.system_architecture
and (app.system_architecture, requested_arch) not in [
('amd64', 'i386'), ('amd64', 'lpia'), ('arm', 'armel'),
- ('armel', 'arm'), ('i386', 'lpia'), ('lpia', 'i386'),
- ('powerpc', 'ppc64'), ('ppc64', 'powerpc'),
- ('sparc', 'sparc64'), ('sparc64', 'sparc')]):
+ ('armel', 'arm'), ('armel', 'armhf'), ('armhf', 'armel'),
+ ('i386', 'lpia'), ('lpia', 'i386'), ('powerpc', 'ppc64'),
+ ('ppc64', 'powerpc'), ('sparc', 'sparc64'),
+ ('sparc64', 'sparc')]):
args += ['--debootstrap', 'qemu-debootstrap']
if 'mainonly' in sys.argv or '--main-only' in sys.argv:
diff --git a/ubuntu-build b/ubuntu-build
index ed4a2e9..2864142 100755
--- a/ubuntu-build
+++ b/ubuntu-build
@@ -39,8 +39,8 @@ def main():
usage += "Only Launchpad Buildd Admins may rescore package builds."
# Valid architectures.
- valid_archs = set(["armel", "amd64", "hppa", "i386",
- "ia64", "lpia", "powerpc", "sparc"])
+ valid_archs = set(["armel", "armhf", "amd64", "hppa", "i386", "ia64",
+ "lpia", "powerpc", "sparc"])
# Prepare our option parser.
opt_parser = OptionParser(usage)