From 00b995c7e294a9565a0a4dcccd08611537ef3abe Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Wed, 1 May 2019 09:56:34 -0500 Subject: [PATCH] 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. --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks.d/base/series/root-dir | 1 + live-build/ubuntu-cpc/hooks.d/base/series/squashfs | 1 + live-build/ubuntu-cpc/hooks.d/base/series/tarball | 1 + 4 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index b76e2fd2..358055a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.578.3) UNRELEASED; urgency=medium + + * ubuntu-cpc: Ensure base disk image is the same between all build targets + (LP: #1827426) + + -- Robert C Jennings Thu, 02 May 2019 16:02:10 -0500 + livecd-rootfs (2.578.2) disco; urgency=medium * Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds. diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/root-dir b/live-build/ubuntu-cpc/hooks.d/base/series/root-dir index b5d3b4e4..32a02423 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/root-dir +++ b/live-build/ubuntu-cpc/hooks.d/base/series/root-dir @@ -1 +1,2 @@ +depends disk-image base/create-root-dir.binary diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/squashfs b/live-build/ubuntu-cpc/hooks.d/base/series/squashfs index 60332761..aee4ce40 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/squashfs +++ b/live-build/ubuntu-cpc/hooks.d/base/series/squashfs @@ -1,2 +1,3 @@ +depends disk-image depends root-dir base/root-squashfs.binary diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/tarball b/live-build/ubuntu-cpc/hooks.d/base/series/tarball index 2ea30bf2..b0634f47 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/tarball +++ b/live-build/ubuntu-cpc/hooks.d/base/series/tarball @@ -1,2 +1,3 @@ +depends disk-image depends root-dir base/root-xz.binary