aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-17 18:25:53 -0500
committerScott Garman <scott.a.garman@intel.com>2012-09-24 09:51:14 -0700
commitf4cc32585f9ac392460991b46b8cfa7a347a27e6 (patch)
tree20f6a2571c496d8acdc489937a5d2130443b6b23
parent9bf6d834312581e8b8741fb9d1621e4c40de5687 (diff)
downloadopenembedded-core-f4cc32585f9ac392460991b46b8cfa7a347a27e6.tar.gz
openembedded-core-f4cc32585f9ac392460991b46b8cfa7a347a27e6.tar.bz2
openembedded-core-f4cc32585f9ac392460991b46b8cfa7a347a27e6.zip
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@linuxfoundation.org>
-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 d1e83bfce8..9d0f21627e 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/"