summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-12-01 00:36:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-08 10:31:29 +0000
commite02affce3c965b7aeb931e0334cb834c944c050c (patch)
treef30d57fc3086d713721a1e72213ec24e0c46125a
parent4cf1310051df6f2649510e4bb8dcae8b52b692a0 (diff)
downloadpoky-e02affce3c965b7aeb931e0334cb834c944c050c.tar.gz
kernel.bbclass: Avoid wildcards for kernel images
With multiple kernel images enabled starting with 'vmlinux', e.g. vmlinux.gz and vmlinux.bin, all files landed inside the kernel-vmlinux package. On top of that, even initramfs images were included, e.g. vmlinux.gz-initramfs-*. (From OE-Core rev: b7f4133b44b740e8ac8e758b0d4a3ee32d326332) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 0cc8af6fae..abf9d6567e 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -48,7 +48,7 @@ python __anonymous () {
48 48
49 d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower) 49 d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower)
50 50
51 d.setVar('FILES_kernel-image-' + typelower, '/boot/' + type + '*') 51 d.setVar('FILES_kernel-image-' + typelower, '/boot/' + type + '-${KERNEL_VERSION_NAME}')
52 52
53 d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + typelower) 53 d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + typelower)
54 54
@@ -486,7 +486,7 @@ FILES_${PN} = ""
486FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin" 486FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin"
487FILES_kernel-image = "" 487FILES_kernel-image = ""
488FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build" 488FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build"
489FILES_kernel-vmlinux = "/boot/vmlinux*" 489FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
490FILES_kernel-modules = "" 490FILES_kernel-modules = ""
491RDEPENDS_kernel = "kernel-base" 491RDEPENDS_kernel = "kernel-base"
492# Allow machines to override this dependency if kernel image files are 492# Allow machines to override this dependency if kernel image files are