summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-01 21:14:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-02 15:28:39 +0100
commit0125438b853348e8a0869e17848173c9d8d51c5d (patch)
tree1fe9c0567cbcb9f2e242b0315c1ad250e7edbac7 /meta
parent01524b4de77501981bc5851230433b82e4657bb8 (diff)
downloadast2050-yocto-poky-0125438b853348e8a0869e17848173c9d8d51c5d.zip
ast2050-yocto-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')
-rw-r--r--meta/recipes-core/dbus/dbus.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 164c4d3..1984c74 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -33,9 +33,12 @@ DEBIANNAME_${PN} = "dbus-1"
PACKAGES =+ "${PN}-lib ${PN}-systemd"
+OLDPKGNAME = "dbus-x11"
+OLDPKGNAME_virtclass-nativesdk = ""
+
# for compatibility
-RPROVIDES_${PN} = "dbus-x11"
-RREPLACES_${PN} += "dbus-x11"
+RPROVIDES_${PN} = "${OLDPKGNAME}"
+RREPLACES_${PN} += "${OLDPKGNAME}"
FILES_${PN}-systemd = "${systemd_unitdir}/system/"
OpenPOWER on IntegriCloud