From b752946ed1cca14f4bf8560df67a0f8abe123024 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 20 Aug 2020 11:38:45 +0200 Subject: [PATCH] valijson: Move it to networking-layer under BBFILES_DYNAMIC it has a hard dependency on curlpp package which comes from meta-networking Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Cc: Oleksandr Kravchuk Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 1 + .../recipes-core/packagegroups/packagegroup-meta-oe.bbappend | 3 +++ .../recipes-devtools/valijson/valijson_0.3.bb | 0 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend rename meta-oe/{ => dynamic-layers/networking-layer}/recipes-devtools/valijson/valijson_0.3.bb (100%) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 5bf1f6cfd9..5178678da2 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -27,6 +27,7 @@ BBFILE_PRIORITY_openembedded-layer = "6" # to ensure yocto compatibility check pass BBFILES_DYNAMIC += " \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ +networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/recipes-*/*/*.bb \ perl-layer:${LAYERDIR}/dynamic-layers/perl-layer/recipes-*/*/*.bb \ " diff --git a/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend new file mode 100644 index 0000000000..b39a4d68ff --- /dev/null +++ b/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -0,0 +1,3 @@ +RDEPENDS_packagegroup-meta-oe-devtools += "\ + valijson \ +" diff --git a/meta-oe/recipes-devtools/valijson/valijson_0.3.bb b/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb similarity index 100% rename from meta-oe/recipes-devtools/valijson/valijson_0.3.bb rename to meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 0812da1af6..4dc3afe454 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -116,7 +116,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ mpich msgpack-c nlohmann-json openocd pax-utils \ ipc-run libdbd-mysql-perl libdbi-perl libio-pty-perl php \ protobuf protobuf-c \ - rapidjson serialcheck sip3 tclap uftrace uw-imap valijson \ + rapidjson serialcheck sip3 tclap uftrace uw-imap \ xmlrpc-c yajl yasm \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "nodejs", "", d)} \