openssl-qoriq: Fix runtime providers so 'openssl' is not taken as provider

Fix the following parse error:

  ERROR: Multiple .bb files are due to be built which each provide openssl
  (.../meta-freescale/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb
  /poky/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb). This usually
  means one provides something the other doesn't and should.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc b/recipes-connectivity/openssl/openssl-qoriq.inc
index ee02fb796ec563b2a1de517b8892d51a82250023..bcbf36f2b4983694b2794819b54950da0550cc1f 100644 (file)
--- a/recipes-connectivity/openssl/openssl-qoriq.inc
+++ b/recipes-connectivity/openssl/openssl-qoriq.inc
@@ -8,6 +8,17 @@ SECTION = "libs/network"
 LICENSE = "openssl"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
+PROVIDES = "openssl"
+
+python() {
+    pkgs = d.getVar('PACKAGES', True).split()
+    for p in pkgs:
+        if 'openssl-qoriq' in p:
+            d.appendVar("RPROVIDES_%s" % p, p.replace('openssl-qoriq', 'openssl'))
+            d.appendVar("RCONFLICTS_%s" % p, p.replace('openssl-qoriq', 'openssl'))
+            d.appendVar("RREPLACES_%s" % p, p.replace('openssl-qoriq', 'openssl'))
+}
+
 DEPENDS = "perl-native-runtime"
 
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
@@ -170,4 +181,3 @@ do_install () {
 }
 
 BBCLASSEXTEND = "native nativesdk"
-

diff --git a/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb b/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb
index 16736fb940e44d12bde78ce7f7cf064753176170..3b9d56eb0046078915fdbaa4aa5c7a48ae34e503 100644 (file)
--- a/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb
+++ b/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 export DIRS = "crypto ssl apps engines"
 export OE_LDFLAGS="${LDFLAGS}"
 
-PROVIDES = "openssl"
-
 SRC_URI += "file://configure-targets.patch \
             file://shared-libs.patch \
             file://oe-ldflags.patch \