* [PATCH 2/7] openssl: update 32bit x86 target from linux-elf -> linux-x86
2018-08-17 4:43 [PATCH 1/7] openssl: consolidate target name mapping rules Andre McCurdy
@ 2018-08-17 4:43 ` Andre McCurdy
2018-08-17 4:43 ` [PATCH 3/7] openssl: minor reformatting to align the 1.0 and 1.1 recipes Andre McCurdy
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2018-08-17 4:43 UTC (permalink / raw)
To: openembedded-core
According to comments in Configurations/10-main.conf, the linux-elf
target is "... to be used on older Linux machines where gcc doesn't
understand -m32 and -m64".
The linux-x86 target appears to be the newer replacement (currently
the only difference between the two is that linux-x86 adds -m32 to
cflags).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-connectivity/openssl/openssl_1.1.0i.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index 8a8d928..ab0d264 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
@@ -58,7 +58,7 @@ do_configure () {
target=linux-aarch64
;;
linux-i?86 | linux-viac3)
- target=linux-elf
+ target=linux-x86
;;
linux-gnux32-x86_64 | linux-muslx32-x86_64 )
target=linux-x32
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/7] openssl: minor reformatting to align the 1.0 and 1.1 recipes
2018-08-17 4:43 [PATCH 1/7] openssl: consolidate target name mapping rules Andre McCurdy
2018-08-17 4:43 ` [PATCH 2/7] openssl: update 32bit x86 target from linux-elf -> linux-x86 Andre McCurdy
@ 2018-08-17 4:43 ` Andre McCurdy
2018-08-17 4:43 ` [PATCH 4/7] openssl: openssl-misc dependency on perl should be unconditional Andre McCurdy
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2018-08-17 4:43 UTC (permalink / raw)
To: openembedded-core
Formatting and comment tweaks only, no functional changes.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../recipes-connectivity/openssl/openssl_1.0.2p.bb | 43 +++++++++++-----------
.../recipes-connectivity/openssl/openssl_1.1.0i.bb | 36 ++++++++++--------
2 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
index 5a2593c..1abf894 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
@@ -223,10 +223,11 @@ do_install () {
install -d ${D}${includedir}
cp --dereference -R include/openssl ${D}${includedir}
+ oe_multilib_header openssl/opensslconf.h
+
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
- oe_multilib_header openssl/opensslconf.h
if [ "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" ]; then
sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
@@ -234,12 +235,12 @@ do_install () {
rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
fi
- # Create SSL structure
- install -d ${D}${sysconfdir}/ssl/
- mv ${D}${libdir}/ssl/openssl.cnf \
- ${D}${libdir}/ssl/certs \
+ # 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/certs \
${D}${libdir}/ssl/private \
- \
+ ${D}${libdir}/ssl/openssl.cnf \
${D}${sysconfdir}/ssl/
ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs
ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private
@@ -256,6 +257,19 @@ do_install () {
done
}
+do_install_append_class-native () {
+ create_wrapper ${D}${bindir}/openssl \
+ OPENSSL_CONF=${libdir}/ssl/openssl.cnf \
+ SSL_CERT_DIR=${libdir}/ssl/certs \
+ SSL_CERT_FILE=${libdir}/ssl/cert.pem \
+ OPENSSL_ENGINES=${libdir}/ssl/engines
+}
+
+do_install_append_class-nativesdk () {
+ mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
+ install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+}
+
do_install_ptest () {
cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH}
@@ -304,21 +318,8 @@ do_install_ptest () {
${D}${PTEST_PATH}/Makefile ${D}${PTEST_PATH}/Configure
}
-do_install_append_class-native() {
- create_wrapper ${D}${bindir}/openssl \
- OPENSSL_CONF=${libdir}/ssl/openssl.cnf \
- SSL_CERT_DIR=${libdir}/ssl/certs \
- SSL_CERT_FILE=${libdir}/ssl/cert.pem \
- OPENSSL_ENGINES=${libdir}/ssl/engines
-}
-
-do_install_append_class-nativesdk() {
- mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
- install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
-}
-
-# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
-# package RRECOMMENDS on this package. This will enable the configuration
+# Add the openssl.cnf file to the openssl-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.
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index ab0d264..3d4b7ee 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
@@ -106,16 +106,16 @@ do_configure () {
do_install () {
oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
+
oe_multilib_header openssl/opensslconf.h
- # Create SSL structure for PATH hard-coded packages like ca-certificates
- # Debian is also using this technique
- install -d ${D}${sysconfdir}/ssl/
- mv ${D}${libdir}/ssl-1.1/openssl.cnf \
- ${D}${libdir}/ssl-1.1/certs \
- ${D}${libdir}/ssl-1.1/private \
- \
- ${D}${sysconfdir}/ssl/
+ # 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 \
+ ${D}${libdir}/ssl-1.1/private \
+ ${D}${libdir}/ssl-1.1/openssl.cnf \
+ ${D}${sysconfdir}/ssl/
ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs
ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private
ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl-1.1/openssl.cnf
@@ -134,7 +134,7 @@ do_install_append_class-nativesdk () {
install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
}
-do_install_ptest() {
+do_install_ptest () {
cp -r * ${D}${PTEST_PATH}
# Putting .so files in ptest package will mess up the dependencies of the main openssl package
@@ -144,22 +144,26 @@ do_install_ptest() {
sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t
}
-PACKAGES =+ "libcrypto libssl ${PN}-misc ${PN}-engines openssl-conf"
+# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
+# package RRECOMMENDS on this package. This will enable the configuration
+# file to be installed for both the openssl-bin package and the libcrypto
+# package since the openssl-bin package depends on the libcrypto package.
+
+PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc"
FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
FILES_libssl = "${libdir}/libssl${SOLIBS}"
-FILES_${PN} =+ "${libdir}/ssl-1.1/*"
-FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
+FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl-1.1/openssl.cnf"
FILES_${PN}-engines = "${libdir}/engines-1.1"
-
FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
-RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
+FILES_${PN} =+ "${libdir}/ssl-1.1/*"
+FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
-FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl-1.1/openssl.cnf"
CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
-RRECOMMENDS_libcrypto += "openssl-conf"
+RRECOMMENDS_libcrypto += "openssl-conf"
RDEPENDS_${PN}-bin = "perl"
+RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python"
BBCLASSEXTEND = "native nativesdk"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/7] openssl: openssl-misc dependency on perl should be unconditional
2018-08-17 4:43 [PATCH 1/7] openssl: consolidate target name mapping rules Andre McCurdy
2018-08-17 4:43 ` [PATCH 2/7] openssl: update 32bit x86 target from linux-elf -> linux-x86 Andre McCurdy
2018-08-17 4:43 ` [PATCH 3/7] openssl: minor reformatting to align the 1.0 and 1.1 recipes Andre McCurdy
@ 2018-08-17 4:43 ` Andre McCurdy
2018-08-17 4:43 ` [PATCH 5/7] openssl: move the libdir openssl.cnf symlink into the openssl package Andre McCurdy
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2018-08-17 4:43 UTC (permalink / raw)
To: openembedded-core
The openssl 1.1 recipe doesn't have a PACKAGECONFIG option for perl,
so the RDEPENDS for openssl-misc shouldn't be conditional on it.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-connectivity/openssl/openssl_1.1.0i.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index 3d4b7ee..d9c19eb 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
@@ -163,7 +163,7 @@ CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
RRECOMMENDS_libcrypto += "openssl-conf"
RDEPENDS_${PN}-bin = "perl"
-RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
+RDEPENDS_${PN}-misc = "perl"
RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python"
BBCLASSEXTEND = "native nativesdk"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/7] openssl: move the libdir openssl.cnf symlink into the openssl package
2018-08-17 4:43 [PATCH 1/7] openssl: consolidate target name mapping rules Andre McCurdy
` (2 preceding siblings ...)
2018-08-17 4:43 ` [PATCH 4/7] openssl: openssl-misc dependency on perl should be unconditional Andre McCurdy
@ 2018-08-17 4:43 ` Andre McCurdy
2018-08-17 4:43 ` [PATCH 6/7] openssl: fix path in nativesdk environment-setup script Andre McCurdy
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2018-08-17 4:43 UTC (permalink / raw)
To: openembedded-core
The openssl 1.0 recipe puts the libdir symlink to /etc/ssl/openssl.cnf
in the base openssl package (along with the libdir symlinks to
/etc/ssl/certs and /etc/ssl/private). Keep the openssl 1.1 recipe
aligned with that approach until there's a clear reason to do
something else. For more background, see comments in the following
thread:
http://lists.openembedded.org/pipermail/openembedded-core/2017-April/135176.html
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-connectivity/openssl/openssl_1.1.0i.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index d9c19eb..73e8ffa 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
@@ -153,7 +153,7 @@ PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc"
FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
FILES_libssl = "${libdir}/libssl${SOLIBS}"
-FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl-1.1/openssl.cnf"
+FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
FILES_${PN}-engines = "${libdir}/engines-1.1"
FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
FILES_${PN} =+ "${libdir}/ssl-1.1/*"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/7] openssl: fix path in nativesdk environment-setup script
2018-08-17 4:43 [PATCH 1/7] openssl: consolidate target name mapping rules Andre McCurdy
` (3 preceding siblings ...)
2018-08-17 4:43 ` [PATCH 5/7] openssl: move the libdir openssl.cnf symlink into the openssl package Andre McCurdy
@ 2018-08-17 4:43 ` Andre McCurdy
2018-08-17 4:43 ` [PATCH 7/7] openssl: drop obsolete no-afalgeng workaround for aarch64 Andre McCurdy
2018-08-17 5:02 ` ✗ patchtest: failure for "openssl: consolidate target na..." and 6 more Patchwork
6 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2018-08-17 4:43 UTC (permalink / raw)
To: openembedded-core
A single version of the openssl.sh environment-setup script is
currently shared by both the openssl 1.0 and 1.1 recipes. The libdir
path in the script needs to be tweaked for openssl 1.1.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-connectivity/openssl/openssl_1.1.0i.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index 73e8ffa..92f3059 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
@@ -132,6 +132,7 @@ do_install_append_class-native () {
do_install_append_class-nativesdk () {
mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+ sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
}
do_install_ptest () {
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 7/7] openssl: drop obsolete no-afalgeng workaround for aarch64
2018-08-17 4:43 [PATCH 1/7] openssl: consolidate target name mapping rules Andre McCurdy
` (4 preceding siblings ...)
2018-08-17 4:43 ` [PATCH 6/7] openssl: fix path in nativesdk environment-setup script Andre McCurdy
@ 2018-08-17 4:43 ` Andre McCurdy
2018-08-17 5:02 ` ✗ patchtest: failure for "openssl: consolidate target na..." and 6 more Patchwork
6 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2018-08-17 4:43 UTC (permalink / raw)
To: openembedded-core
The aarch64 build issue in the afalg engine appears to have been
fixed upstream since openssl 1.1.0g:
https://github.com/openssl/openssl/commit/a0c262644eab897b51faf1fa013008052c3754c2
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-connectivity/openssl/openssl_1.1.0i.bb | 6 ------
1 file changed, 6 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index 92f3059..507f8f8 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
@@ -25,12 +25,6 @@ SRC_URI[sha256sum] = "ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc1182
inherit lib_package multilib_header ptest relative_symlinks
-#| engines/afalg/e_afalg.c: In function 'eventfd':
-#| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function)
-#| return syscall(__NR_eventfd, n);
-#| ^~~~~~~~~~~~
-EXTRA_OECONF_append_aarch64 = " no-afalgeng"
-
#| ./libcrypto.so: undefined reference to `getcontext'
#| ./libcrypto.so: undefined reference to `setcontext'
#| ./libcrypto.so: undefined reference to `makecontext'
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* ✗ patchtest: failure for "openssl: consolidate target na..." and 6 more
2018-08-17 4:43 [PATCH 1/7] openssl: consolidate target name mapping rules Andre McCurdy
` (5 preceding siblings ...)
2018-08-17 4:43 ` [PATCH 7/7] openssl: drop obsolete no-afalgeng workaround for aarch64 Andre McCurdy
@ 2018-08-17 5:02 ` Patchwork
2018-08-17 5:41 ` Andre McCurdy
6 siblings, 1 reply; 9+ messages in thread
From: Patchwork @ 2018-08-17 5:02 UTC (permalink / raw)
To: Andre McCurdy; +Cc: openembedded-core
== Series Details ==
Series: "openssl: consolidate target na..." and 6 more
Revision: 1
URL : https://patchwork.openembedded.org/series/13570/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 176e50fb17)
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 9+ messages in thread