ogra@anubis:~/datengrab/devel/branches/livecd-rootfs$ bzr diff
=== modified file 'debian/changelog'
--- debian/changelog 2016-04-21 13:02:02 +0000
+++ debian/changelog 2016-04-28 14:51:03 +0000
@@ -1,3 +1,10 @@
+livecd-rootfs (2.408+ppa1) UNRELEASED; urgency=medium
+
+ * allow u-boot on all arches (install u-boot-tools everywhere)
+ * remove /boot/grub/grub.cfg if it exists
+
+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 28 Apr 2016 16:50:13 +0200
+
livecd-rootfs (2.408) xenial; urgency=medium
* drop linux-firmware-raspi2, it does not actually contain driver
=== modified file 'live-build/auto/config'
--- live-build/auto/config 2016-04-21 09:16:15 +0000
+++ live-build/auto/config 2016-04-28 14:48:33 +0000
@@ -367,6 +367,8 @@
# no Task: header yet
add_package install snapd
add_package install ubuntu-core-snapd-units
+ # we want all arches to have u-boot-tools
+ add_package install u-boot-tools
# no minimal as we want to be really minimal
#add_task install minimal
@@ -395,12 +397,6 @@
add_package install grub-efi-amd64-signed
add_package install shim-signed
;;
- armhf)
- add_package install flash-kernel u-boot-tools
- ;;
- arm64)
- add_package install u-boot-tools
- ;;
esac
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
=== modified file 'live-build/ubuntu-core/hooks/15-remove-grub-common.chroot'
--- live-build/ubuntu-core/hooks/15-remove-grub-common.chroot 2015-04-14 21:33:06 +0000
+++ live-build/ubuntu-core/hooks/15-remove-grub-common.chroot 2016-04-28 14:50:05 +0000
@@ -1,4 +1,5 @@
#!/bin/sh
# see bug https://bugs.launchpad.net/snappy-ubuntu/+bug/1442231
-rm -f /etc/init.d/grub-common
\ No newline at end of file
+rm -f /etc/init.d/grub-common
+[ -e /boot/grub/grub.cfg ] && rm -f /boot/grub/grub.cfg