diff --git a/debian/changelog b/debian/changelog index d791c42..ae03591 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 20 Dec 2013 15:00:08 +0000 + ubuntu-dev-tools (0.151) unstable; urgency=low [ Dmitrijs Ledkovs ] diff --git a/mk-sbuild b/mk-sbuild index c0d219e..6ea76c8 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -428,16 +428,9 @@ ubuntu) amd64 | i386) DEBOOTSTRAP_MIRROR="http://archive.ubuntu.com/ubuntu" ;; - armhf | armel | arm64 | hppa | ia64 | lpia | sparc) + *) 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 fi if [ -z "$COMPONENTS" ]; then @@ -454,16 +447,9 @@ ubuntu) amd64 | i386) SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu" ;; - armhf | armel | arm64 | hppa | ia64 | lpia | sparc) + *) 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 fi if [ -n "$TARGET_ARCH" ]; then @@ -474,7 +460,7 @@ ubuntu) TARGET_MIRROR="http://archive.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_SOURCES_SECURITY_URL="http://ports.ubuntu.com/ubuntu-ports" ;; diff --git a/pbuilder-dist b/pbuilder-dist index c8d792c..3b40a44 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -413,7 +413,7 @@ def main(): requested_arch = parts[2] elif len(args) > 0 and args[0] in ( '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'): requested_arch = args.pop(0) else: diff --git a/ubuntu-build b/ubuntu-build index cdb8e26..1ba279b 100755 --- a/ubuntu-build +++ b/ubuntu-build @@ -40,7 +40,7 @@ def main(): # Valid architectures. valid_archs = set(["armel", "armhf", "arm64", "amd64", "hppa", "i386", "ia64", - "lpia", "powerpc", "sparc"]) + "lpia", "powerpc", "ppc64el", "sparc"]) # Prepare our option parser. opt_parser = OptionParser(usage)