Ubuntu Developer Tools

Merge lp:~xnox/ubuntu-dev-tools/arm64 into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

  1. arm64
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1397
Proposed branch: lp:~xnox/ubuntu-dev-tools/arm64
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 113 lines (+13/-8)
5 files modified
debian/changelog (+4/-0)
doc/ubuntu-build.1 (+2/-2)
mk-sbuild (+4/-4)
pbuilder-dist (+2/-1)
ubuntu-build (+1/-1)
To merge this branch: bzr merge lp:~xnox/ubuntu-dev-tools/arm64
Reviewer Review Type Date Requested Status
Benjamin Drung Approve
Review via email: mp+190841@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Would be nice for this to be uploaded into saucy, as there is arm64 archive now.

Revision history for this message
Benjamin Drung (bdrung) wrote :

I merged your changes and uploaded ubuntu-dev-tools 0.150 to Debian unstable. Feel free to do the sync.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-22 15:46:16 +0000
3+++ debian/changelog 2013-10-13 21:01:22 +0000
4@@ -1,9 +1,13 @@
5 ubuntu-dev-tools (0.150) UNRELEASED; urgency=low
6
7+ [ Brian Murray ]
8 * ubuntutools/sponsor_patch/sponsor_patch.py: correct grammar regarding
9 which task for the patch, cache bug.id instead of retrieving it up more
10 than once.
11
12+ [ Dmitrijs Ledkovs ]
13+ * add arm64 knowledge to mk-sbuild, ubuntu-build, pbuilder-dist.
14+
15 -- Brian Murray <brian@ubuntu.com> Thu, 22 Aug 2013 08:20:14 -0700
16
17 ubuntu-dev-tools (0.149) unstable; urgency=low
18
19=== modified file 'doc/ubuntu-build.1'
20--- doc/ubuntu-build.1 2011-12-20 00:02:22 +0000
21+++ doc/ubuntu-build.1 2013-10-13 21:01:22 +0000
22@@ -38,7 +38,7 @@
23 \fB\-a\fR ARCHITECTURE, \fB\-\-arch\fR=\fIARCHITECTURE\fR
24 Rebuild or rescore a specific architecture. Valid
25 architectures include: amd64, sparc, powerpc, i386,
26-armel, armhf, ia64, lpia, hppa.
27+armel, armhf, arm64, ia64, lpia, hppa.
28 .TP
29 Batch processing:
30 .IP
31@@ -61,7 +61,7 @@
32 \fB\-\-arch2\fR=\fIARCHITECTURE\fR
33 Affect only 'architecture' (can be used several
34 times). Valid architectures are: amd64, sparc,
35-powerpc, i386, armel, armhf, ia64, lpia, hppa.
36+powerpc, i386, armel, armhf, arm64, ia64, lpia, hppa.
37
38 .SH AUTHORS
39 \fBubuntu-build\fR was written by Martin Pitt <martin.pitt@canonical.com>, and
40
41=== modified file 'mk-sbuild'
42--- mk-sbuild 2013-05-06 13:47:36 +0000
43+++ mk-sbuild 2013-10-13 21:01:22 +0000
44@@ -428,7 +428,7 @@
45 amd64 | i386)
46 DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu"
47 ;;
48- armhf | armel | hppa | ia64 | lpia | sparc)
49+ armhf | armel | arm64 | hppa | ia64 | lpia | sparc)
50 DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
51 ;;
52 powerpc)
53@@ -454,7 +454,7 @@
54 amd64 | i386)
55 SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu"
56 ;;
57- armhf | armel | hppa | ia64 | lpia | sparc)
58+ armhf | armel | arm64 | hppa | ia64 | lpia | sparc)
59 SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports"
60 ;;
61 powerpc)
62@@ -474,7 +474,7 @@
63 TARGET_MIRROR="http://archive.ubuntu.com/ubuntu"
64 TARGET_SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu"
65 ;;
66- armhf | armel | hppa | ia64 | lpia | powerpc | sparc)
67+ armhf | armel | arm64 | hppa | ia64 | lpia | powerpc | sparc)
68 TARGET_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
69 TARGET_SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports"
70 ;;
71@@ -561,7 +561,7 @@
72 if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then
73 case "$CHROOT_ARCH-$HOST_ARCH" in
74 # Sometimes we don't need qemu
75- 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)
76+ 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)
77 ;;
78 # Sometimes we do
79 *)
80
81=== modified file 'pbuilder-dist'
82--- pbuilder-dist 2013-03-18 23:18:02 +0000
83+++ pbuilder-dist 2013-10-13 21:01:22 +0000
84@@ -412,7 +412,7 @@
85 if len(parts) > 2:
86 requested_arch = parts[2]
87 elif len(args) > 0 and args[0] in (
88- 'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'i386', 'lpia',
89+ 'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'arm64', 'i386', 'lpia',
90 'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64', 'sh4', 'sh4eb',
91 'sparc', 'sparc64'):
92 requested_arch = args.pop(0)
93@@ -426,6 +426,7 @@
94 and (app.system_architecture, requested_arch) not in [
95 ('amd64', 'i386'), ('amd64', 'lpia'), ('arm', 'armel'),
96 ('armel', 'arm'), ('armel', 'armhf'), ('armhf', 'armel'),
97+ ('arm64', 'arm'), ('arm64', 'armhf'), ('arm64', 'armel'),
98 ('i386', 'lpia'), ('lpia', 'i386'), ('powerpc', 'ppc64'),
99 ('ppc64', 'powerpc'), ('sparc', 'sparc64'),
100 ('sparc64', 'sparc')]):
101
102=== modified file 'ubuntu-build'
103--- ubuntu-build 2012-12-12 15:25:20 +0000
104+++ ubuntu-build 2013-10-13 21:01:22 +0000
105@@ -39,7 +39,7 @@
106 usage += "Only Launchpad Buildd Admins may rescore package builds."
107
108 # Valid architectures.
109- valid_archs = set(["armel", "armhf", "amd64", "hppa", "i386", "ia64",
110+ valid_archs = set(["armel", "armhf", "arm64", "amd64", "hppa", "i386", "ia64",
111 "lpia", "powerpc", "sparc"])
112
113 # Prepare our option parser.