@@ -1,5 +1,3 @@
-if BR2_PACKAGE_LIBOPENSSL
-
# 4xx PowerPC cores seem to have trouble with openssl's ASM
# optimizations
config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC
@@ -132,5 +130,3 @@ config BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE
config BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP
bool "enable compression"
default y
-
-endif # BR2_PACKAGE_LIBOPENSSL
@@ -1,9 +1,5 @@
-if BR2_PACKAGE_LIBRESSL
-
config BR2_PACKAGE_LIBRESSL_BIN
bool "openssl binary"
help
Install the openssl binary to the target file system. This is
a command line tool for doing various cryptographic stuff.
-
-endif
@@ -28,8 +28,6 @@ config BR2_PACKAGE_LIBOPENSSL
Note: Some helper scripts need perl.
-source "package/libopenssl/Config.in"
-
config BR2_PACKAGE_LIBRESSL
bool "libressl"
depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
@@ -44,12 +42,23 @@ config BR2_PACKAGE_LIBRESSL
http://www.libressl.org/
+config BR2_PACKAGE_OPENSSL_EXTERNAL
+ bool "from an external tree"
+ depends on "$(BR2_EXTERNAL)" != ""
+
+endchoice
+
+if BR2_PACKAGE_LIBOPENSSL
+source "package/libopenssl/Config.in"
+endif
+
+if BR2_PACKAGE_LIBRESSL
source "package/libressl/Config.in"
+endif
-# openssl from br2-external trees, if any
+if BR2_PACKAGE_OPENSSL_EXTERNAL
source "$(BASE_DIR)/.br2-external.in.openssl"
-
-endchoice
+endif
config BR2_PACKAGE_HAS_OPENSSL
bool
Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/libopenssl/Config.in:5:warning: choice value must have a prompt package/libopenssl/Config.in:7:warning: defaults for choice values not supported package/libopenssl/Config.in:15:warning: choice value must have a prompt package/libopenssl/Config.in:18:warning: defaults for choice values not supported package/libopenssl/Config.in:19:warning: defaults for choice values not supported package/libopenssl/Config.in:20:warning: defaults for choice values not supported package/libopenssl/Config.in:21:warning: defaults for choice values not supported package/libopenssl/Config.in:22:warning: defaults for choice values not supported package/libopenssl/Config.in:23:warning: defaults for choice values not supported package/libopenssl/Config.in:24:warning: defaults for choice values not supported package/libopenssl/Config.in:25:warning: defaults for choice values not supported package/libopenssl/Config.in:26:warning: defaults for choice values not supported package/libopenssl/Config.in:27:warning: defaults for choice values not supported package/libopenssl/Config.in:28:warning: defaults for choice values not supported package/libopenssl/Config.in:32:warning: defaults for choice values not supported package/libopenssl/Config.in:33:warning: defaults for choice values not supported package/libopenssl/Config.in:34:warning: defaults for choice values not supported package/libopenssl/Config.in:50:warning: defaults for choice values not supported package/libopenssl/Config.in:54:warning: defaults for choice values not supported package/libopenssl/Config.in:58:warning: defaults for choice values not supported package/libopenssl/Config.in:62:warning: defaults for choice values not supported package/libopenssl/Config.in:66:warning: defaults for choice values not supported package/libopenssl/Config.in:70:warning: defaults for choice values not supported package/libopenssl/Config.in:75:warning: defaults for choice values not supported package/libopenssl/Config.in:79:warning: defaults for choice values not supported package/libopenssl/Config.in:83:warning: defaults for choice values not supported package/libopenssl/Config.in:87:warning: defaults for choice values not supported package/libopenssl/Config.in:91:warning: defaults for choice values not supported package/libopenssl/Config.in:95:warning: defaults for choice values not supported package/libopenssl/Config.in:99:warning: defaults for choice values not supported package/libopenssl/Config.in:103:warning: defaults for choice values not supported package/libopenssl/Config.in:107:warning: defaults for choice values not supported package/libopenssl/Config.in:111:warning: defaults for choice values not supported package/libopenssl/Config.in:115:warning: defaults for choice values not supported package/libopenssl/Config.in:119:warning: defaults for choice values not supported package/libopenssl/Config.in:123:warning: defaults for choice values not supported package/libopenssl/Config.in:130:warning: defaults for choice values not supported package/libopenssl/Config.in:134:warning: defaults for choice values not supported package/openssl/Config.in:12:error: recursive dependency detected! package/openssl/Config.in:12: choice <choice> contains symbol BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC package/libopenssl/Config.in:5: symbol BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC is part of choice BR2_PACKAGE_LIBOPENSSL package/openssl/Config.in:17: symbol BR2_PACKAGE_LIBOPENSSL is part of choice <choice> For a resolution refer to Documentation/kbuild/kconfig-language.rst subsection "Kconfig recursive dependency limitations" Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- Changes v1 -> v2: - fix typo in subject line (statements vs. statemetns) - move 'if BR2_PACKAGE_LIBOPENSSL' from package/libopenssl/Config.in to package/openssl/Config.in (suggested by Yann E. MORIN) - move 'f BR2_PACKAGE_LIBRESSL' from ackage/libressl/Config.in to package/openssl/Config.in (suggested by Yann E. MORIN) - move .br2-external.in.openssl source statement outside of the choice (suggested by Yann E. MORIN) Notes: - with this solution for .br2-external.in.openssl exactly one alternative/ external openssl library can be provided (previously more than one additional entry could be provided inside the choice) --- package/libopenssl/Config.in | 4 ---- package/libressl/Config.in | 4 ---- package/openssl/Config.in | 19 ++++++++++++++----- 3 files changed, 14 insertions(+), 13 deletions(-)