From dd4f8452559069693b54b7be9a33c28788d95095 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 13 Nov 2015 10:54:03 +0100 Subject: [PATCH] do not ship assets/dtbs/overlays in raspi2 tarball, it breaks ubuntu-device-flash --- debian/changelog | 7 +++++++ live-build/auto/build | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index fed3b79d..518fc012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.354) UNRELEASED; urgency=medium + + * do not ship assets/dtbs/overlays in raspi2 tarball, it breaks + ubuntu-device-flash + + -- Oliver Grawert Fri, 13 Nov 2015 10:53:13 +0100 + livecd-rootfs (2.353) xenial; urgency=medium * drop input group from snappy images, adjust md5 sums in diff --git a/live-build/auto/build b/live-build/auto/build index b8a94047..96f9d766 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -425,6 +425,15 @@ case $PROJECT:$SUBPROJECT in dtbs=$(find lib/firmware -type d -name 'device-tree' -print0) if [ -n "$dtbs" ]; then mv "$dtbs" $TMPDIR/assets/dtbs + case $devarch in + raspi2) + # ubuntu-device-flash does not like subdirs here, we need to tar it up + if [ -e $TMPDIR/assets/dtbs/overlays ]; then + tar -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays + rm -rf $TMPDIR/assets/dtbs/overlays + fi + ;; + esac fi # create hardware.yaml