From b752946ed1cca14f4bf8560df67a0f8abe123024 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 20 Aug 2020 11:38:45 +0200 Subject: 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 + .../packagegroups/packagegroup-meta-oe.bbappend | 3 ++ .../recipes-devtools/valijson/valijson_0.3.bb | 36 ++++++++++++++++++++++ .../packagegroups/packagegroup-meta-oe.bb | 2 +- meta-oe/recipes-devtools/valijson/valijson_0.3.bb | 36 ---------------------- 5 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend create mode 100644 meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb delete mode 100644 meta-oe/recipes-devtools/valijson/valijson_0.3.bb 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/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb b/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb new file mode 100644 index 0000000000..049cdeffc0 --- /dev/null +++ b/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb @@ -0,0 +1,36 @@ +SUMMARY = "Header-only C++ library for JSON Schema validation" +HOMEPAGE = "https://github.com/tristanpenman/valijson" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" + +SRC_URI = "git://github.com/tristanpenman/valijson.git" +SRCREV = "7a52fc88cdffd6678c009ca2fad700151f7363c6" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" + +DEPENDS = "curlpp" + +# valijson is a header only C++ library, so the main package will be empty. +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +do_install() { + install -d ${D}${includedir}/compat + install -d ${D}${includedir}/valijson + install -d ${D}${includedir}/valijson/adapters + install -d ${D}${includedir}/valijson/constraints + install -d ${D}${includedir}/valijson/internal + install -d ${D}${includedir}/valijson/utils + + install -m 0644 ${S}/include/compat/* ${D}${includedir}/compat + install -D -m 0644 ${S}/include/valijson/*.hpp -t ${D}${includedir}/valijson + install -D -m 0644 ${S}/include/valijson/adapters/*.hpp -t ${D}${includedir}/valijson/adapters + install -D -m 0644 ${S}/include/valijson/constraints/*.hpp -t ${D}${includedir}/valijson/constraints + install -D -m 0644 ${S}/include/valijson/internal/*.hpp -t ${D}${includedir}/valijson/internal + install -D -m 0644 ${S}/include/valijson/utils/*.hpp -t ${D}${includedir}/valijson/utils +} 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)} \ diff --git a/meta-oe/recipes-devtools/valijson/valijson_0.3.bb b/meta-oe/recipes-devtools/valijson/valijson_0.3.bb deleted file mode 100644 index 049cdeffc0..0000000000 --- a/meta-oe/recipes-devtools/valijson/valijson_0.3.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Header-only C++ library for JSON Schema validation" -HOMEPAGE = "https://github.com/tristanpenman/valijson" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" - -SRC_URI = "git://github.com/tristanpenman/valijson.git" -SRCREV = "7a52fc88cdffd6678c009ca2fad700151f7363c6" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" - -DEPENDS = "curlpp" - -# valijson is a header only C++ library, so the main package will be empty. -RDEPENDS_${PN}-dev = "" - -BBCLASSEXTEND = "native nativesdk" - -do_install() { - install -d ${D}${includedir}/compat - install -d ${D}${includedir}/valijson - install -d ${D}${includedir}/valijson/adapters - install -d ${D}${includedir}/valijson/constraints - install -d ${D}${includedir}/valijson/internal - install -d ${D}${includedir}/valijson/utils - - install -m 0644 ${S}/include/compat/* ${D}${includedir}/compat - install -D -m 0644 ${S}/include/valijson/*.hpp -t ${D}${includedir}/valijson - install -D -m 0644 ${S}/include/valijson/adapters/*.hpp -t ${D}${includedir}/valijson/adapters - install -D -m 0644 ${S}/include/valijson/constraints/*.hpp -t ${D}${includedir}/valijson/constraints - install -D -m 0644 ${S}/include/valijson/internal/*.hpp -t ${D}${includedir}/valijson/internal - install -D -m 0644 ${S}/include/valijson/utils/*.hpp -t ${D}${includedir}/valijson/utils -} -- cgit v1.2.3-54-g00ecf