Merge lp://qastaging/~cjwatson/ubuntu-system-image/cdimage-custom into lp://qastaging/~registry/ubuntu-system-image/client
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~cjwatson/ubuntu-system-image/cdimage-custom |
| Merge into: | lp://qastaging/~registry/ubuntu-system-image/client |
| Diff against target: |
7377 lines (+7236/-0) (has conflicts) 25 files modified
.bzrignore (+9/-0) README (+12/-0) bin/copy-image (+308/-0) bin/generate-keyrings (+87/-0) bin/generate-keys (+61/-0) bin/import-images (+305/-0) bin/set-phased-percentage (+90/-0) bin/si-shell (+79/-0) etc/config.example (+48/-0) lib/systemimage/config.py (+206/-0) lib/systemimage/diff.py (+242/-0) lib/systemimage/generators.py (+1173/-0) lib/systemimage/gpg.py (+239/-0) lib/systemimage/tools.py (+367/-0) lib/systemimage/tree.py (+999/-0) tests/generate-keys (+52/-0) tests/run (+60/-0) tests/test_config.py (+281/-0) tests/test_diff.py (+265/-0) tests/test_generators.py (+1039/-0) tests/test_gpg.py (+163/-0) tests/test_static.py (+78/-0) tests/test_tools.py (+297/-0) tests/test_tree.py (+679/-0) utils/check-latest (+97/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. |
| To merge this branch: | bzr merge lp://qastaging/~cjwatson/ubuntu-system-image/cdimage-custom |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Registry Administrators | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-10-10.
Commit message
Add a new cdimage-custom generator.
Description of the change
Add a new cdimage-custom generator.
This is basically just a clone-and-hack of cdimage-ubuntu, simplified somewhat. It goes with recent changes to ubuntu-cdimage, and is all with the aim of being able to fix bug 1367332 (moving some click packages to /custom) in a single step for the community Ubuntu images.
Unmerged revisions
- 246. By Colin Watson
-
Add a new cdimage-custom generator.
- 245. By Stéphane Graber
-
Drop system/
android/ cache/recovery from core image. - 244. By Stéphane Graber
-
Hash http filepaths by default using a combination of the URL and version string, update code to pass current pep-8 test.
- 243. By Stéphane Graber
-
Fix variable names conflicts.
- 242. By Stéphane Graber
-
Use a comma as the separator to avoid ini parsing errors.
- 241. By Stéphane Graber
-
Add support for device overrides.
- 240. By Stéphane Graber
-
Add device name to version tarball.
- 239. By Stéphane Graber
-
Fix incorrect path for download cache in core image
- 238. By Stéphane Graber
-
Add /android/
cache/recovery to core builds for now. - 237. By Stéphane Graber
-
Skip android bits for non-touch
