From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../sdbus-c++/sdbus-c++-0.7.6/run-ptest | 15 ---------- .../sdbus-c++/sdbus-c++-0.8.1/run-ptest | 15 ++++++++++ .../sdbus-c++/sdbus-c++-tools-native_0.7.6.bb | 14 ---------- .../sdbus-c++/sdbus-c++-tools_0.8.1.bb | 16 +++++++++++ .../recipes-core/sdbus-c++/sdbus-c++_0.7.6.bb | 32 ---------------------- .../recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb | 32 ++++++++++++++++++++++ 6 files changed, 63 insertions(+), 61 deletions(-) delete mode 100755 meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.7.6/run-ptest create mode 100755 meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest delete mode 100644 meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.7.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.7.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb (limited to 'meta-openembedded/meta-oe/recipes-core/sdbus-c++') diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.7.6/run-ptest b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.7.6/run-ptest deleted file mode 100755 index f6ade0c7e4..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.7.6/run-ptest +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -set -e -set -o pipefail - -SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" - -${SCRIPTPATH}/../tests/sdbus-c++-unit-tests 2>&1 | \ -sed -r 's/^\[\s+OK\s+\] (.*) \([0-9]+\sms\)$/OK: \1 /' | \ -sed -r 's/^\[\s+FAILED\s+\] (.*) \([0-9]+\sms\)$/FAILED: \1 /' | \ -awk '{if ($1 == "OK:" || $1 == "FAILED:") {print $0}}' - -${SCRIPTPATH}/../tests/sdbus-c++-integration-tests 2>&1 | \ -sed -r 's/^\[\s+OK\s+\] (.*) \([0-9]+\sms\)$/OK: \1 /' | \ -sed -r 's/^\[\s+FAILED\s+\] (.*) \([0-9]+\sms\)$/FAILED: \1 /' | \ -awk '{if ($1 == "OK:" || $1 == "FAILED:") {print $0}}' diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest new file mode 100755 index 0000000000..f6ade0c7e4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest @@ -0,0 +1,15 @@ +#!/bin/sh +set -e +set -o pipefail + +SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" + +${SCRIPTPATH}/../tests/sdbus-c++-unit-tests 2>&1 | \ +sed -r 's/^\[\s+OK\s+\] (.*) \([0-9]+\sms\)$/OK: \1 /' | \ +sed -r 's/^\[\s+FAILED\s+\] (.*) \([0-9]+\sms\)$/FAILED: \1 /' | \ +awk '{if ($1 == "OK:" || $1 == "FAILED:") {print $0}}' + +${SCRIPTPATH}/../tests/sdbus-c++-integration-tests 2>&1 | \ +sed -r 's/^\[\s+OK\s+\] (.*) \([0-9]+\sms\)$/OK: \1 /' | \ +sed -r 's/^\[\s+FAILED\s+\] (.*) \([0-9]+\sms\)$/FAILED: \1 /' | \ +awk '{if ($1 == "OK:" || $1 == "FAILED:") {print $0}}' diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.7.6.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.7.6.bb deleted file mode 100644 index 6492c23680..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.7.6.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "sdbus-c++ native tools" -DESCRIPTION = "Native interface code generator for development with sdbus-c++" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742" - -inherit cmake native - -DEPENDS += "expat" - -SRCREV = "5121d46eed42231285c18d317a9f48e0b2849d5e" -SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" - -S = "${WORKDIR}/tools" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb new file mode 100644 index 0000000000..9eaec0f2a8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "sdbus-c++ native tools" +DESCRIPTION = "Native interface code generator for development with sdbus-c++" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742" + +inherit cmake + +DEPENDS += "expat" + +SRCREV = "3a4f343fb924650e7639660efa5f143961162044" +SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" + +S = "${WORKDIR}/tools" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.7.6.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.7.6.bb deleted file mode 100644 index 57774cbdf7..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.7.6.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "sdbus-c++" -DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API in modern C++" - -SECTION = "libs" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742" - -inherit cmake pkgconfig systemd ptest - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-external-libsystemd', 'with-builtin-libsystemd', d)} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" -PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap" -PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" -PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF" - -DEPENDS += "expat" - -SRCREV = "5121d46eed42231285c18d317a9f48e0b2849d5e" -SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" -SRC_URI += "file://run-ptest" - -EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \ - -DBUILD_DOC=ON \ - -DBUILD_DOXYGEN_DOC=OFF" - -S = "${WORKDIR}/git" - -FILES_${PN}_remove = "${sysconfdir}" -FILES_${PN}-ptest += "${sysconfdir}/dbus-1/system.d/" -FILES_${PN}-ptest += "${libdir}/${BPN}/tests" -FILES_${PN}-dev += "${bindir}/sdbus-c++-xml2cpp" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb new file mode 100644 index 0000000000..c4d63fd272 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "sdbus-c++" +DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API in modern C++" + +SECTION = "libs" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742" + +inherit cmake pkgconfig systemd ptest + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-external-libsystemd', 'with-builtin-libsystemd', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" +PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap" +PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" +PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF" + +DEPENDS += "expat" + +SRCREV = "3a4f343fb924650e7639660efa5f143961162044" +SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" +SRC_URI += "file://run-ptest" + +EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \ + -DBUILD_DOC=ON \ + -DBUILD_DOXYGEN_DOC=OFF" + +S = "${WORKDIR}/git" + +FILES_${PN}_remove = "${sysconfdir}" +FILES_${PN}-ptest += "${sysconfdir}/dbus-1/system.d/" +FILES_${PN}-ptest += "${libdir}/${BPN}/tests" +FILES_${PN}-dev += "${bindir}/sdbus-c++-xml2cpp" -- cgit v1.2.3