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.

This commit is contained in:
Łukasz 'sil2100' Zemczak 2017-11-21 17:01:40 +01:00
parent 492200ba16
commit 03e8249758
2 changed files with 15 additions and 5 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.408.24) UNRELEASED; urgency=medium
* 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 artful.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 21 Nov 2017 17:01:14 +0100
livecd-rootfs (2.408.23) xenial; urgency=medium
[ Gary Wang ]

View File

@ -107,11 +107,13 @@ add_binary_hook ()
BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
}
case $PROJECT in
ubuntu-cpc)
IMAGEFORMAT=ext4
;;
esac
if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT in
ubuntu-cpc)
IMAGEFORMAT=ext4
;;
esac
fi
case $IMAGEFORMAT in
ext2|ext3|ext4)