diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-01 21:14:26 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-02 15:28:39 +0100 |
| commit | 0125438b853348e8a0869e17848173c9d8d51c5d (patch) | |
| tree | 1fe9c0567cbcb9f2e242b0315c1ad250e7edbac7 /meta/recipes-core/dbus | |
| parent | 01524b4de77501981bc5851230433b82e4657bb8 (diff) | |
| download | poky-0125438b853348e8a0869e17848173c9d8d51c5d.tar.gz | |
dbus: Ensure dbus-nativesdk doesn't RPROVIDE dbus-x11
dbus-x11 should not RPROVIDE dbus-x11 as this is incorrect and confuses
builds. This fixes the nativesdk case.
(From OE-Core rev: 09e3ebdb77c090ddc45fed7c6acc1591cd4b3595)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus')
| -rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 164c4d358d..1984c74c6d 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
| @@ -33,9 +33,12 @@ DEBIANNAME_${PN} = "dbus-1" | |||
| 33 | 33 | ||
| 34 | PACKAGES =+ "${PN}-lib ${PN}-systemd" | 34 | PACKAGES =+ "${PN}-lib ${PN}-systemd" |
| 35 | 35 | ||
| 36 | OLDPKGNAME = "dbus-x11" | ||
| 37 | OLDPKGNAME_virtclass-nativesdk = "" | ||
| 38 | |||
| 36 | # for compatibility | 39 | # for compatibility |
| 37 | RPROVIDES_${PN} = "dbus-x11" | 40 | RPROVIDES_${PN} = "${OLDPKGNAME}" |
| 38 | RREPLACES_${PN} += "dbus-x11" | 41 | RREPLACES_${PN} += "${OLDPKGNAME}" |
| 39 | 42 | ||
| 40 | FILES_${PN}-systemd = "${systemd_unitdir}/system/" | 43 | FILES_${PN}-systemd = "${systemd_unitdir}/system/" |
| 41 | 44 | ||