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

* Add ppc64el to valid architectures in pbuilder-dist and ubuntu-build.

Browse Source 
* Simplify mirror detection in mk-sbuild, all supported releases, all
  architectures but i386/amd64 are on ports.ubuntu.com
This commit is contained in:
Dimitri John Ledkov 2013-12-20 15:03:55 +00:00
parent 1ea8a4ef18
commit 1ecf020703
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
ubuntu-dev-tools (0.152) UNRELEASED; urgency=medium
* Add ppc64el to valid architectures in pbuilder-dist and ubuntu-build.
* Simplify mirror detection in mk-sbuild, all supported releases, all
architectures but i386/amd64 are on ports.ubuntu.com
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 20 Dec 2013 15:00:08 +0000
ubuntu-dev-tools (0.151) unstable; urgency=low ubuntu-dev-tools (0.151) unstable; urgency=low
[ Dmitrijs Ledkovs ] [ Dmitrijs Ledkovs ]

20
mk-sbuild
View File

@ -428,16 +428,9 @@ ubuntu)
amd64 | i386) amd64 | i386)
DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu" DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu"
;; ;;
armhf | armel | arm64 | hppa | ia64 | lpia | sparc) *)
DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/ubuntu-ports" DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
;; ;;
powerpc)
if [ "$RELEASE" != "dapper" ]; then
DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
else
DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu"
fi
;;
esac esac
fi fi
if [ -z "$COMPONENTS" ]; then if [ -z "$COMPONENTS" ]; then
@ -454,16 +447,9 @@ ubuntu)
amd64 | i386) amd64 | i386)
SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu" SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu"
;; ;;
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)
if [ "$RELEASE" != "dapper" ]; then
SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports"
else
SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu"
fi
;;
esac esac
fi fi
if [ -n "$TARGET_ARCH" ]; then if [ -n "$TARGET_ARCH" ]; then
@ -474,7 +460,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 | 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"
;; ;;

2
pbuilder-dist
View File

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

2
ubuntu-build
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", "sparc"]) "lpia", "powerpc", "ppc64el", "sparc"])
# Prepare our option parser. # Prepare our option parser.
opt_parser = OptionParser(usage) opt_parser = OptionParser(usage)