Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with trunk

Browse Source
This commit is contained in:
Andreas Moog 2011-11-29 20:21:44 +01:00
commit 9d227eb205
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bash_completion/pbuilder-dist
View File

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

1
debian/changelog vendored
View File

@ -15,6 +15,7 @@ ubuntu-dev-tools (0.137) UNRELEASED; urgency=low
test-building syncs. test-building syncs.
* sponsor-patch: Check the bug's title, not the task, when determining * sponsor-patch: Check the bug's title, not the task, when determining
source series for syncs. source series for syncs.
* mk-sbuild, pbuilder-dist, ubuntu-build: Add armhf.
[ Andreas Moog ] [ Andreas Moog ]
* sponsor-patch: Check permission to unsubscribe sponsors-team (LP: #896884) * sponsor-patch: Check permission to unsubscribe sponsors-team (LP: #896884)

4
doc/ubuntu-build.1
View File

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

6
mk-sbuild
View File

@ -399,7 +399,7 @@ ubuntu)
amd64 | i386) amd64 | i386)
DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu" 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" DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
;; ;;
powerpc) powerpc)
@ -422,7 +422,7 @@ ubuntu)
amd64 | i386) amd64 | i386)
SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu" 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" SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports"
;; ;;
powerpc) powerpc)
@ -495,7 +495,7 @@ DEBOOTSTRAP_COMMAND=debootstrap
if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then
case "$CHROOT_ARCH-$HOST_ARCH" in case "$CHROOT_ARCH-$HOST_ARCH" in
# Sometimes we don't need qemu # 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 # Sometimes we do
*) *)

13
pbuilder-dist
View File

@ -394,9 +394,9 @@ def main():
if len(parts) > 2: if len(parts) > 2:
requested_arch = parts[2] requested_arch = parts[2]
elif len(args) > 0 and args[0] in ( elif len(args) > 0 and args[0] in (
'alpha', 'amd64', 'arm', 'armeb', 'armel', 'i386', 'lpia', 'm68k', 'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'i386', 'lpia',
'mips', 'mipsel', 'powerpc', 'ppc64', 'sh4', 'sh4eb', 'sparc', 'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64', 'sh4', 'sh4eb',
'sparc64'): 'sparc', 'sparc64'):
requested_arch = args.pop(0) requested_arch = args.pop(0)
else: else:
requested_arch = None requested_arch = None
@ -407,9 +407,10 @@ def main():
if (requested_arch != app.system_architecture if (requested_arch != app.system_architecture
and (app.system_architecture, requested_arch) not in [ and (app.system_architecture, requested_arch) not in [
('amd64', 'i386'), ('amd64', 'lpia'), ('arm', 'armel'), ('amd64', 'i386'), ('amd64', 'lpia'), ('arm', 'armel'),
('armel', 'arm'), ('i386', 'lpia'), ('lpia', 'i386'), ('armel', 'arm'), ('armel', 'armhf'), ('armhf', 'armel'),
('powerpc', 'ppc64'), ('ppc64', 'powerpc'), ('i386', 'lpia'), ('lpia', 'i386'), ('powerpc', 'ppc64'),
('sparc', 'sparc64'), ('sparc64', 'sparc')]): ('ppc64', 'powerpc'), ('sparc', 'sparc64'),
('sparc64', 'sparc')]):
args += ['--debootstrap', 'qemu-debootstrap'] args += ['--debootstrap', 'qemu-debootstrap']
if 'mainonly' in sys.argv or '--main-only' in sys.argv: if 'mainonly' in sys.argv or '--main-only' in sys.argv:

4
ubuntu-build
View File

@ -39,8 +39,8 @@ def main():
usage += "Only Launchpad Buildd Admins may rescore package builds." usage += "Only Launchpad Buildd Admins may rescore package builds."
# Valid architectures. # Valid architectures.
valid_archs = set(["armel", "amd64", "hppa", "i386", valid_archs = set(["armel", "armhf", "amd64", "hppa", "i386", "ia64",
"ia64", "lpia", "powerpc", "sparc"]) "lpia", "powerpc", "sparc"])
# Prepare our option parser. # Prepare our option parser.
opt_parser = OptionParser(usage) opt_parser = OptionParser(usage)