aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core
diff options
context:
space:
mode:
authorWilliam A. Kennington III via Openembedded-devel <openembedded-devel@lists.openembedded.org>2018-10-11 11:46:51 -0700
committerKhem Raj <raj.khem@gmail.com>2018-10-11 13:35:19 -0700
commite4baf298cd658b37fd90134dc54a92c75fd117d9 (patch)
tree8e1053b6b137c2780cc0edeb15bc4d9e0e839afa /meta-oe/recipes-core
parent9f47fcd33739c92dc86003182ac32b2535db7f32 (diff)
downloadmeta-openembedded-e4baf298cd658b37fd90134dc54a92c75fd117d9.tar.gz
meta-openembedded-e4baf298cd658b37fd90134dc54a92c75fd117d9.tar.bz2
meta-openembedded-e4baf298cd658b37fd90134dc54a92c75fd117d9.zip
dbus-broker: update to 16
Dropped the patches for version 13 as they are now included in the upstream dbus-broker codebase. Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r--meta-oe/recipes-core/dbus/dbus-broker/0001-Include-sys-wait.h-for-WEXITED-definition.patch37
-rw-r--r--meta-oe/recipes-core/dbus/dbus-broker/0002-Use-getenv-instead-of-secure_getenv-on-musl.patch29
-rw-r--r--meta-oe/recipes-core/dbus/dbus-broker_git.bb9
3 files changed, 3 insertions, 72 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0001-Include-sys-wait.h-for-WEXITED-definition.patch b/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-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 <raj.khem@gmail.com>
-Date: Thu, 28 Jun 2018 07:11:58 -0700
-Subject: [PATCH] Include sys/wait.h for WEXITED definition
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-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 <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#include <sys/wait.h>
- #include <systemd/sd-bus.h>
- #include <systemd/sd-daemon.h>
- #include <systemd/sd-event.h>
-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 <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#include <sys/wait.h>
- #include <systemd/sd-bus.h>
- #include <systemd/sd-event.h>
- #include "dbus/protocol.h"
diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0002-Use-getenv-instead-of-secure_getenv-on-musl.patch b/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-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 <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
-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-oe/recipes-core/dbus/dbus-broker_git.bb b/meta-oe/recipes-core/dbus/dbus-broker_git.bb
index 4a025cfeb..ac2c50063 100644
--- a/meta-oe/recipes-core/dbus/dbus-broker_git.bb
+++ b/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"