Merge lp://staging/~tribaal/livecd-rootfs/xenial-proposed-build-info-minimal into lp://staging/livecd-rootfs
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~tribaal/livecd-rootfs/xenial-proposed-build-info-minimal |
| Merge into: | lp://staging/livecd-rootfs |
| Diff against target: |
2194 lines (+1501/-92) (has conflicts) 20 files modified
debian/changelog (+335/-0) debian/control (+30/-1) debian/tests/control (+7/-0) debian/tests/default-bootstraps (+96/-0) debian/tests/minimized (+3/-0) live-build/auto/build (+135/-2) live-build/auto/config (+228/-17) live-build/ubuntu-cpc/functions.OTHER (+320/-0) live-build/ubuntu-cpc/hooks/030-root-tarball.binary.OTHER (+27/-0) live-build/ubuntu-cpc/hooks/032-disk-image.binary (+6/-0) live-build/ubuntu-cpc/hooks/032-root-squashfs.binary (+3/-0) live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary (+39/-0) live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary (+9/-0) live-build/ubuntu-cpc/hooks/040-qcow2-image.binary (+10/-1) live-build/ubuntu-cpc/hooks/040-vmdk-image.binary (+25/-8) live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary (+44/-13) live-build/ubuntu-cpc/hooks/042-vagrant.binary (+135/-50) live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot (+9/-0) live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot (+35/-0) live-build/ubuntu-cpc/hooks/999-extras.binary (+5/-0) Text conflict in debian/changelog Text conflict in debian/control Conflict adding file debian/tests. Moved existing file to debian/tests.moved. Text conflict in live-build/auto/build Text conflict in live-build/auto/config Contents conflict in live-build/ubuntu-cpc/functions Contents conflict in live-build/ubuntu-cpc/hooks/030-root-tarball.binary Text conflict in live-build/ubuntu-cpc/hooks/032-disk-image.binary Text conflict in live-build/ubuntu-cpc/hooks/032-root-squashfs.binary Text conflict in live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary Text conflict in live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary Text conflict in live-build/ubuntu-cpc/hooks/040-qcow2-image.binary Text conflict in live-build/ubuntu-cpc/hooks/040-vmdk-image.binary Text conflict in live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary Text conflict in live-build/ubuntu-cpc/hooks/042-vagrant.binary Conflict adding file live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot. Moved existing file to live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot.moved. Text conflict in live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot Text conflict in live-build/ubuntu-cpc/hooks/999-extras.binary Conflict adding file live-build/ubuntu-touch-custom. Moved existing file to live-build/ubuntu-touch-custom.moved. |
| To merge this branch: | bzr merge lp://staging/~tribaal/livecd-rootfs/xenial-proposed-build-info-minimal |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2018-03-28.
Description of the change
This change backports changes from bionic where the /etc/cloud/
Unmerged revisions
- 1455. By Chris Glass
-
ubuntu-cpc: When performing a minimized build make sure the
/etc/cloud/build.info file says "minimal" (LP: #1759519) - 1454. By Steve Langasek
-
Merge lp:~daniel-thewatkins/livecd-rootfs/minimized-skips-xenial
- 1453. By Balint Reczey
-
releasing package livecd-rootfs version 2.408.27
- 1452. By Balint Reczey
- 1451. By Łukasz Zemczak
-
releasing package livecd-rootfs version 2.408.26
- 1450. By Łukasz Zemczak
-
Changed default user configuration in the vagrant image, in accordance with the vagrant community's expectations
- 1449. By Balint Reczey
-
releasing package livecd-rootfs version 2.408.25
- 1448. By Balint Reczey
- 1447. By Łukasz Zemczak
-
releasing package livecd-rootfs version 2.408.24
- 1446. By Łukasz Zemczak
-
For the IMAGEFORMAT=none parts to work for ubuntu-image classic builds, we need to make sure IMAGEFORMAT is preserved and not overwritten if defined. Backporting from trunk.
