> -----Original Message----- > From: openembedded-core-boun...@lists.openembedded.org <openembedded- > core-boun...@lists.openembedded.org> On Behalf Of Otavio Salvador > Sent: den 19 mars 2019 14:57 > To: OpenEmbedded Core Mailing List <openembedded- > c...@lists.openembedded.org> > Cc: Otavio Salvador <ota...@ossystems.com.br> > Subject: [OE-core] [PATCH v4 1/2] openssl: Remove the c_rehash shell > re-implementation > > We had a c_rehash shell re-implementation being used for the native > package however the ca-certificates now uses the openssl rehash > internal application so there is no use for the c_rehash anymore. > > Signed-off-by: Otavio Salvador <ota...@ossystems.com.br> > --- > > Changes in v4: > - remove perlnative requirement > > Changes in v3: > - remove c_rehash completely > - fix ca-certificates recipe comment > > Changes in v2: > - updated commit log > > .../openssl/openssl/openssl-c_rehash.sh | 222 ------------------ > .../openssl/openssl_1.1.1a.bb | 15 +- > .../ca-certificates_20190110.bb | 2 +- > 3 files changed, 2 insertions(+), 237 deletions(-) > delete mode 100644 > meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh > > diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh > b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh > deleted file mode 100644 > index 6620fdcb53..0000000000 > --- a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh > +++ /dev/null > @@ -1,222 +0,0 @@
[cut] > diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb > b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb > index 4a626a4fcd..c5900ad536 100644 > --- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb > +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb > @@ -9,11 +9,8 @@ SECTION = "libs/network" > LICENSE = "openssl" > LIC_FILES_CHKSUM = "file://LICENSE;md5=d57d511030c9d66ef5f5966bee5a7eff" > > -DEPENDS = "hostperl-runtime-native" > - > SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ > file://run-ptest \ > - file://openssl-c_rehash.sh \ > file://0001-skip-test_symbol_presence.patch \ > > file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ > file://afalg.patch \ > @@ -149,12 +146,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 () { > @@ -196,7 +187,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" > You should remove the following line too: RDEPENDS_${PN}-misc = "perl" so we actually get rid of the perl dependency. > @@ -211,7 +202,3 @@ RREPLACES_openssl-conf = "openssl10-conf" > RCONFLICTS_openssl-conf = "openssl10-conf" > > BBCLASSEXTEND = "native nativesdk" > - > -inherit multilib_script > - > -MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" > diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb > b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb > index b9f57900c8..4c0425302f 100644 > --- a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb > +++ b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb > @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = > "file://debian/copyright;md5=aeb420429b1659507e0a5a1b123e8308 > DEPENDS = "" > DEPENDS_class-native = "openssl-native" > DEPENDS_class-nativesdk = "openssl-native" > -# Need c_rehash from openssl and run-parts from debianutils > +# Need rehash from openssl and run-parts from debianutils > PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" > > SRCREV = "c28799b138b044c963d24c4a69659b6e5486e3be" > -- > 2.21.0 //Peter -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core