The same output packages of poky openssl should be provided by openssl-qoriq, otherwise the following build error will appear when multiple output packages of openssl are depended, some are provided by openssl-qoriq, the others are provided by poky openssl.
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: Zhenhua Luo <[email protected]> --- recipes-connectivity/openssl/openssl-qoriq.inc | 30 ++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc b/recipes-connectivity/openssl/openssl-qoriq.inc index ee02fb7..b792c01 100644 --- a/recipes-connectivity/openssl/openssl-qoriq.inc +++ b/recipes-connectivity/openssl/openssl-qoriq.inc @@ -32,13 +32,35 @@ export AS = "${CC} -c" inherit pkgconfig siteinfo multilib_header -PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf" +PACKAGES = "openssl-engines openssl-engines-dbg libcrypto libssl openssl-misc \ + openssl-conf openssl-ptest openssl-dbg openssl-staticdev openssl-dev \ + openssl-doc openssl-locale openssl" +FILES_openssl-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" +FILES_openssl-engines-dbg = "${libdir}/ssl/engines/.debug" FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" FILES_libssl = "${libdir}/libssl.so.*" -FILES_${PN} =+ " ${libdir}/ssl/*" -FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" +FILES_openssl-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" +FILES_openssl-ptest = "${libdir}/openssl/ptest" +FILES_openssl-dbg = "${bindir}/.debug ${sbindir}/.debug ${libdir}/openssl/.debug \ + ${libdir}/.debug ${base_bindir}/.debug ${sbindir}/.debug \ + ${base_libdir}/.debug ${libdir}/openssl/.debug ${libdir}/matchbox-panel/.debug \ + ${libdir}/openssl/openssl/.debug /usr/src/debug" +FILES_openssl-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/openssl/*.a" +FILES_openssl-dev = "${includedir} ${base_libdir}/lib*.so ${libdir}/lib*.so \ + ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ + ${datadir}/aclocal ${base_libdir}/*.o ${libdir}/openssl/*.la ${base_libdir}/*.la \ + ${base_libdir}/libcrypto.so" +FILES_openssl-doc = "${datadir}/doc ${datadir}/man ${datadir}/info ${datadir}/gtk-doc \ + ${datadir}/gnome/help" +FILES_openssl-locale = "${datadir}/locale" +FILES_openssl = "${libdir}/ssl/* ${bindir}/* ${sbindir}/* ${libdir}/openssl/* \ + ${libdir}/lib*.so.* ${sysconfdir} ${sharedstatedir} ${localstatedir} ${base_bindir}/* \ + ${base_sbindir}/* ${base_libdir}/*.so.* ${base_libdir}/udev/rules.d \ + ${libdir}/udev/rules.d ${datadir}/openssl ${libdir}/openssl/* ${datadir}/pixmaps \ + ${datadir}/applications ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ + ${libdir}/bonobo/servers" + RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" -FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto # package RRECOMMENDS on this package. This will enable the configuration -- 2.4.3 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
