From 66619367180957b7008bfecefb46defb19622990 Mon Sep 17 00:00:00 2001 From: Emmet Hikory Date: Wed, 3 Feb 2010 15:26:40 -0800 Subject: [PATCH] pbuilder-dist: change --mirror logic to use -ports when appropriate --- debian/changelog | 1 + pbuilder-dist | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d295629..eb9aa52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ubuntu-dev-tools (0.92) UNRELEASED; urgency=low * mk-sbuild-lv: use --arch=foo rather than --arch foo for debootstrap * pbuilder-dist: Allow architecture-switching to armel on i386/amd64 * pbuilder-dist: use --arch=foo rather than --arch foo for debootstrap + * pbuilder-dist: change --mirror logic to use -ports when appropriate * docs/pbuilder-dist.1: Document architecture-switching for armel * debian/control: add qemu-arm-static to Recommends: diff --git a/pbuilder-dist b/pbuilder-dist index 601d097..6909764 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -219,7 +219,12 @@ class pbuilder_dist: if self.extra_components: components += ' contrib non-free' else: - arguments.append('--mirror "http://mirrors.kernel.org/ubuntu/"') + if self.build_architecture in ('amd64','i386'): + arguments.append('--mirror "http://archive.ubuntu.com/ubuntu/"') + elif self.build_architecture == 'powerpc' and target_distro == 'dapper': + arguments.append('--mirror "http://archive.ubuntu.com/ubuntu/"') + else: + arguments.append('--mirror "http://ports.ubuntu.com/ubuntu-ports/"') components = 'main restricted' if self.extra_components: components += ' universe multiverse'