Revert "package/libopenssl does not support riscv32"

Now that we have a backport from upstream with a proper fix for the
build on riscv32 *and* a proper implementationfor 64-bit time structs,
we can re-activate the build on riscv32.

This partially reverts commit c72be5dd2f5aef9162a0ec90465d9220b3546887.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Alistair Francis <alistair.francis@wdc.com>
Cc: Matthew Weber <matthew.weber@rockwellcollins.com>
Cc: Mark Corbin <mark@dibsco.co.uk>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index 38cead90ca7733acd092fa5902b5caefe33c6710..54d2086c0973500a0436e2361cc242390b0c356b 100644 (file)
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -76,7 +76,6 @@ config BR2_PACKAGE_HOSTAPD_WPS
 
 config BR2_PACKAGE_HOSTAPD_WPA3
        bool "Enable WPA3 support"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
        help

diff --git a/package/ibm-sw-tpm2/Config.in b/package/ibm-sw-tpm2/Config.in
index 57781a54bbfcc68154d892e064386ef8d3b8215b..179fa739514891dae017cae38f3be8bfb4da3d34 100644 (file)
--- a/package/ibm-sw-tpm2/Config.in
+++ b/package/ibm-sw-tpm2/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_IBM_SW_TPM2
        bool "ibm-sw-tpm2"
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on !BR2_STATIC_LIBS # ibm-sw-tpm2
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
        help
@@ -14,5 +13,4 @@ config BR2_PACKAGE_IBM_SW_TPM2
          https://sourceforge.net/projects/ibmswtpm2/
 
 comment "ibm-sw-tpm2 needs a toolchain w/ threads, dynamic library"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/ima-evm-utils/Config.in b/package/ima-evm-utils/Config.in
index 59df58e5b3e66aee3f617e72a3be9f9e70262cc6..6c29c9de28ed3c9a6f141af46af654d002ea14f3 100644 (file)
--- a/package/ima-evm-utils/Config.in
+++ b/package/ima-evm-utils/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_IMA_EVM_UTILS
        bool "ima-evm-utils"
        depends on BR2_USE_MMU # keyutils
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss
        depends on !BR2_STATIC_LIBS # keyutils, tpm2-tss
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_KEYUTILS
@@ -14,5 +13,4 @@ config BR2_PACKAGE_IMA_EVM_UTILS
 
 comment "ima-evm-utils needs dynamic library support"
        depends on BR2_USE_MMU
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        depends on BR2_STATIC_LIBS

diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index dd470913004342e332b40a349911743418ccb64c..f69e85978fd3bda251b339c1bb8943dfc7bfc521 100644 (file)
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -1,11 +1,5 @@
-config BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
-       bool
-       default y
-       depends on !BR2_RISCV_32
-
 config BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
        bool
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
 
 config BR2_PACKAGE_OPENSSL
        bool "openssl support"
@@ -22,7 +16,6 @@ choice
 
 config BR2_PACKAGE_LIBOPENSSL
        bool "openssl"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        select BR2_PACKAGE_ZLIB
        help
          A collaborative effort to develop a robust, commercial-grade,

diff --git a/package/softether/Config.in b/package/softether/Config.in
index 01104b5d39aec11b1013f5d2fe6918ee795c136f..bfb45b03155984d97f51c5617ced2af53a053506 100644 (file)
--- a/package/softether/Config.in
+++ b/package/softether/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_SOFTETHER
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
        depends on BR2_USE_WCHAR
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
@@ -28,5 +27,4 @@ config BR2_PACKAGE_SOFTETHER
 
 comment "softether needs a toolchain w/ wchar, threads"
        depends on BR2_USE_MMU
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/tpm2-abrmd/Config.in b/package/tpm2-abrmd/Config.in
index 0c60db80951f9c593785d0f86ea5e8080820309c..4931641af413b6841433adbe1d53aba29f75f283 100644 (file)
--- a/package/tpm2-abrmd/Config.in
+++ b/package/tpm2-abrmd/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_TPM2_ABRMD
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        depends on BR2_USE_MMU # libglib2
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss
        depends on !BR2_STATIC_LIBS # tpm2-tss
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_TPM2_TSS
@@ -23,6 +22,5 @@ config BR2_PACKAGE_TPM2_ABRMD
 
 comment "tpm2-abrmd needs a toolchain w/ dynamic library, wchar, threads"
        depends on BR2_USE_MMU
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
                BR2_STATIC_LIBS

