do not ship assets/dtbs/overlays in raspi2 tarball, it breaks ubuntu-device-flash

ubuntu/yakkety
Oliver Grawert 9 years ago
parent 63f28ec693
commit dd4f845255

7
debian/changelog vendored

@ -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 <ogra@ubuntu.com> Fri, 13 Nov 2015 10:53:13 +0100
livecd-rootfs (2.353) xenial; urgency=medium livecd-rootfs (2.353) xenial; urgency=medium
* drop input group from snappy images, adjust md5 sums in * drop input group from snappy images, adjust md5 sums in

@ -425,6 +425,15 @@ case $PROJECT:$SUBPROJECT in
dtbs=$(find lib/firmware -type d -name 'device-tree' -print0) dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
if [ -n "$dtbs" ]; then if [ -n "$dtbs" ]; then
mv "$dtbs" $TMPDIR/assets/dtbs 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 fi
# create hardware.yaml # create hardware.yaml

Loading…
Cancel
Save