[meta-intel] [PATCH] [warrior] linux-intel-rt: Allow the build of multiple kernel packages

[Daniel Dragomir]

From: Daniel Dragomir <Daniel.Dragomir at windriver.com>

Support for multiple kernel packages was implemented upstream
since commit 5b4aab6b40 ("kernel: Add support for multiple
kernel packages"). Syncronize preempt-rt recipes with the
upstream ones to allow other layes which inherit meta-intel
to build multiple kernels in one build.

More details about multiple kernels support:
http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143535.html

Signed-off-by: Daniel Dragomir <Daniel.Dragomir at windriver.com>
---
 recipes-kernel/linux/linux-intel-rt_4.14.bb | 2 +-
 recipes-kernel/linux/linux-intel-rt_4.19.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-intel-rt_4.14.bb b/recipes-kernel/linux/linux-intel-rt_4.14.bb
index af5a4e35..befcc5ba 100644
--- a/recipes-kernel/linux/linux-intel-rt_4.14.bb
+++ b/recipes-kernel/linux/linux-intel-rt_4.14.bb
@@ -5,7 +5,7 @@ require linux-intel.inc
 # to build multiple virtual/kernel providers, e.g. as dependency of
 # core-image-rt-sdk, core-image-rt.
 python () {
-    if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
+    if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
 }
 
diff --git a/recipes-kernel/linux/linux-intel-rt_4.19.bb b/recipes-kernel/linux/linux-intel-rt_4.19.bb
index a7e272ee..edf32af0 100644
--- a/recipes-kernel/linux/linux-intel-rt_4.19.bb
+++ b/recipes-kernel/linux/linux-intel-rt_4.19.bb
@@ -5,7 +5,7 @@ require linux-intel.inc
 # to build multiple virtual/kernel providers, e.g. as dependency of
 # core-image-rt-sdk, core-image-rt.
 python () {
-    if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
+    if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
 }
 
-- 
2.17.1