diff options
Diffstat (limited to 'meta/recipes-core/dbus/dbus_1.12.22.bb')
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.12.22.bb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/meta/recipes-core/dbus/dbus_1.12.22.bb b/meta/recipes-core/dbus/dbus_1.12.22.bb index 48947209d9..e611e7d98a 100644 --- a/meta/recipes-core/dbus/dbus_1.12.22.bb +++ b/meta/recipes-core/dbus/dbus_1.12.22.bb | |||
@@ -5,10 +5,7 @@ SECTION = "base" | |||
5 | 5 | ||
6 | require dbus.inc | 6 | require dbus.inc |
7 | 7 | ||
8 | DEPENDS = "expat virtual/libintl autoconf-archive" | 8 | DEPENDS = "expat virtual/libintl autoconf-archive glib-2.0" |
9 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" | ||
10 | ALLOW_EMPTY:dbus-ptest = "1" | ||
11 | RDEPENDS:dbus-ptest:class-target = "dbus-test-ptest" | ||
12 | RDEPENDS:${PN} += "${PN}-common ${PN}-tools" | 9 | RDEPENDS:${PN} += "${PN}-common ${PN}-tools" |
13 | RDEPENDS:${PN}:class-native = "" | 10 | RDEPENDS:${PN}:class-native = "" |
14 | 11 | ||
@@ -73,6 +70,8 @@ FILES:${PN}-lib = "${libdir}/lib*.so.*" | |||
73 | RRECOMMENDS:${PN}-lib = "${PN}" | 70 | RRECOMMENDS:${PN}-lib = "${PN}" |
74 | FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" | 71 | FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" |
75 | 72 | ||
73 | RDEPENDS:${PN}-ptest += "bash make dbus" | ||
74 | |||
76 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" | 75 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" |
77 | pkg_postinst:dbus() { | 76 | pkg_postinst:dbus() { |
78 | # If both systemd and sysvinit are enabled, mask the dbus-1 init script | 77 | # If both systemd and sysvinit are enabled, mask the dbus-1 init script |
@@ -89,8 +88,6 @@ pkg_postinst:dbus() { | |||
89 | } | 88 | } |
90 | 89 | ||
91 | 90 | ||
92 | EXTRA_OECONF += "--disable-tests" | ||
93 | |||
94 | do_install() { | 91 | do_install() { |
95 | autotools_do_install | 92 | autotools_do_install |
96 | 93 | ||
@@ -149,5 +146,3 @@ do_install:class-nativesdk() { | |||
149 | rm -rf ${D}${localstatedir}/run | 146 | rm -rf ${D}${localstatedir}/run |
150 | } | 147 | } |
151 | BBCLASSEXTEND = "native nativesdk" | 148 | BBCLASSEXTEND = "native nativesdk" |
152 | |||
153 | INSANE_SKIP:${PN}-ptest += "build-deps" | ||