click

Merge lp:~bzoltan/click/local_mirrors_conditional into lp:click/devel

  1. local_mirrors_conditional
  2. Merge into devel
Proposed by Zoltan Balogh
Status: Merged
Approved by: Michael Vogt
Approved revision: 556
Merged at revision: 556
Proposed branch: lp:~bzoltan/click/local_mirrors_conditional
Merge into: lp:click/devel
Diff against target: 31 lines (+3/-4)
1 file modified
click/chroot.py (+3/-4)
To merge this branch: bzr merge lp:~bzoltan/click/local_mirrors_conditional
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+249603@code.launchpad.net

Commit message

Remove qt5-qmake-arm-linux-gnueabihf from the fw definition as it is listed in the ubuntu-sdk-libs-tools and make the use of local mirrors conditional.

Description of the change

Remove qt5-qmake-arm-linux-gnueabihf from the fw definition as it is listed in the ubuntu-sdk-libs-tools and make the use of local mirrors conditional.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/chroot.py'
2--- click/chroot.py 2015-01-23 17:55:52 +0000
3+++ click/chroot.py 2015-02-13 05:50:22 +0000
4@@ -176,9 +176,6 @@
5 "ubuntu-sdk-libs-dev:{TARGET}",
6 # the native build tools
7 "ubuntu-sdk-libs-tools",
8- # FIXME: this is only available on i386/amd64 currently
9- # FIXME2: this will be installed but useless on non armhf chroots
10- "qt5-qmake-arm-linux-gnueabihf",
11 # FIXME: see
12 # http://pad.lv/~mvo/oxide/crossbuild-friendly/+merge/234093
13 # we help the apt resolver here until the
14@@ -202,6 +199,9 @@
15
16
17 def get_geoip_country_code_prefix():
18+ click_no_local_mirror = os.environ.get('CLICK_NO_LOCAL_MIRROR', 'auto')
19+ if click_no_local_mirror == '1':
20+ return ""
21 try:
22 with urllib.request.urlopen(GEOIP_SERVER) as f:
23 xml_data = f.read()
24@@ -211,7 +211,6 @@
25 pass
26 return ""
27
28-
29 def generate_sources(series, native_arch, target_arch,
30 archive_mirror, ports_mirror, components):
31 """Generate a list of strings for apts sources.list.

Subscribers

People subscribed via source and target branches

to all changes: