summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-10-17 00:34:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-19 23:06:26 +0100
commitcaba9cbfce09f19eb27f4c6615c0c5c48e1a2952 (patch)
treef5867c7b8e5b8de8f05ff4035369f797a65d39f2 /meta/classes
parentfadb4079014514beb7d2d3e6c66f63397d4ebce2 (diff)
downloadpoky-caba9cbfce09f19eb27f4c6615c0c5c48e1a2952.tar.gz
kernel.bbclass: add kernel-modules to PACKAGES
* kernel-modules is always added to PACKAGES later in python code and needed to be defined as PACKAGES_DYNAMIC * add it to PACKAGES directly and set ALLOW_EMPTY_kernel-modules FILES_kernel-modules DESCRIPTION_kernel-modules outside populate_packages_prepend like for other packages and set only RDEPENDS_kernel-modules from python code (From OE-Core rev: 0884bdbbf39f2b3a8a342918812f29ddcd3b1e6f) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel.bbclass10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 8c5aaf5848..a47fe93cb7 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -257,11 +257,12 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
257 257
258# kernel-base becomes kernel-${KERNEL_VERSION} 258# kernel-base becomes kernel-${KERNEL_VERSION}
259# kernel-image becomes kernel-image-${KERNEL_VERISON} 259# kernel-image becomes kernel-image-${KERNEL_VERISON}
260PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev" 260PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules"
261FILES = "" 261FILES = ""
262FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" 262FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
263FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}" 263FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}"
264FILES_kernel-vmlinux = "/boot/vmlinux*" 264FILES_kernel-vmlinux = "/boot/vmlinux*"
265FILES_kernel-modules = ""
265RDEPENDS_kernel = "kernel-base" 266RDEPENDS_kernel = "kernel-base"
266# Allow machines to override this dependency if kernel image files are 267# Allow machines to override this dependency if kernel image files are
267# not wanted in images as standard 268# not wanted in images as standard
@@ -272,6 +273,8 @@ RPROVIDES_kernel-base += "kernel-${KERNEL_VERSION}"
272ALLOW_EMPTY_kernel = "1" 273ALLOW_EMPTY_kernel = "1"
273ALLOW_EMPTY_kernel-base = "1" 274ALLOW_EMPTY_kernel-base = "1"
274ALLOW_EMPTY_kernel-image = "1" 275ALLOW_EMPTY_kernel-image = "1"
276ALLOW_EMPTY_kernel-modules = "1"
277DESCRIPTION_kernel-modules = "Kernel modules meta package"
275 278
276pkg_postinst_kernel-image () { 279pkg_postinst_kernel-image () {
277if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then 280if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
@@ -463,8 +466,6 @@ python populate_packages_prepend () {
463 466
464 import re 467 import re
465 metapkg = "kernel-modules" 468 metapkg = "kernel-modules"
466 d.setVar('ALLOW_EMPTY_' + metapkg, "1")
467 d.setVar('FILES_' + metapkg, "")
468 blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ] 469 blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
469 for l in module_deps.values(): 470 for l in module_deps.values():
470 for i in l: 471 for i in l:
@@ -476,9 +477,6 @@ python populate_packages_prepend () {
476 if not pkg in blacklist and not pkg in metapkg_rdepends: 477 if not pkg in blacklist and not pkg in metapkg_rdepends:
477 metapkg_rdepends.append(pkg) 478 metapkg_rdepends.append(pkg)
478 d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) 479 d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
479 d.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package')
480 packages.append(metapkg)
481 d.setVar('PACKAGES', ' '.join(packages))
482} 480}
483 481
484# Support checking the kernel size since some kernels need to reside in partitions 482# Support checking the kernel size since some kernels need to reside in partitions