[meta-freescale] [PATCH 3/8] openssl-qoriq: add openssl-qoriq prefix for produced packages

[Luo Zhenhua]

Please ignore the following patches which are not the appropriate fixes. 

http://patches.openembedded.org/patch/101617/
http://patches.openembedded.org/patch/101619/
http://patches.openembedded.org/patch/101625/
http://patches.openembedded.org/patch/101623/
http://patches.openembedded.org/patch/101629/


Best Regards,

Zhenhua

> -----Original Message-----
> From: Zhenhua Luo [mailto:zhenhua.luo at freescale.com]
> Sent: Wednesday, August 26, 2015 7:04 PM
> To: meta-freescale at yoctoproject.org
> Cc: Luo Zhenhua-B19537 <zhenhua.luo at freescale.com>
> Subject: [meta-freescale][PATCH 3/8] openssl-qoriq: add openssl-qoriq prefix
> for produced packages
> 
> Add the openssl-qoriq prefix for generated output packages to avoid
> duplicated output packages of openssl in poky, e.g. libcrypto, libssl, oenssl-conf.
> 
> Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
> ---
>  recipes-connectivity/openssl/openssl-qoriq.inc | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc b/recipes-
> connectivity/openssl/openssl-qoriq.inc
> index ee02fb7..75bc750 100644
> --- a/recipes-connectivity/openssl/openssl-qoriq.inc
> +++ b/recipes-connectivity/openssl/openssl-qoriq.inc
> @@ -32,21 +32,21 @@ export AS = "${CC} -c"
> 
>  inherit pkgconfig siteinfo multilib_header
> 
> -PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
> -FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
> -FILES_libssl = "${libdir}/libssl.so.*"
> +PACKAGES =+ "${PN}-libcrypto ${PN}-libssl ${PN}-misc ${PN}-conf"
> +FILES_${PN}-libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
> +FILES_${PN}-libssl = "${libdir}/libssl.so.*"
>  FILES_${PN} =+ " ${libdir}/ssl/*"
>  FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
>  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
> +# Add the openssl.cnf file to the openssl-qoriq-conf package.  Make the
> +libcrypto
>  # package RRECOMMENDS on this package.  This will enable the configuration
> # file to be installed for both the base openssl package and the libcrypto  #
> package since the base openssl package depends on the libcrypto package.
> -FILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
> -CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
> -RRECOMMENDS_libcrypto += "openssl-conf"
> +FILES_${PN}-conf = "${libdir}/ssl/openssl.cnf"
> +CONFFILES_${PN}-conf = "${libdir}/ssl/openssl.cnf"
> +RRECOMMENDS_${PN}-libcrypto += "${PN}-conf"
> 
>  do_configure_prepend_darwin () {
>  	sed -i -e '/version-script=openssl\.ld/d' Configure
> --
> 2.4.3