diff options
author | William A. Kennington III via Openembedded-devel <openembedded-devel@lists.openembedded.org> | 2019-03-26 19:32:35 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-03-28 09:48:30 -0700 |
commit | e8e80ea28eed58903586f95edbd86657d8a2c564 (patch) | |
tree | 02f79765459fea4f884f9341619f2f381c216739 /meta-oe | |
parent | 07ee1b38f6e92f66de71286f43939f68ae79ecec (diff) | |
download | meta-openembedded-contrib-e8e80ea28eed58903586f95edbd86657d8a2c564.tar.gz |
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 <wak@google.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch | 42 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus-broker_18.bb (renamed from meta-oe/recipes-core/dbus/dbus-broker_git.bb) | 18 |
2 files changed, 46 insertions, 14 deletions
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" <wak@google.com> +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 <wak@google.com> +--- + 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 <inttypes.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/types.h> + #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 <inttypes.h> + #include <stdlib.h> ++#include <sys/types.h> + + typedef struct CIniDomain CIniDomain; + typedef struct CIniEntry CIniEntry; +-- +2.21.0.392.gf8f6787159e-goog + diff --git a/meta-oe/recipes-core/dbus/dbus-broker_git.bb b/meta-oe/recipes-core/dbus/dbus-broker_18.bb index ac0f325a4d..af9af182ae 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_git.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_18.bb @@ -6,18 +6,13 @@ 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" +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 -EXTRA_OEMESON += "-Ddocs=false" +DEPENDS = "expat systemd" REQUIRED_DISTRO_FEATURES = "systemd" @@ -25,8 +20,3 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN} += "${systemd_user_unitdir}" - -RDEPENDS_${PN} = "dbus" - -BBCLASSEXTEND = "native" - |