From 3e46ebea6dc8f060d8ddbf75bfdd01c3a279f3b2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III via Openembedded-devel" Date: Thu, 28 Mar 2019 21:01:43 -0700 Subject: dbus-broker: 18 -> 19 Drops the musl compat patch which is upstream in version 19 Signed-off-by: William A. Kennington III Signed-off-by: Khem Raj --- ...01-c-ini-Fix-missing-sys-types.h-includes.patch | 42 ---------------------- meta-oe/recipes-core/dbus/dbus-broker_18.bb | 22 ------------ meta-oe/recipes-core/dbus/dbus-broker_19.bb | 21 +++++++++++ 3 files changed, 21 insertions(+), 64 deletions(-) delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker_18.bb create mode 100644 meta-oe/recipes-core/dbus/dbus-broker_19.bb (limited to 'meta-oe/recipes-core') diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch b/meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch deleted file mode 100644 index 8822e94fda..0000000000 --- a/meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0bb101ab41334588e366639e7bd41836e86f83be Mon Sep 17 00:00:00 2001 -From: "William A. Kennington III" -Date: Sun, 24 Feb 2019 07:54:31 -0800 -Subject: [PATCH] c-ini: Fix missing sys/types.h includes - -Otherwise we see failures for a build against the musl libc which -doesn't include ssize_t definitions in c standard headers. - -Upstream-Status: dbus-broker@a145943ec5d1723647d3ba01ef5d0ef8f9f4a565 -Signed-off-by: William A. Kennington III ---- - subprojects/c-ini/src/c-ini-reader.c | 1 + - subprojects/c-ini/src/c-ini.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/subprojects/c-ini/src/c-ini-reader.c b/subprojects/c-ini/src/c-ini-reader.c -index 1a25d5a..10de80e 100644 ---- a/subprojects/c-ini/src/c-ini-reader.c -+++ b/subprojects/c-ini/src/c-ini-reader.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include "c-ini.h" - #include "c-ini-private.h" - -diff --git a/subprojects/c-ini/src/c-ini.h b/subprojects/c-ini/src/c-ini.h -index 847e4d5..9c107b2 100644 ---- a/subprojects/c-ini/src/c-ini.h -+++ b/subprojects/c-ini/src/c-ini.h -@@ -66,6 +66,7 @@ extern "C" { - - #include - #include -+#include - - typedef struct CIniDomain CIniDomain; - typedef struct CIniEntry CIniEntry; --- -2.21.0.392.gf8f6787159e-goog - diff --git a/meta-oe/recipes-core/dbus/dbus-broker_18.bb b/meta-oe/recipes-core/dbus/dbus-broker_18.bb deleted file mode 100644 index af9af182ae..0000000000 --- a/meta-oe/recipes-core/dbus/dbus-broker_18.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "dbus broker" -DESCRIPTION = "Drop-in replacement for dbus-daemon." - -SECTION = "base" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" - -SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[sha256sum] = "f29e77a4d7b386e835dbe6379f4308f0503d6077834ba734ea6782359b34cbb9" -SRC_URI_append_libc-musl = "file://0001-c-ini-Fix-missing-sys-types.h-includes.patch" - -inherit meson pkgconfig systemd distro_features_check - -DEPENDS = "expat systemd" - -REQUIRED_DISTRO_FEATURES = "systemd" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -FILES_${PN} += "${systemd_system_unitdir}" -FILES_${PN} += "${systemd_user_unitdir}" diff --git a/meta-oe/recipes-core/dbus/dbus-broker_19.bb b/meta-oe/recipes-core/dbus/dbus-broker_19.bb new file mode 100644 index 0000000000..82d8b8ba68 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker_19.bb @@ -0,0 +1,21 @@ +SUMMARY = "dbus broker" +DESCRIPTION = "Drop-in replacement for dbus-daemon." + +SECTION = "base" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" + +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI[sha256sum] = "1648227f5a347d4f38d8a29bb9295a73a25c3feb4f3e79e3f04cc847343da3ed" + +inherit meson pkgconfig systemd distro_features_check + +DEPENDS = "expat systemd" + +REQUIRED_DISTRO_FEATURES = "systemd" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +FILES_${PN} += "${systemd_system_unitdir}" +FILES_${PN} += "${systemd_user_unitdir}" -- cgit 1.2.3-korg