From dd4f8452559069693b54b7be9a33c28788d95095 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 13 Nov 2015 10:54:03 +0100 Subject: [PATCH 1/4] 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 From 84ad95e54b5c4c6a15d58e6f2d51376172ed86ae Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 13 Nov 2015 10:54:34 +0100 Subject: [PATCH 2/4] releasing package livecd-rootfs version 2.354 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 518fc012..abe4cc49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.354) UNRELEASED; urgency=medium +livecd-rootfs (2.354) xenial; urgency=medium * do not ship assets/dtbs/overlays in raspi2 tarball, it breaks ubuntu-device-flash From 7ccc9cb7069160a54d0c907266df93d287f1753e Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 13 Nov 2015 12:53:12 +0100 Subject: [PATCH 3/4] fix input group on snappy --- debian/changelog | 6 ++++++ live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index abe4cc49..0e80ce48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.355) UNRELEASED; urgency=medium + + * fix input group in snappy + + -- Oliver Grawert Fri, 13 Nov 2015 12:52:34 +0100 + livecd-rootfs (2.354) xenial; urgency=medium * do not ship assets/dtbs/overlays in raspi2 tarball, it breaks diff --git a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early index 41bc634c..eabdbecd 100755 --- a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early +++ b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early @@ -152,6 +152,7 @@ docker:x:113:ubuntu syslog:x:114: pkcs11:x:115:root tss:x:116: +input:x:107: EOF else echo "/etc/group post-debootstrap hash doesn't match record" >&2 @@ -217,6 +218,7 @@ docker:!::ubuntu syslog:!:: pkcs11:!::root tss:!:: +input:!:: EOF else echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2 From 22bce35de4e0fabf4a893a8c84790e1949ecca40 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 13 Nov 2015 12:53:37 +0100 Subject: [PATCH 4/4] releasing package livecd-rootfs version 2.355 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0e80ce48..0ac43fd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.355) UNRELEASED; urgency=medium +livecd-rootfs (2.355) xenial; urgency=medium * fix input group in snappy