diff --git a/debian/changelog b/debian/changelog index 638b7e38..ed16447f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.554) UNRELEASED; urgency=medium + + * Default to IMAGEFORMAT=ubuntu-image for raspi3 ubuntu-cpc builds. + * Rename the resulting raspi3 image file to *.disk1.img.xz to be compatible + with how raspi2 images are provided. + + -- Ɓukasz 'sil2100' Zemczak Wed, 09 Jan 2019 10:34:59 +0100 + livecd-rootfs (2.553) disco; urgency=medium * Add a LXD image to builds for the buildd subproject. diff --git a/live-build/auto/build b/live-build/auto/build index a980c26c..970d66af 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -43,8 +43,11 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then # XXX: currently we only have one image generated, but really # we should be supporting more than one for models that # define those. - mv output/*.img "$PREFIX".img - xz -0 -T4 "$PREFIX".img + # Also, we use the .disk1.img suffix so that the resulting + # image path is compatible with how raspi2 images are consumed + # by cdimage. + mv output/*.img "$PREFIX".disk1.img + xz -0 -T4 "$PREFIX".disk1.img mv output/filesystem.manifest "$PREFIX".manifest fi diff --git a/live-build/auto/config b/live-build/auto/config index 2cafdb4e..c9ec49f1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -109,7 +109,12 @@ add_binary_hook () if [ -z "${IMAGEFORMAT:-}" ]; then case $PROJECT:${SUBPROJECT:-} in ubuntu-cpc:*) - IMAGEFORMAT=ext4 + if [ "$SUBARCH" = "raspi3" ]; then + # For now only raspi3, but others are soon to follow + IMAGEFORMAT=ubuntu-image + else + IMAGEFORMAT=ext4 + fi ;; ubuntu-server:live) IMAGEFORMAT=plain