Skip to contentSkip to conversation

dbus: remove uneeded RDEPENDS on ptest

PATCH In review Saul Wold 3 participants 4 messages Mar 21, 2013 – Mar 25, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/1 dbus: remove uneeded RDEPENDS on ptest

This solves a multiple provider issue along with a build failure with ptest enabled

---
 meta/recipes-core/dbus/dbus.inc | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-core/dbus/dbus.inc +0 -2
index affffbc..a1b56a5 100644
@@ -9,8 +9,6 @@ X11DEPENDS = "virtual/libx11 libsm"
 DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
 DEPENDS_class-native = "expat-native virtual/libintl-native"
 DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl"
-RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}"
-RDEPENDS_class-native = ""
 
 INC_PR = "r6"
 
Signature · 1 line
1.8.0.2
#1 lore raw
Quoted 12 lines · Saul Wold

This solves a multiple provider issue along with a build failure with ptest enabled

---
 meta/recipes-core/dbus/dbus.inc | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-core/dbus/dbus.inc +0 -0
index affffbc..a1b56a5 100644

meta/recipes-core/dbus/dbus.inc X11DEPENDS = "virtual/libx11 libsm" · line 13

Quoted 7 lines
meta/recipes-core/dbus/dbus.inc +0 -2
@@ -9,8 +9,6 @@ X11DEPENDS = "virtual/libx11 libsm"
 DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
 DEPENDS_class-native = "expat-native virtual/libintl-native"
 DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl"
-RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}"
-RDEPENDS_class-native = ""
 
 INC_PR = "r6"

We need to fix this but the idea was to trigger a dependency on dbus-ptest being built, if dbus was built...

Cheers,

Richard

#2 lore raw

PATCH 1/2 dbus: Depend on dbus-ptest-ptest

The dbus-ptest recipe doesn't produce an output package called dbus-ptest. What we are interested in is actually the dbus-ptest-ptest package.

---
 meta/recipes-core/dbus/dbus.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-core/dbus/dbus.inc +1 -1
index affffbc..50c102f 100644
@@ -9,7 +9,7 @@ X11DEPENDS = "virtual/libx11 libsm"
 DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
 DEPENDS_class-native = "expat-native virtual/libintl-native"
 DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl"
-RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}"
+RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}"
 RDEPENDS_class-native = ""
 
 INC_PR = "r6"
Signature · 1 line
1.7.5.4
#3 lore raw

Re: [PATCH 1/2] dbus: Depend on dbus-ptest-ptest

(The subject was a mistake. Parent is the only patch.)

Signature · 1 line
Björn