summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus/dbus.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/dbus/dbus.inc')
-rw-r--r--meta/recipes-core/dbus/dbus.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 8d348f8f25..44ee5a6b89 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -6,7 +6,7 @@ LICENSE = "AFL-2 | GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" 7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
8DEPENDS = "expat virtual/libintl" 8DEPENDS = "expat virtual/libintl"
9RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" 9RDEPENDS_dbus = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}"
10RDEPENDS_dbus_class-native = "" 10RDEPENDS_dbus_class-native = ""
11RDEPENDS_dbus_class-nativesdk = "" 11RDEPENDS_dbus_class-nativesdk = ""
12 12
@@ -66,7 +66,7 @@ FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
66 66
67pkg_postinst_dbus() { 67pkg_postinst_dbus() {
68 # If both systemd and sysvinit are enabled, mask the dbus-1 init script 68 # If both systemd and sysvinit are enabled, mask the dbus-1 init script
69 if ${@base_contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then 69 if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then
70 if [ -n "$D" ]; then 70 if [ -n "$D" ]; then
71 OPTS="--root=$D" 71 OPTS="--root=$D"
72 fi 72 fi
@@ -85,8 +85,8 @@ EXTRA_OECONF = "--disable-tests \
85 --with-xml=expat \ 85 --with-xml=expat \
86 --disable-systemd" 86 --disable-systemd"
87 87
88PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 88PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
89 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 89 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
90PACKAGECONFIG_class-native = "" 90PACKAGECONFIG_class-native = ""
91PACKAGECONFIG_class-nativesdk = "" 91PACKAGECONFIG_class-nativesdk = ""
92 92
@@ -98,7 +98,7 @@ PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11
98do_install() { 98do_install() {
99 autotools_do_install 99 autotools_do_install
100 100
101 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 101 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
102 install -d ${D}${sysconfdir}/init.d 102 install -d ${D}${sysconfdir}/init.d
103 sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh 103 sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh
104 install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 104 install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1