ubuntu-cpc: Ensure base disk image is the same between all build targets

The following targets have livecd.ubuntu-cpc.manifest (and
livecd.ubuntu-cpc.ext4) which differ in some way from the 'all'
target. They are all missing grub-efi and other modifications:

root-dir
squashfs
tarball

These targets do not depend on the 'disk-image' target. This means that
the ext4 produced will lack the uefi modifications (and any from the
disk-image target binary hooks).

Since the ext4 file is common to all builds there is a chance that a
parallel build from one of these targets could overwrite this artifact.
This patch ensures that all targets will produce consistent base output.
This commit is contained in:
Robert C Jennings 2019-05-01 09:56:34 -05:00
parent 0bfc5c4290
commit 05850394d7
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73
4 changed files with 9 additions and 0 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.580.1) UNRELEASED; urgency=medium
* ubuntu-cpc: Ensure base disk image is the same between all build targets
-- Robert C Jennings <robert.jennings@canonical.com> Thu, 02 May 2019 16:03:39 -0500
livecd-rootfs (2.580) eoan; urgency=medium
* Run clean_debian_chroot after minimize_manual (LP: #1826377)

View File

@ -1 +1,2 @@
depends disk-image
base/create-root-dir.binary

View File

@ -1,2 +1,3 @@
depends disk-image
depends root-dir
base/root-squashfs.binary

View File

@ -1,2 +1,3 @@
depends disk-image
depends root-dir
base/root-xz.binary