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 c72be5dd2f
.
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>
This commit is contained in:
parent
359c5c266a
commit
8ecb041c87
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user