[meta-cgl,10/20] core-image-cgl-*: Move to recipe directory

Submitted by Jeremy Puhlman on March 19, 2020, 1:53 a.m. | Patch ID: 171137

Details

Message ID 20200319015321.15525-10-jpuhlman@mvista.com
State New
Headers show

Commit Message

Jeremy Puhlman March 19, 2020, 1:53 a.m.
* lsb content has been moved out to meta-lsb.
* Configure image to build with or with out lsb image present.
* Add warning about CGL compliance and lsb requirement and option
to squelch warning.

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 .../{ => recipes-core}/images/core-image-cgl-initramfs.bb      |  0
 meta-cgl-common/{ => recipes-core}/images/core-image-cgl.bb    | 10 +++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 rename meta-cgl-common/{ => recipes-core}/images/core-image-cgl-initramfs.bb (100%)
 rename meta-cgl-common/{ => recipes-core}/images/core-image-cgl.bb (54%)

Patch hide | download patch | download mbox

diff --git a/meta-cgl-common/images/core-image-cgl-initramfs.bb b/meta-cgl-common/recipes-core/images/core-image-cgl-initramfs.bb
similarity index 100%
rename from meta-cgl-common/images/core-image-cgl-initramfs.bb
rename to meta-cgl-common/recipes-core/images/core-image-cgl-initramfs.bb
diff --git a/meta-cgl-common/images/core-image-cgl.bb b/meta-cgl-common/recipes-core/images/core-image-cgl.bb
similarity index 54%
rename from meta-cgl-common/images/core-image-cgl.bb
rename to meta-cgl-common/recipes-core/images/core-image-cgl.bb
index 86bf7d4..4a7d4f7 100644
--- a/meta-cgl-common/images/core-image-cgl.bb
+++ b/meta-cgl-common/recipes-core/images/core-image-cgl.bb
@@ -1,6 +1,14 @@ 
-require recipes-extended/images/core-image-lsb.bb
+require ${@bb.utils.contains("BBFILE_COLLECTIONS", "lsb", "recipes-lsb/images/core-image-lsb.bb", "recipes-core/images/core-image-base.bb", d)}
 
 
+LSB_WARN ?= "1"
+python () {
+    lsb_warn = d.getVar("LSB_WARN")
+    if bb.utils.contains("BBFILE_COLLECTIONS", "lsb", "1", "0", d) == "0" and lsb_warn == "1":
+       bb.warn("CGL compliance requires lsb, and meta-lsb is not included.\n" + \
+               "To disable this warning set LSB_WARN='0'")
+}
+      
 VALGRIND ?= ""
 VALGRIND_powerpc ?= "valgrind"
 VALGRIND_e500v2 ?= ""