[meta-freescale] [meta-freescale PATCH] openssl-qoriq: Fix runtime providers so 'openssl' is not taken as provider
Otavio Salvador
otavio at ossystems.com.br
Tue Sep 22 11:33:13 PDT 2015
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 at ossystems.com.br>
---
recipes-connectivity/openssl/openssl-qoriq.inc | 12 +++++++++++-
recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb | 2 --
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc b/recipes-connectivity/openssl/openssl-qoriq.inc
index ee02fb7..bcbf36f 100644
--- 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 16736fb..3b9d56e 100644
--- 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 \
--
2.5.3
More information about the meta-freescale
mailing list