From e8e80ea28eed58903586f95edbd86657d8a2c564 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III via Openembedded-devel" Date: Tue, 26 Mar 2019 19:32:35 -0700 Subject: dbus-broker: 16 -> 18 Also brings in a patch to fix up building against a musl libc that is not in a released build yet. This change cleans up a number of things about the build - Upstream no longer depends on glib - We dont ever runtime depend on reference dbus - Docs are disabled by default so we don't need to specify the option - There is no native tooling so we shouldn't need a native bbclass - No longer depend on gitsm since upstream provides release tarballs 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_git.bb | 32 ----------------- 3 files changed, 64 insertions(+), 32 deletions(-) create mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch create mode 100644 meta-oe/recipes-core/dbus/dbus-broker_18.bb delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker_git.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 new file mode 100644 index 0000000000..8822e94fda --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch @@ -0,0 +1,42 @@ +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 new file mode 100644 index 0000000000..af9af182ae --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker_18.bb @@ -0,0 +1,22 @@ +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_git.bb b/meta-oe/recipes-core/dbus/dbus-broker_git.bb deleted file mode 100644 index ac0f325a4d..0000000000 --- a/meta-oe/recipes-core/dbus/dbus-broker_git.bb +++ /dev/null @@ -1,32 +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" - -DEPENDS = "dbus glib-2.0 expat" - -PV = "16+git${SRCPV}" -SRCREV = "fc874afa0992d0c75ec25acb43d344679f0ee7d2" - -SRC_URI = "gitsm://github.com/bus1/dbus-broker;protocol=git" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig systemd distro_features_check - -EXTRA_OEMESON += "-Ddocs=false" - -REQUIRED_DISTRO_FEATURES = "systemd" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -FILES_${PN} += "${systemd_system_unitdir}" -FILES_${PN} += "${systemd_user_unitdir}" - -RDEPENDS_${PN} = "dbus" - -BBCLASSEXTEND = "native" - -- cgit 1.2.3-korg