From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Cc: Koen Kooi <koen@dominion.thruhere.net>
Subject: [CONSOLIDATED PULL 29/32] dbus 1.4.1: disable sysv script properly when using systemd
Date: Tue, 31 May 2011 23:21:56 -0700 [thread overview]
Message-ID: <2bd0c8252591d3c6c8d54a9a5e48eb93a47ab175.1306909184.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1306909184.git.sgw@linux.intel.com>
In-Reply-To: <cover.1306909184.git.sgw@linux.intel.com>
From: Koen Kooi <koen@dominion.thruhere.net>
OE-core uses 'dbus-1' as initscript name, which no other distribution(-buildsys) does, so we have to take special measures.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-core/dbus/dbus.inc | 4 ++++
meta/recipes-core/dbus/dbus_1.4.1.bb | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 22514e9..fb2f6d4 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -89,6 +89,10 @@ do_install() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+
+ # disable dbus-1 sysv script on systemd installs
+ # nearly all distros call the initscript plain 'dbus', but OE-core is different
+ ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
}
do_install_virtclass-native() {
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index f65ef35..252d160 100644
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
@@ -1,6 +1,6 @@
include dbus.inc
-PR = "r5"
+PR = "r6"
SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
--
1.7.3.4
next prev parent reply other threads:[~2011-06-01 6:25 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 6:21 [CONSOLIDATED PULL 00/32] 1-June-2011 Request Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 01/32] less: update to 443 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 02/32] sysstat: update to 10.0.0 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 03/32] tzdata: update to 2011g Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 04/32] libmad: add Upstream-Status Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 05/32] mpeg2dev: " Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 06/32] newt: " Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 07/32] util-linux: update to 2.19.1 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 08/32] glew: update to 1.6.0 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 09/32] gettext: Update to 0.18.1.1 Saul Wold
2011-06-01 6:32 ` Khem Raj
2011-06-01 6:36 ` Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 10/32] gobject-introspection: Update to 0.10.8 Git Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 11/32] dtc: Cleanup and update recipe Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 12/32] libiconv: update to 1.13.1 Saul Wold
2011-06-01 6:28 ` Khem Raj
2011-06-01 17:04 ` Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 13/32] update-alternatives-dpkg update to 1.16.0.3 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 14/32] chkconfig: update to 1.3.52 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 15/32] mailx: update to 12.5 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 16/32] mc: update to 4.7.5.2 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 17/32] msmtp: update tof 1.4.24 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 18/32] gthumb: update to 2.12.3 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 19/32] alsa-tools: update to 1.0.24.1 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 20/32] qmmp: update to 0.5.1 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 21/32] rxvt-unicode: update to 9.11 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 22/32] gnutls: update to 2.12.5 Saul Wold
2011-06-01 19:14 ` Otavio Salvador
2011-06-01 6:21 ` [CONSOLIDATED PULL 23/32] distro tracking: updates Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 24/32] bitbake.conf: Create static-dev pacakge for static libraries Saul Wold
2011-06-01 17:29 ` Richard Purdie
2011-06-01 18:19 ` Phil Blundell
2011-06-01 18:27 ` Koen Kooi
2011-06-02 6:54 ` Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 25/32] sudo.inc: Add do_install_prepend () to sudo.inc Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 26/32] busybox: sync do_install() with oe master (mostly) Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 27/32] create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://' Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 28/32] binconfig: improve handling of empty prefixes Saul Wold
2011-06-01 6:21 ` Saul Wold [this message]
2011-06-01 6:21 ` [CONSOLIDATED PULL 30/32] tcmode-default: disable ARMv7 Optimization for qt4-x11-free Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 31/32] puzzles: Update to 9175 Saul Wold
2011-06-01 6:21 ` [CONSOLIDATED PULL 32/32] clutter-1.6: Add patch to update gettext macro version Saul Wold
2011-06-01 17:34 ` [CONSOLIDATED PULL 00/32] 1-June-2011 Request Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2bd0c8252591d3c6c8d54a9a5e48eb93a47ab175.1306909184.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=koen@dominion.thruhere.net \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox