Merge lp:~bzoltan/click/extend_1410_fw into lp:click
- extend_1410_fw
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 448 |
Merged at revision: | 440 |
Proposed branch: | lp:~bzoltan/click/extend_1410_fw |
Merge into: | lp:click |
Diff against target: |
78 lines (+41/-15) 1 file modified
click/chroot.py (+41/-15) |
To merge this branch: | bzr merge lp:~bzoltan/click/extend_1410_fw |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Michael Vogt | Approve | ||
Review via email: mp+227675@code.launchpad.net |
Commit message
Added a set of APIs to the 14.10 frameworks
Description of the change
Added a set of APIs to the 14.10 frameworks
PS Jenkins bot (ps-jenkins) wrote : | # |
Colin Watson (cjwatson) wrote : | # |
Please keep entries sorted within each list. (I think there's one violation of that right now, which you can fix.)
You've introduced a tab for indentation, as reported by pep8 via Jenkins. Please fix.
You've introduced at least three duplicate items ("libqt5sensors
It's unnecessary to explicitly expand out dependencies, including but not limited to libcontent-hub0 (a dependency of libcontent-hub-dev) or libqt5script5 (a dependency of qtscript5-dev). Please remove these. The less noise there is in this list, the easier it will be to see what's going on. In general this patch seems to introduce a great deal of noise and it's quite difficult to work out what it's meant to actually do. Try to keep your patches minimal and then it's easier to review them.
The change of "qtdeclarative5
Could you please confirm that each and every new item in this list is also part of the sdk-libs-dev seed? The long-term intention is for this manually-maintained list in "click chroot" to be replaced by simply installing ubuntu-
- 441. By Zoltan Balogh
-
Remove tab indentation
- 442. By Zoltan Balogh
-
Sort 14.10 fw package list
- 443. By Zoltan Balogh
-
Remove duplications from the 14.10 fw package list
- 444. By Zoltan Balogh
-
Remove unnecessary TARGET for qtdeclarative5-
dev-tools in 14.10 fw package list
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:443
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:444
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
- 445. By Zoltan Balogh
-
Remove packages from the 14.10 fw what are pulled by any package already on the list
Zoltan Balogh (bzoltan) wrote : | # |
Yes, I can confirm that all these new packages are from the ubuntu-sdk-libs-dev and ubuntu-sdk-libs.
I made a short shell script to loop through the framework package list and check the rdepends for each package if any of the listed package would pull. There were many. Qt's dependency tree is complex, deep and not easy to follow. Some of the packages have strange dependencies. For example if I would eliminate all redundancy in this list I would end up removing the UITK because the qtdeclarative5-
Anyhow, the list is more logical now.
And yes, the best solution would be to simple pull ubuntu-
The present solution I find a bit confusing as we have double definition of the frameworks and neither of them are complete or stable.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:445
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Michael Vogt (mvo) wrote : | # |
I'm working on the goal to have "apt-get install ubuntu-
Zoltan Balogh (bzoltan) wrote : | # |
> I'm working on the goal to have "apt-get install ubuntu-
> and I'm making some good progress here.
That is great. In the meantime it would be good to get these APIs in to the default chroots.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:446
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Michael Vogt (mvo) wrote : | # |
Thanks for this branch and for the updates.
I looked over the seed and all new packages are also part of the sdk-libs or sdk-libs-dev seed. So thats all good.
One question: There is a commit r446 that looks empty, was this maybe a accidental commit? If so, a uncommit would be nice. Otherwise it looks good to me.
Zoltan Balogh (bzoltan) wrote : | # |
Jenkins fell on its face on 2014-07-22. The empty commit is a gentle kick to restart the build.
I am happy to uncomit.
Thanks for reviewing!
- 446. By Zoltan Balogh
-
Install the UITK docs with the relevant fw API documentation to the chroots
- 447. By Zoltan Balogh
-
remove line duplication
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:447
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
- 448. By Zoltan Balogh
-
Add the Setting API from the Qt.Labs
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:448
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Colin Watson (cjwatson) wrote : | # |
This mostly looks good now, thanks. The result of this change includes dropping qt5-default:armhf from the chroot (verified empirically), which seems unlikely to be intentional since it's in ubuntu-
Preview Diff
1 | === modified file 'click/chroot.py' |
2 | --- click/chroot.py 2014-07-03 11:03:24 +0000 |
3 | +++ click/chroot.py 2014-08-05 11:49:17 +0000 |
4 | @@ -73,6 +73,7 @@ |
5 | "qtscript5-dev:TARGET", |
6 | "qtsensors5-dev:TARGET", |
7 | "qttools5-dev:TARGET", |
8 | + "ubuntu-ui-toolkit-doc", |
9 | ], |
10 | "ubuntu-sdk-14.04": [ |
11 | "cmake", |
12 | @@ -94,27 +95,52 @@ |
13 | "qtsensors5-dev:TARGET", |
14 | "qttools5-dev:TARGET", |
15 | "qttools5-dev-tools:TARGET", |
16 | + "ubuntu-ui-toolkit-doc", |
17 | ], |
18 | "ubuntu-sdk-14.10": [ |
19 | "cmake", |
20 | - "libqt5svg5-dev:TARGET", |
21 | - "libqt5webkit5-dev:TARGET", |
22 | - "libqt5xmlpatterns5-dev:TARGET", |
23 | - "libunity-scopes-dev:TARGET", |
24 | - # bug #1316930, needed for autopilot |
25 | - "python3", |
26 | - "qmlscene:TARGET", |
27 | - "qt3d5-dev:TARGET", |
28 | - "qt5-default:TARGET", |
29 | - "qtbase5-dev:TARGET", |
30 | - "qtdeclarative5-dev:TARGET", |
31 | - "qtdeclarative5-dev-tools", |
32 | - "qtlocation5-dev:TARGET", |
33 | - "qtmultimedia5-dev:TARGET", |
34 | - "qtscript5-dev:TARGET", |
35 | + "libcontent-hub-dev:TARGET", |
36 | + "libqt5keychain0:TARGET", |
37 | "libqt5sensors5-dev:TARGET", |
38 | + "libqt5svg5-dev:TARGET", |
39 | + "libqt5webkit5-dev:TARGET", |
40 | + "libqt5xmlpatterns5-dev:TARGET", |
41 | + "libunity-scopes-dev:TARGET", |
42 | + # bug #1316930, needed for autopilot |
43 | + "python3", |
44 | + "qml-module-qt-labs-settings:TARGET", |
45 | + "qml-module-qtmultimedia:TARGET", |
46 | + "qml-module-qtquick-layouts:TARGET", |
47 | + "qml-module-qtsensors:TARGET", |
48 | + "qml-module-qtwebkit:TARGET", |
49 | + "qmlscene:TARGET", |
50 | + "qt3d5-dev:TARGET", |
51 | + "qtdeclarative5-accounts-plugin:TARGET", |
52 | + "qtdeclarative5-dev-tools", |
53 | + "qtdeclarative5-folderlistmodel-plugin:TARGET", |
54 | + "qtdeclarative5-localstorage-plugin:TARGET", |
55 | + "qtdeclarative5-online-accounts-client0.1:TARGET", |
56 | + "qtdeclarative5-particles-plugin:TARGET", |
57 | + "qtdeclarative5-poppler1.0:TARGET", |
58 | + "qtdeclarative5-qtlocation-plugin:TARGET", |
59 | + "qtdeclarative5-qtorganizer-plugin:TARGET", |
60 | + "qtdeclarative5-qtpositioning-plugin:TARGET", |
61 | + "qtdeclarative5-u1db1.0:TARGET", |
62 | + "qtdeclarative5-ubuntu-content0.1:TARGET", |
63 | + "qtdeclarative5-ubuntu-download-manager0.1:TARGET", |
64 | + "qtdeclarative5-ubuntu-mediascanner0.1:TARGET", |
65 | + "qtdeclarative5-ubuntu-syncmonitor0.1:TARGET", |
66 | + "qtdeclarative5-ubuntu-telephony-phonenumber0.1:TARGET", |
67 | + "qtdeclarative5-ubuntu-ui-toolkit-plugin:TARGET", |
68 | + "qtdeclarative5-usermetrics0.1:TARGET", |
69 | + "qtdeclarative5-xmllistmodel-plugin:TARGET", |
70 | + "qtlocation5-dev:TARGET", |
71 | + "qtmultimedia5-dev:TARGET", |
72 | + "qtscript5-dev:TARGET", |
73 | "qttools5-dev:TARGET", |
74 | "qttools5-dev-tools:TARGET", |
75 | + "ubuntu-html5-theme:TARGET", |
76 | + "ubuntu-ui-toolkit-doc", |
77 | ], |
78 | } |
79 |
FAILED: Continuous integration, rev:440 jenkins. qa.ubuntu. com/job/ click-ci/ 8/ jenkins. qa.ubuntu. com/job/ click-utopic- amd64-ci/ 8/console jenkins. qa.ubuntu. com/job/ click-utopic- armhf-ci/ 8/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/click- ci/8/rebuild
http://