mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-13 08:01:09 +00:00
pbuilder-dist: change --mirror logic to use -ports when appropriate
This commit is contained in:
parent
384cba2e19
commit
6661936718
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -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:
|
||||
|
||||
|
@ -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'
|
||||
|
Loading…
x
Reference in New Issue
Block a user