Browse Source

core: allow br2-external trees to provide opensl

Similar to toolchains and jpeg, we now offer a way for br2-external
trees to provide their openssl implementation, which gets included in
the openssl choice.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Vadim Kochan <vadim4j@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yann E. MORIN 6 years ago
parent
commit
cfb929fbfa
2 changed files with 12 additions and 0 deletions
  1. 3 0
      package/openssl/Config.in
  2. 9 0
      support/scripts/br2-external

+ 3 - 0
package/openssl/Config.in

@@ -68,6 +68,9 @@ config BR2_PACKAGE_LIBRESSL_BIN
 
 
 endif
 endif
 
 
+# openssl from br2-external trees, if any
+source "$BR2_BASE_DIR/.br2-external.in.openssl"
+
 endchoice
 endchoice
 
 
 config BR2_PACKAGE_HAS_OPENSSL
 config BR2_PACKAGE_HAS_OPENSSL

+ 9 - 0
support/scripts/br2-external

@@ -159,6 +159,7 @@ do_kconfig() {
         menus
         menus
         toolchains
         toolchains
         jpeg
         jpeg
+        openssl
     )
     )
 
 
     for br2 in "${items[@]}"; do
     for br2 in "${items[@]}"; do
@@ -214,6 +215,14 @@ do_kconfig() {
         else
         else
             printf '# No jpeg from: %s\n\n' "${br2_desc}"
             printf '# No jpeg from: %s\n\n' "${br2_desc}"
         fi >>"${outputdir}/.br2-external.in.jpeg"
         fi >>"${outputdir}/.br2-external.in.jpeg"
+
+        if [ -f "${br2_ext}/provides/openssl.in" ]; then
+            printf 'comment "openssl from: %s"\n' "${br2_desc}"
+            printf 'source "%s/provides/openssl.in"\n' "${br2_ext}"
+            printf '\n'
+        else
+            printf '# No openssl from: %s\n\n' "${br2_desc}"
+        fi >>"${outputdir}/.br2-external.in.openssl"
     done
     done
 
 
     printf 'endmenu\n' >>"${outputdir}/.br2-external.in.menus"
     printf 'endmenu\n' >>"${outputdir}/.br2-external.in.menus"