From 79f342f1d0a273ca792c1307907435c6450090c9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Nov 2014 11:45:00 +0100 Subject: [PATCH] Import patches-unapplied version 2.264 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: 791c1d95fc5bf40118501c10a55fab852720dc1c New changelog entries: * live-build/auto/config: - also install flash-kernel/u-boot-tools in the armhf system-image, thanks to Adam Conrad --- debian/changelog | 8 ++++++++ live-build/auto/config | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3596cc9a..0875fa04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.264) vivid; urgency=low + + * live-build/auto/config: + - also install flash-kernel/u-boot-tools in the armhf system-image, + thanks to Adam Conrad + + -- Michael Vogt Mon, 03 Nov 2014 11:45:00 +0100 + livecd-rootfs (2.263) vivid; urgency=medium * live-build/auto/config: diff --git a/live-build/auto/config b/live-build/auto/config index 5f39731d..25c5a686 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -349,8 +349,12 @@ case $PROJECT in add_package install dbus add_package install libpam-systemd case $ARCH in - i386|amd64) - add_package install grub-pc ;; + i386|amd64) + add_package install grub-pc + ;; + armhf) + add_package install flash-kernel u-boot-tools + ;; esac # generic kernel on amd64/arm for now