diff --git a/package/tpm2-pkcs11/Config.in b/package/tpm2-pkcs11/Config.in
index ec82d72ae363759bc588583b43a998ae00c021ca..5d457032238266fafa9cf5b9ac5887dc23e6a79f 100644 (file)
--- a/package/tpm2-pkcs11/Config.in
+++ b/package/tpm2-pkcs11/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_TPM2_PKCS11
        bool "tpm2-pkcs11"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss
        depends on !BR2_STATIC_LIBS # tpm2-tss
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_LIBYAML
@@ -13,5 +12,4 @@ config BR2_PACKAGE_TPM2_PKCS11
          https://github.com/tpm2-software/tpm2-pkcs11
 
 comment "tpm2-pkcs11 needs a toolchain w/ dynamic library, threads"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in
index 642bd9e462d7aba828fd3a430c05ceafbf6f4e71..35ca63bf64d222c1f04923c532f365f8e2970777 100644 (file)
--- a/package/tpm2-tools/Config.in
+++ b/package/tpm2-tools/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_TPM2_TOOLS
        bool "tpm2-tools"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss
        depends on !BR2_STATIC_LIBS # tpm2-tss
        select BR2_PACKAGE_LIBCURL
        select BR2_PACKAGE_OPENSSL
@@ -20,5 +19,4 @@ config BR2_PACKAGE_TPM2_TOOLS
          https://github.com/tpm2-software/tpm2-tools
 
 comment "tpm2-tools needs a toolchain w/ dynamic library"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        depends on BR2_STATIC_LIBS

diff --git a/package/tpm2-totp/Config.in b/package/tpm2-totp/Config.in
index 7f274fa13043c36c935db4fb5f8e0144e29ee52d..dcadf5a5f2840430c3eb3d41859f6cd8d7c0a4a0 100644 (file)
--- a/package/tpm2-totp/Config.in
+++ b/package/tpm2-totp/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_TPM2_TOTP
        bool "tpm2-totp"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss
        depends on !BR2_STATIC_LIBS # tpm2-tss
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.20
        select BR2_PACKAGE_LIBQRENCODE
@@ -20,6 +19,5 @@ config BR2_PACKAGE_TPM2_TOTP
          https://github.com/tpm2-software/tpm2-totp
 
 comment "tpm2-totp needs a toolchain w/ dynamic library"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        depends on BR2_STATIC_LIBS
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM

diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in
index b1ab00dd38eea82e26415030ade0daf5325aeb55..2fc56dbd76662c857a736404edcd5fe0c9be6613 100644 (file)
--- a/package/tpm2-tss/Config.in
+++ b/package/tpm2-tss/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_TPM2_TSS
        bool "tpm2-tss"
        depends on !BR2_STATIC_LIBS # dlfcn.h
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        select BR2_PACKAGE_LIBURIPARSER
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
@@ -56,5 +55,4 @@ config BR2_PACKAGE_TPM2_TSS_FAPI
 endif
 
 comment "tpm2-tss needs a toolchain w/ dynamic library"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        depends on BR2_STATIC_LIBS

diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index 788409ed3ff6fc9744cefb667867ce397500d7ae..27ad22430adc7ef8413c5651d10832ace59ff580 100644 (file)
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -76,7 +76,6 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY
 config BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING
        bool "Enable mesh networking"
        depends on BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
        help
@@ -112,7 +111,6 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WPS
 
 config BR2_PACKAGE_WPA_SUPPLICANT_WPA3
        bool "Enable WPA3 support"
-       depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
        help