[oe-commits] org.oe.dev kernel.bbclass: Add kernel-base package which kernel modules depend on instead of kernel-image. This allows machines to specify that the kernel-image shouldn't be included in a default rootfs, without needing kernel-image to be empty. Set RDEPENDS_kernel-base_MACHINE = for machines that need this as per a discussion on the mailing list.

[rpurdie commit]

kernel.bbclass: Add kernel-base package which kernel modules depend on instead of kernel-image. This allows machines to specify that the kernel-image shouldn't be included in a default rootfs, without needing kernel-image to be empty. Set RDEPENDS_kernel-base_MACHINE =  for machines that need this as per a discussion on the mailing list.

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 11e188745d3928bb298b7098cc047078e51abf61
ViewMTN: http://monotone.openembedded.org/revision.psp?id=11e188745d3928bb298b7098cc047078e51abf61
Files:
1
classes/kernel.bbclass
Diffs:

#
# mt diff -r4803ed3fff3d69ac862f26b07ec23764d90ddcde -r11e188745d3928bb298b7098cc047078e51abf61
#
# 
# 
# patch "classes/kernel.bbclass"
#  from [237ec9e436415eab3772495898c0921de38b3c07]
#    to [b3df4a5e97f27bbbdeedf06373b1f8a115c48333]
# 
============================================================
--- classes/kernel.bbclass	237ec9e436415eab3772495898c0921de38b3c07
+++ classes/kernel.bbclass	b3df4a5e97f27bbbdeedf06373b1f8a115c48333
@@ -169,13 +169,18 @@ EXPORT_FUNCTIONS do_compile do_install d
 
 EXPORT_FUNCTIONS do_compile do_install do_stage do_configure
 
-PACKAGES = "kernel kernel-image kernel-dev"
+# kernel-base becomes kernel-${KERNEL_VERSION}
+# kernel-image becomes kernel-image-${KERNEL_VERISON}
+PACKAGES = "kernel kernel-base kernel-image kernel-dev"
 FILES = ""
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 FILES_kernel-dev = "/boot/System.map* /boot/config*"
-RDEPENDS_kernel = "kernel-image-${KERNEL_VERSION}"
+RDEPENDS_kernel = "kernel-base"
+RDEPENDS_kernel-base = "kernel-image"
 PKG_kernel-image = "kernel-image-${KERNEL_VERSION}"
+PKG_kernel-base = "kernel-${KERNEL_VERSION}"
 ALLOW_EMPTY_kernel = "1"
+ALLOW_EMPTY_kernel-base = "1"
 ALLOW_EMPTY_kernel-image = "1"
 
 pkg_postinst_kernel-image () {
@@ -362,13 +367,13 @@ python populate_packages_prepend () {
 
 	postinst = bb.data.getVar('pkg_postinst_modules', d, 1)
 	postrm = bb.data.getVar('pkg_postrm_modules', d, 1)
-	do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-image-%s' % bb.data.getVar("KERNEL_VERSION", d, 1))
+	do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % bb.data.getVar("KERNEL_VERSION", d, 1))
 
 	import re, os
 	metapkg = "kernel-modules"
 	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
 	bb.data.setVar('FILES_' + metapkg, "", d)
-	blacklist = [ 'kernel-dev', 'kernel-image' ]
+	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base' ]
 	for l in module_deps.values():
 		for i in l:
 			pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))