Import patches-unapplied version 2.483 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: bc18c8a992

New changelog entries:
  * Fix lingering reference to livecd-rootfs.ubuntu-core.model-assertion
    that breaks the ubuntu-core image build.
impish
Steve Langasek 7 years ago committed by usd-importer
parent bc18c8a992
commit 0714b6b801

7
debian/changelog vendored

@ -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 <steve.langasek@ubuntu.com> Mon, 13 Nov 2017 09:15:13 -0800
livecd-rootfs (2.482) bionic; urgency=medium livecd-rootfs (2.482) bionic; urgency=medium
* Remove boot/grub leftovers from our root squashfs, left behind after * Remove boot/grub leftovers from our root squashfs, left behind after

@ -184,7 +184,7 @@ case $IMAGEFORMAT in
# Store model assertion in top dir to get it picked up later as a build artifact # 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 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:" echo "Configured ubuntu-image for the following model assertion:"
cat livecd."$PROJECT".model-assertion cat "$PREFIX".model-assertion
echo "----------------------------------------------------------" echo "----------------------------------------------------------"
# Fake finished configuration for lb build # Fake finished configuration for lb build
mkdir -p .build mkdir -p .build

Loading…
Cancel
Save