Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-18 12:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

add arm64 knowledge to mk-sbuild, ubuntu-build, pbuilder-dist.

Browse Source
This commit is contained in:
Dmitrijs Ledkovs 2013-10-13 21:54:31 +01:00
parent cc0e65e51c
commit 06874a8bad
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,9 +1,13 @@
ubuntu-dev-tools (0.150) UNRELEASED; urgency=low ubuntu-dev-tools (0.150) UNRELEASED; urgency=low
[ Brian Murray ]
* ubuntutools/sponsor_patch/sponsor_patch.py: correct grammar regarding * ubuntutools/sponsor_patch/sponsor_patch.py: correct grammar regarding
which task for the patch, cache bug.id instead of retrieving it up more which task for the patch, cache bug.id instead of retrieving it up more
than once. than once.
[ Dmitrijs Ledkovs ]
* add arm64 knowledge to mk-sbuild, ubuntu-build, pbuilder-dist.
-- Brian Murray <brian@ubuntu.com> Thu, 22 Aug 2013 08:20:14 -0700 -- Brian Murray <brian@ubuntu.com> Thu, 22 Aug 2013 08:20:14 -0700
ubuntu-dev-tools (0.149) unstable; urgency=low ubuntu-dev-tools (0.149) unstable; urgency=low

4
doc/ubuntu-build.1
View File

@ -38,7 +38,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, armhf, ia64, lpia, hppa. armel, armhf, arm64, ia64, lpia, hppa.
.TP .TP
Batch processing: Batch processing:
.IP .IP
@ -61,7 +61,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, armhf, ia64, lpia, hppa. powerpc, i386, armel, armhf, arm64, 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

8
mk-sbuild
View File

@ -428,7 +428,7 @@ ubuntu)
amd64 | i386) amd64 | i386)
DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu" DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu"
;; ;;
armhf | armel | hppa | ia64 | lpia | sparc) armhf | armel | arm64 | hppa | ia64 | lpia | sparc)
DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/ubuntu-ports" DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
;; ;;
powerpc) powerpc)
@ -454,7 +454,7 @@ ubuntu)
amd64 | i386) amd64 | i386)
SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu" SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu"
;; ;;
armhf | armel | hppa | ia64 | lpia | sparc) armhf | armel | arm64 | hppa | ia64 | lpia | sparc)
SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports" SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports"
;; ;;
powerpc) powerpc)
@ -474,7 +474,7 @@ ubuntu)
TARGET_MIRROR="http://archive.ubuntu.com/ubuntu" TARGET_MIRROR="http://archive.ubuntu.com/ubuntu"
TARGET_SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu" TARGET_SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu"
;; ;;
armhf | armel | hppa | ia64 | lpia | powerpc | sparc) armhf | armel | arm64 | hppa | ia64 | lpia | powerpc | sparc)
TARGET_MIRROR="http://ports.ubuntu.com/ubuntu-ports" TARGET_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
TARGET_SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports" TARGET_SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports"
;; ;;
@ -561,7 +561,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|armel-armhf|armhf-armel|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|arm64-arm|arm64-armel|arm64-armhf|i386-amd64|i386-lpia|lpia-i386|powerpc-ppc64|ppc64-powerpc|sparc-sparc64|sparc64-sparc)
;; ;;
# Sometimes we do # Sometimes we do
*) *)

3
pbuilder-dist
View File

@ -412,7 +412,7 @@ 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', 'armhf', 'i386', 'lpia', 'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'arm64', 'i386', 'lpia',
'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64', 'sh4', 'sh4eb', 'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64', 'sh4', 'sh4eb',
'sparc', 'sparc64'): 'sparc', 'sparc64'):
requested_arch = args.pop(0) requested_arch = args.pop(0)
@ -426,6 +426,7 @@ def main():
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'), ('armel', 'armhf'), ('armhf', 'armel'), ('armel', 'arm'), ('armel', 'armhf'), ('armhf', 'armel'),
('arm64', 'arm'), ('arm64', 'armhf'), ('arm64', 'armel'),
('i386', 'lpia'), ('lpia', 'i386'), ('powerpc', 'ppc64'), ('i386', 'lpia'), ('lpia', 'i386'), ('powerpc', 'ppc64'),
('ppc64', 'powerpc'), ('sparc', 'sparc64'), ('ppc64', 'powerpc'), ('sparc', 'sparc64'),
('sparc64', 'sparc')]): ('sparc64', 'sparc')]):

2
ubuntu-build
View File

@ -39,7 +39,7 @@ 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", "armhf", "amd64", "hppa", "i386", "ia64", valid_archs = set(["armel", "armhf", "arm64", "amd64", "hppa", "i386", "ia64",
"lpia", "powerpc", "sparc"]) "lpia", "powerpc", "sparc"])
# Prepare our option parser. # Prepare our option parser.