From 791c1d95fc5bf40118501c10a55fab852720dc1c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Nov 2014 11:30:02 +0100 Subject: [PATCH] Import patches-unapplied version 2.263 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: 75fc29334d9906f77a4ad1e6a4de4f1e5723ea70 New changelog entries: * live-build/auto/config: - explicitly set KERNEL_FLAVOURS=generic to get the right kernel on armhf --- debian/changelog | 8 ++++++++ live-build/auto/config | 3 +++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 027f354d..3596cc9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.263) vivid; urgency=medium + + * live-build/auto/config: + - explicitly set KERNEL_FLAVOURS=generic to get the right kernel + on armhf + + -- Michael Vogt Mon, 03 Nov 2014 11:30:02 +0100 + livecd-rootfs (2.262) vivid; urgency=medium * fix typo in 99zz-check-uid-gid.chroot diff --git a/live-build/auto/config b/live-build/auto/config index f64c4fcf..5f39731d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -353,6 +353,9 @@ case $PROJECT in add_package install grub-pc ;; esac + # generic kernel on amd64/arm for now + KERNEL_FLAVOURS=generic + # contains the framework definition add_package install ubuntu-core-libs