From 0714b6b801f91a24da570fc572dbe296bf9c41f0 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 13 Nov 2017 09:15:13 -0800 Subject: [PATCH] Import patches-unapplied version 2.483 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: bc18c8a9926739d9e986974ebc665c151ed39327 New changelog entries: * Fix lingering reference to livecd-rootfs.ubuntu-core.model-assertion that breaks the ubuntu-core image build. --- debian/changelog | 7 +++++++ live-build/auto/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f801abe0..8462512b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.483) bionic; urgency=medium + + * Fix lingering reference to livecd-rootfs.ubuntu-core.model-assertion + that breaks the ubuntu-core image build. + + -- Steve Langasek Mon, 13 Nov 2017 09:15:13 -0800 + livecd-rootfs (2.482) bionic; urgency=medium * Remove boot/grub leftovers from our root squashfs, left behind after diff --git a/live-build/auto/config b/live-build/auto/config index 697f7720..8c749ec6 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -184,7 +184,7 @@ case $IMAGEFORMAT in # Store model assertion in top dir to get it picked up later as a build artifact env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion echo "Configured ubuntu-image for the following model assertion:" - cat livecd."$PROJECT".model-assertion + cat "$PREFIX".model-assertion echo "----------------------------------------------------------" # Fake finished configuration for lb build mkdir -p .build