Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-08-13 15:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbuilder-dist: change --mirror logic to use -ports when appropriate

Browse Source
This commit is contained in:
Emmet Hikory 2010-02-03 15:26:40 -08:00
parent 384cba2e19
commit 6661936718
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -9,6 +9,7 @@ ubuntu-dev-tools (0.92) UNRELEASED; urgency=low
* mk-sbuild-lv: use --arch=foo rather than --arch foo for debootstrap * mk-sbuild-lv: use --arch=foo rather than --arch foo for debootstrap
* pbuilder-dist: Allow architecture-switching to armel on i386/amd64 * pbuilder-dist: Allow architecture-switching to armel on i386/amd64
* pbuilder-dist: use --arch=foo rather than --arch foo for debootstrap * 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 * docs/pbuilder-dist.1: Document architecture-switching for armel
* debian/control: add qemu-arm-static to Recommends: * debian/control: add qemu-arm-static to Recommends:

7
pbuilder-dist
View File

@ -219,7 +219,12 @@ class pbuilder_dist:
if self.extra_components: if self.extra_components:
components += ' contrib non-free' components += ' contrib non-free'
else: 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' components = 'main restricted'
if self.extra_components: if self.extra_components:
components += ' universe multiverse' components += ' universe multiverse'