kernel-dev is replaced by kernel-devsrc, which breaks
backward compaibilty.
-- add alias for kernel-devsrc
-- kernel-devsrc provides the kernel-dev.
-- remove kernel-dev from the sub-packages of linux-windriver
Signed-off-by: Jian Liu <jian....@windriver.com>
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index dee6f7d..84ab078 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -371,11 +371,10 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
# kernel-base becomes kernel-${KERNEL_VERSION}
# kernel-image becomes kernel-image-${KERNEL_VERISON}
-PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev
kernel-modules"
+PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-modules"
FILES_${PN} = ""
FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order
/lib/modules/${KERNEL_VERSION}/modules.builtin"
FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
-FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*
${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build"
FILES_kernel-vmlinux = "/boot/vmlinux*"
FILES_kernel-modules = ""
RDEPENDS_kernel = "kernel-base"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 7100ed7..07f8fbe 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -16,6 +16,8 @@ BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
# Set a variable to get to the top of the metadata location
COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'
+PREFERRED_PROVIDER_virtual/kernel-dev = "kernel-devsrc"
+
# opkg-utils is for update-alternatives :(
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
sysvinit-inittab \
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb
b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 196c8c7..fa641f3 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -74,3 +74,9 @@ do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
PACKAGES = "kernel-devsrc"
FILES_${PN} = "${KERNEL_SRC_PATH}"
RDEPENDS_${PN} = "bc"
+
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "kernel-dev"
+RREPLACES_${PN} = "kernel-dev"
+RCONFLICTS_${PN} = "kernel-dev"
+PROVIDES += "kernel-dev"
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
