diff --git a/debian/changelog b/debian/changelog index 88ea5f17..3a0bbedb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.275+ppa5) vivid; urgency=low + + * use generic kernel for all ubuntu-core system-image + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 21 Jan 2015 14:39:31 +0100 + livecd-rootfs (2.275+ppa4) vivid; urgency=low * live-build/ubuntu-core/hooks/01-setup_user.chroot: diff --git a/live-build/auto/config b/live-build/auto/config index 1d6ae894..f76d1a9b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -367,14 +367,13 @@ case $PROJECT in esac # generic kernel etc + KERNEL_FLAVOURS=generic case $ARCH in i386|amd64) add_package install grub-pc - KERNEL_FLAVOURS=virtual ;; armhf) add_package install flash-kernel u-boot-tools - KERNEL_FLAVOURS=generic ;; esac OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"