From cd3bb336c0e488d697b3dacae7b2ad58008f506b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III via Openembedded-devel" Date: Thu, 11 Oct 2018 11:46:51 -0700 Subject: dbus-broker: update to 16 Dropped the patches for version 13 as they are now included in the upstream dbus-broker codebase. (From meta-openembedded rev: e4baf298cd658b37fd90134dc54a92c75fd117d9) Signed-off-by: Brad Bishop Signed-off-by: William A. Kennington III Signed-off-by: Khem Raj Change-Id: Idbeebc0b6d3c89a012f58d11dd97126d6907181d --- ...Include-sys-wait.h-for-WEXITED-definition.patch | 37 ---------------------- ...e-getenv-instead-of-secure_getenv-on-musl.patch | 29 ----------------- .../meta-oe/recipes-core/dbus/dbus-broker_git.bb | 9 ++---- 3 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Include-sys-wait.h-for-WEXITED-definition.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Use-getenv-instead-of-secure_getenv-on-musl.patch (limited to 'meta-openembedded') diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Include-sys-wait.h-for-WEXITED-definition.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Include-sys-wait.h-for-WEXITED-definition.patch deleted file mode 100644 index 8b8be074f..000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Include-sys-wait.h-for-WEXITED-definition.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 99657fcbba288a843dc9e411bdfd3934b2074db5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 28 Jun 2018 07:11:58 -0700 -Subject: [PATCH] Include sys/wait.h for WEXITED definition - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - src/launch/main.c | 1 + - test/dbus/util-broker.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/launch/main.c b/src/launch/main.c -index f335d6b..6475ae6 100644 ---- a/src/launch/main.c -+++ b/src/launch/main.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/test/dbus/util-broker.c b/test/dbus/util-broker.c -index d9367ae..3bd021b 100644 ---- a/test/dbus/util-broker.c -+++ b/test/dbus/util-broker.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include "dbus/protocol.h" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Use-getenv-instead-of-secure_getenv-on-musl.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Use-getenv-instead-of-secure_getenv-on-musl.patch deleted file mode 100644 index bebd2145f..000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Use-getenv-instead-of-secure_getenv-on-musl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 95a5541f8b75f7896ee6e5e71edd61838cab3c8b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 28 Jun 2018 07:16:34 -0700 -Subject: [PATCH] Use getenv instead of secure_getenv on musl - -musl doesnt implement secure version - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - src/launch/main.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/launch/main.c b/src/launch/main.c -index 6475ae6..6468d84 100644 ---- a/src/launch/main.c -+++ b/src/launch/main.c -@@ -30,6 +30,10 @@ - #include "util/log.h" - #include "util/misc.h" - -+#ifndef __GLIBC__ -+#define secure_getenv getenv -+#endif -+ - typedef struct Manager Manager; - typedef struct Service Service; - diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb index 4a025cfeb..ac2c50063 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb @@ -8,13 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" DEPENDS = "dbus glib-2.0 expat" -PV = "13+git${SRCPV}" -SRCREV = "1165025e26c3b46160402841dadf08d3d42f5cbb" +PV = "16+git${SRCPV}" +SRCREV = "fc874afa0992d0c75ec25acb43d344679f0ee7d2" -SRC_URI = "git://github.com/bus1/dbus-broker;protocol=git \ - file://0001-Include-sys-wait.h-for-WEXITED-definition.patch \ - file://0002-Use-getenv-instead-of-secure_getenv-on-musl.patch \ - " +SRC_URI = "git://github.com/bus1/dbus-broker;protocol=git" S = "${WORKDIR}/git" -- cgit v1.2.1