diff options
| author | Ricardo Salveti <ricardo@opensourcefoundries.com> | 2018-05-28 17:49:07 -0300 |
|---|---|---|
| committer | Ricardo Salveti <ricardo@opensourcefoundries.com> | 2018-06-07 00:17:09 -0300 |
| commit | e19d8a363c5c355d9ea06ed3b5cf32df088f0f66 (patch) | |
| tree | 849cc7e874f0127d83c888b1a23d532a9c963042 | |
| parent | 017a154749cd04aed69482edf1b05b3aeadcd1e5 (diff) | |
dbus: drop changes, merged in OE-Core
OE-Core updated dbus from 1.12.2 to 1.12.8, which includes the systemd
tmpfiles.d patch.
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
| -rw-r--r-- | recipes-core/dbus/dbus/backport-modify-systemd-tmpfiles.d-create-var_lib_dbus.patch | 37 | ||||
| -rw-r--r-- | recipes-core/dbus/dbus_%.bbappend | 5 |
2 files changed, 0 insertions, 42 deletions
diff --git a/recipes-core/dbus/dbus/backport-modify-systemd-tmpfiles.d-create-var_lib_dbus.patch b/recipes-core/dbus/dbus/backport-modify-systemd-tmpfiles.d-create-var_lib_dbus.patch deleted file mode 100644 index fdf9d96..0000000 --- a/recipes-core/dbus/dbus/backport-modify-systemd-tmpfiles.d-create-var_lib_dbus.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 49c6c6196639118a06c736cee39a745521bcf34d Mon Sep 17 00:00:00 2001 -From: Chris Lesiak <chris.lesiak@licor.com> -Date: Wed, 10 Jan 2018 15:35:20 -0600 -Subject: Modify systemd tmpfiles.d snippet to create /var/lib/dbus/ - -This snippet was already attempting to create /var/lib/dbus/machine-id, -but would fail on volatile or stateless systems where /var/lib/dbus/ -did not already exist. systemd-tmpfiles automatically creates parent -directories for tmpfiles of type 'd', 'D', etc., but not for files -or symlinks (https://github.com/systemd/systemd/issues/7853). - -Signed-off-by: Chris Lesiak <chris.lesiak@licor.com> -[smcv: Extended commit message to clarify why we need this] -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104577 -Reviewed-by: Simon McVittie <smcv@collabora.com> -(cherry picked from commit aeebf801f1ab462cba3a174440c09a86d326002a) ---- - bus/tmpfiles.d/dbus.conf.in | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/bus/tmpfiles.d/dbus.conf.in b/bus/tmpfiles.d/dbus.conf.in -index 754f022..664d53a 100644 ---- a/bus/tmpfiles.d/dbus.conf.in -+++ b/bus/tmpfiles.d/dbus.conf.in -@@ -1,5 +1,9 @@ - # Fields: type; path; mode; uid; gid; age; argument (symlink target) - -+# Make ${localstatedir}/lib/dbus/ -+# Adjust mode and ownership if it already exists. -+d @EXPANDED_LOCALSTATEDIR@/lib/dbus 0755 - - - -+ - # Make ${localstatedir}/lib/dbus/machine-id a symlink to /etc/machine-id - # if it does not already exist - L @EXPANDED_LOCALSTATEDIR@/lib/dbus/machine-id - - - - /etc/machine-id --- -cgit v1.1 - diff --git a/recipes-core/dbus/dbus_%.bbappend b/recipes-core/dbus/dbus_%.bbappend deleted file mode 100644 index 02e2ed7..0000000 --- a/recipes-core/dbus/dbus_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append += " \ - file://backport-modify-systemd-tmpfiles.d-create-var_lib_dbus.patch \ -" |