use generic kernel for all ubuntu-core system-image

This commit is contained in:
Michael Vogt 2015-01-21 14:40:09 +01:00
parent f786a86cb2
commit 4a31290a0f
2 changed files with 7 additions and 2 deletions

6
debian/changelog vendored
View File

@ -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:

View File

@ -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"