pbuilder-dist, ubuntu-build: Add s390x.

This commit is contained in:
Colin Watson 2016-07-16 10:55:28 +01:00
parent 4d07f85874
commit f232d121d2
4 changed files with 6 additions and 3 deletions

3
debian/changelog vendored
View File

@ -4,6 +4,9 @@ ubuntu-dev-tools (0.158) UNRELEASED; urgency=medium
* grep-merges: Do not override author or uploader with None * grep-merges: Do not override author or uploader with None
There can be JSON entries which have uploader=None. There can be JSON entries which have uploader=None.
[ Colin Watson ]
* pbuilder-dist, ubuntu-build: Add s390x.
-- Martin Pitt <martin.pitt@ubuntu.com> Fri, 13 May 2016 09:04:03 +0200 -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 13 May 2016 09:04:03 +0200
ubuntu-dev-tools (0.157) unstable; urgency=medium ubuntu-dev-tools (0.157) unstable; urgency=medium

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, arm64, ia64, lpia, hppa. armel, armhf, arm64, ia64, lpia, hppa, ppc64el, s390x.
.TP .TP
Batch processing: Batch processing:
.IP .IP

View File

@ -438,7 +438,7 @@ def main():
elif len(args) > 0 and args[0] in ( elif len(args) > 0 and args[0] in (
'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'arm64', 'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'arm64',
'i386', 'lpia', 'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64', 'i386', 'lpia', 'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64',
'ppc64el', 'sh4', 'sh4eb', 'sparc', 'sparc64'): 'ppc64el', 's390x', 'sh4', 'sh4eb', 'sparc', 'sparc64'):
requested_arch = args.pop(0) requested_arch = args.pop(0)
else: else:
requested_arch = None requested_arch = None

View File

@ -40,7 +40,7 @@ def main():
# Valid architectures. # Valid architectures.
valid_archs = set(["armel", "armhf", "arm64", "amd64", "hppa", "i386", "ia64", valid_archs = set(["armel", "armhf", "arm64", "amd64", "hppa", "i386", "ia64",
"lpia", "powerpc", "ppc64el", "sparc"]) "lpia", "powerpc", "ppc64el", "s390x", "sparc"])
# Prepare our option parser. # Prepare our option parser.
opt_parser = OptionParser(usage) opt_parser = OptionParser(usage)