diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-04-04 18:42:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-04 23:57:20 +0100 |
commit | cb4bba8fb07df35b57d63ab7b7f75c65a63addb5 (patch) | |
tree | 0d3101247ecd334cb9b0192c7dcf1021ea5d8304 /meta | |
parent | 5baac2d7b34ec5bd3b74845fe05511c8aac51a4f (diff) | |
download | poky-cb4bba8fb07df35b57d63ab7b7f75c65a63addb5.tar.gz |
dbus: set INHIBIT_UPDATERCD_BBCLASS without sysvinit in features
* fixes udev configure in run-postinsts failing with:
update-rc.d: /etc/init.d/dbus-1: file does not exist
because dbus-udev is installed only with sysvinit in features
but update-rc.d was always called from PN postinst
(From OE-Core rev: f15192a65e02026308253e6723b990b24780be5b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index bfd11672cf..2be5bda101 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -24,6 +24,12 @@ inherit useradd autotools pkgconfig gettext update-rc.d | |||
24 | INITSCRIPT_NAME = "dbus-1" | 24 | INITSCRIPT_NAME = "dbus-1" |
25 | INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." | 25 | INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." |
26 | 26 | ||
27 | python __anonymous() { | ||
28 | features = d.getVar("DISTRO_FEATURES", True).split() | ||
29 | if "sysvinit" not in features: | ||
30 | d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") | ||
31 | } | ||
32 | |||
27 | USERADD_PACKAGES = "${PN}" | 33 | USERADD_PACKAGES = "${PN}" |
28 | GROUPADD_PARAM_${PN} = "-r netdev" | 34 | GROUPADD_PARAM_${PN} = "-r netdev" |
29 | USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \ | 35 | USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \ |