Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-12 20:01:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.354 to ubuntu/xenial-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 3242ef6c5973f8913775b8699e23db390733efb7

New changelog entries:
  * do not ship assets/dtbs/overlays in raspi2 tarball, it breaks
    ubuntu-device-flash
This commit is contained in:
Oliver Grawert 2015-11-13 10:53:13 +01:00 committed by usd-importer
parent 3242ef6c59
commit 1aa0f77240
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.354) xenial; 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
* drop input group from snappy images, adjust md5 sums in

9
live-build/auto/build
View File

@ -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