summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-17 23:25:53 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:53:18 (GMT)
commitd47234d4c97b7d9be57c33cc112883a83df6b8d0 (patch)
treede4ff00c7d01a8860faa112ec2d4bc37fbfa1216 /meta/recipes-core
parent3cdd930eeb9f0f3aedc552fdf8157d9baeb40b58 (diff)
downloadpoky-d47234d4c97b7d9be57c33cc112883a83df6b8d0.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: f4cc32585f9ac392460991b46b8cfa7a347a27e6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 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"
33 33
34PACKAGES =+ "${PN}-lib ${PN}-systemd" 34PACKAGES =+ "${PN}-lib ${PN}-systemd"
35 35
36OLDPKGNAME = "dbus-x11"
37OLDPKGNAME_virtclass-nativesdk = ""
38
36# for compatibility 39# for compatibility
37RPROVIDES_${PN} = "dbus-x11" 40RPROVIDES_${PN} = "${OLDPKGNAME}"
38RREPLACES_${PN} += "dbus-x11" 41RREPLACES_${PN} += "${OLDPKGNAME}"
39 42
40FILES_${PN}-systemd = "${systemd_unitdir}/system/" 43FILES_${PN}-systemd = "${systemd_unitdir}/system/"
41 44