2 files changed, 1 insertions, 44 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
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" <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_18.bb b/meta-oe/recipes-core/dbus/dbus-broker_19.bb
index af9af182ae..82d8b8ba68 100644
--- a/meta-oe/recipes-core/dbus/dbus-broker_18.bb
+++ b/meta-oe/recipes-core/dbus/dbus-broker_19.bb
@@ -7,8 +7,7 @@ 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"
+SRC_URI[sha256sum] = "1648227f5a347d4f38d8a29bb9295a73a25c3feb4f3e79e3f04cc847343da3ed"
 
 inherit meson pkgconfig systemd distro_features_check