diff options
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.12.20.bb | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/meta/recipes-core/dbus/dbus_1.12.20.bb b/meta/recipes-core/dbus/dbus_1.12.20.bb index cf6f7dc0ef..4040fdb22a 100644 --- a/meta/recipes-core/dbus/dbus_1.12.20.bb +++ b/meta/recipes-core/dbus/dbus_1.12.20.bb | |||
@@ -11,6 +11,8 @@ RDEPENDS_dbus_class-nativesdk = "" | |||
11 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" | 11 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" |
12 | ALLOW_EMPTY_dbus-ptest = "1" | 12 | ALLOW_EMPTY_dbus-ptest = "1" |
13 | RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" | 13 | RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" |
14 | RDEPENDS_${PN} += "${PN}-common ${PN}-tools" | ||
15 | RDEPENDS_${PN}_class-native = "" | ||
14 | 16 | ||
15 | inherit useradd update-rc.d | 17 | inherit useradd update-rc.d |
16 | 18 | ||
@@ -31,7 +33,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session | |||
31 | 33 | ||
32 | DEBIANNAME_${PN} = "dbus-1" | 34 | DEBIANNAME_${PN} = "dbus-1" |
33 | 35 | ||
34 | PACKAGES =+ "${PN}-lib" | 36 | PACKAGES =+ "${PN}-lib ${PN}-common ${PN}-tools" |
35 | 37 | ||
36 | OLDPKGNAME = "dbus-x11" | 38 | OLDPKGNAME = "dbus-x11" |
37 | OLDPKGNAME_class-nativesdk = "" | 39 | OLDPKGNAME_class-nativesdk = "" |
@@ -41,31 +43,37 @@ RPROVIDES_${PN} = "${OLDPKGNAME}" | |||
41 | RREPLACES_${PN} += "${OLDPKGNAME}" | 43 | RREPLACES_${PN} += "${OLDPKGNAME}" |
42 | 44 | ||
43 | FILES_${PN} = "${bindir}/dbus-daemon* \ | 45 | FILES_${PN} = "${bindir}/dbus-daemon* \ |
44 | ${bindir}/dbus-uuidgen \ | ||
45 | ${bindir}/dbus-cleanup-sockets \ | 46 | ${bindir}/dbus-cleanup-sockets \ |
46 | ${bindir}/dbus-send \ | ||
47 | ${bindir}/dbus-monitor \ | ||
48 | ${bindir}/dbus-launch \ | 47 | ${bindir}/dbus-launch \ |
49 | ${bindir}/dbus-run-session \ | 48 | ${bindir}/dbus-run-session \ |
50 | ${bindir}/dbus-update-activation-environment \ | ||
51 | ${libexecdir}/dbus* \ | 49 | ${libexecdir}/dbus* \ |
52 | ${sysconfdir} \ | 50 | ${sysconfdir} \ |
53 | ${localstatedir} \ | 51 | ${localstatedir} \ |
54 | ${datadir}/dbus-1/services \ | ||
55 | ${datadir}/dbus-1/system-services \ | ||
56 | ${datadir}/dbus-1/session.d \ | ||
57 | ${datadir}/dbus-1/session.conf \ | ||
58 | ${datadir}/dbus-1/system.d \ | ||
59 | ${datadir}/dbus-1/system.conf \ | ||
60 | ${datadir}/xml/dbus-1 \ | ||
61 | ${systemd_system_unitdir} \ | 52 | ${systemd_system_unitdir} \ |
62 | ${systemd_user_unitdir} \ | 53 | ${systemd_user_unitdir} \ |
63 | ${nonarch_libdir}/sysusers.d/dbus.conf \ | ||
64 | ${nonarch_libdir}/tmpfiles.d/dbus.conf \ | 54 | ${nonarch_libdir}/tmpfiles.d/dbus.conf \ |
65 | " | 55 | " |
56 | FILES_${PN}-common = "${sysconfdir}/dbus-1 \ | ||
57 | ${datadir}/dbus-1/services \ | ||
58 | ${datadir}/dbus-1/system-services \ | ||
59 | ${datadir}/dbus-1/session.d \ | ||
60 | ${datadir}/dbus-1/session.conf \ | ||
61 | ${datadir}/dbus-1/system.d \ | ||
62 | ${datadir}/dbus-1/system.conf \ | ||
63 | ${systemd_system_unitdir}/dbus.socket \ | ||
64 | ${systemd_system_unitdir}/sockets.target.wants \ | ||
65 | ${systemd_user_unitdir}/dbus.socket \ | ||
66 | ${systemd_user_unitdir}/sockets.target.wants \ | ||
67 | ${nonarch_libdir}/sysusers.d/dbus.conf \ | ||
68 | " | ||
69 | FILES_${PN}-tools = "${bindir}/dbus-uuidgen \ | ||
70 | ${bindir}/dbus-send \ | ||
71 | ${bindir}/dbus-monitor \ | ||
72 | ${bindir}/dbus-update-activation-environment \ | ||
73 | " | ||
66 | FILES_${PN}-lib = "${libdir}/lib*.so.*" | 74 | FILES_${PN}-lib = "${libdir}/lib*.so.*" |
67 | RRECOMMENDS_${PN}-lib = "${PN}" | 75 | RRECOMMENDS_${PN}-lib = "${PN}" |
68 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${libdir}/cmake/DBus1 ${bindir}/dbus-test-tool" | 76 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${libdir}/cmake/DBus1 ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" |
69 | 77 | ||
70 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" | 78 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" |
71 | pkg_postinst_dbus() { | 79 | pkg_postinst_dbus() { |