Skip to contentSkip to conversation

dbus: Ensure dbus-nativesdk doesn't RPROVIDE dbus-x11

PATCH In review Richard Purdie 2 participants 3 messages Aug 1, 2012

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

meta/recipes-core/dbus/dbus.inc +5 -2
index 164c4d3..1984c74 100644
@@ -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/"
#1 lore raw
Quoted 11 lines · Richard Purdie

dbus-x11 should not RPROVIDE dbus-x11 as this is incorrect and confuses builds. This fixes the nativesdk case.

Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-core/dbus/dbus.inc +0 -0
index 164c4d3..1984c74 100644
@@ -33,9 +33,12 @@ DEBIANNAME_${PN} = "dbus-1"

meta/recipes-core/dbus/dbus.inc DEBIANNAME_${PN} = "dbus-1" · line 41

Quoted 10 lines
meta/recipes-core/dbus/dbus.inc +5 -2
 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}"

what about this?
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-August/026947.html

Quoted 10 lines
meta/recipes-core/dbus/dbus.inc +0 -0
 FILES_${PN}-systemd = "${systemd_unitdir}/system/"

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#2 lore raw
Quoted 14 lines · Martin Jansa
Quoted 13 lines · Richard Purdie

dbus-x11 should not RPROVIDE dbus-x11 as this is incorrect and confuses builds. This fixes the nativesdk case.

Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-core/dbus/dbus.inc +0 -0
index 164c4d3..1984c74 100644
@@ -33,9 +33,12 @@ DEBIANNAME_${PN} = "dbus-1"
 
 PACKAGES =+ "${PN}-lib ${PN}-systemd"
Quoted 11 lines

meta/recipes-core/dbus/dbus.inc DEBIANNAME_${PN} = "dbus-1" · line 41

Quoted 8 lines
meta/recipes-core/dbus/dbus.inc +5 -2
+OLDPKGNAME = "dbus-x11"
+OLDPKGNAME_virtclass-nativesdk = ""
+
 # for compatibility
-RPROVIDES_${PN} = "dbus-x11"
-RREPLACES_${PN} += "dbus-x11"
+RPROVIDES_${PN} = "${OLDPKGNAME}"
+RREPLACES_${PN} += "${OLDPKGNAME}"

what about this?
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-August/026947.html

They're each different ways to fix the problem. The above just kills the nativesdk version since I don't think anyone will feel strongly about it but I don't have strong feelings. I notice Marcin also has a patch out, for some reason I didn't see that initially :(.

Cheers,

Richard