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.

ubuntu/zesty
Łukasz 'sil2100' Zemczak 7 years ago
parent e7935db365
commit bab506b825

@ -104,6 +104,7 @@ add_binary_hook ()
BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1" BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
} }
if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT:$SUBPROJECT in case $PROJECT:$SUBPROJECT in
ubuntu-cpc:*) ubuntu-cpc:*)
IMAGEFORMAT=ext4 IMAGEFORMAT=ext4
@ -112,6 +113,7 @@ case $PROJECT:$SUBPROJECT in
IMAGEFORMAT=plain IMAGEFORMAT=plain
;; ;;
esac esac
fi
case $IMAGEFORMAT in case $IMAGEFORMAT in
ext2|ext3|ext4) ext2|ext3|ext4)

Loading…
Cancel
Save