[oe-commits] Richard Purdie : dbus: Ensure dbus-nativesdk doesn't RPROVIDE dbus-x11

git at git.openembedded.org git at git.openembedded.org
Fri Sep 28 16:00:19 UTC 2012


Module: openembedded-core.git
Branch: denzil
Commit: f4cc32585f9ac392460991b46b8cfa7a347a27e6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f4cc32585f9ac392460991b46b8cfa7a347a27e6

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Sep 17 18:25:53 2012 -0500

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.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 d1e83bf..9d0f216 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/"
 





More information about the Openembedded-commits mailing list