On Tue, 26 Feb 2019 at 12:36, Otavio Salvador <[email protected]> wrote:
> We had a c_rehash shell re-implementation being used for the native
> package and there is no reason to not use it as well for the
> target. This allows it to be available without the need of perl being
> installed.
I'd rather not deviate from the upstream, and use what the upstream
provides. Especially considering that perl version does have command
line options that the shell version does not, and the difference might
increase in the future:
c_rehash [-old] [-h] [-help] [-v] [dirs...]
If you really really can't afford perl runtime on the target, and want
the shell version, how about making it a PACKAGECONFIG?
Alex
> .../openssl/openssl_1.1.1a.bb | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> index 9f6e26bcf5..3e9e45e4a4 100644
> --- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> @@ -122,7 +122,13 @@ do_install () {
>
> oe_multilib_header openssl/opensslconf.h
>
> - # Create SSL structure for packages such as ca-certificates which
> + # Install a custom version of c_rehash that can handle sysroots
> properly.
> + # This version is used for example when installing ca-certificates
> during
> + # image creation.
> + install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
> + sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
> +
> + # Create SSL structure for packages such as ca-certificates which
> # contain hard-coded paths to /etc/ssl. Debian does the same.
> install -d ${D}${sysconfdir}/ssl
> mv ${D}${libdir}/ssl-1.1/certs \
> @@ -143,12 +149,6 @@ do_install_append_class-native () {
> SSL_CERT_DIR=${libdir}/ssl-1.1/certs \
> SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \
> OPENSSL_ENGINES=${libdir}/ssl-1.1/engines
> -
> - # Install a custom version of c_rehash that can handle sysroots
> properly.
> - # This version is used for example when installing ca-certificates
> during
> - # image creation.
> - install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
> - sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
> }
>
> do_install_append_class-nativesdk () {
> @@ -190,7 +190,7 @@ FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
> FILES_libssl = "${libdir}/libssl${SOLIBS}"
> FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
> FILES_${PN}-engines = "${libdir}/engines-1.1"
> -FILES_${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash"
> +FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
> FILES_${PN} =+ "${libdir}/ssl-1.1/*"
> FILES_${PN}_append_class-nativesdk = "
> ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
>
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> [email protected]
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
