linux: add BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL

Some Linux kernel configuration options (such as
CONFIG_SYSTEM_TRUSTED_KEYRING) require building a host program called
extract-cert, which itself needs OpenSSL.

Users having OpenSSL installed on their system won't see a problem,
but users who don't have OpenSSL installed will get a build
failure. This commit adds a new option that allows users to indicate
that their Linux configuration requires building host-openssl.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 93a7edf4bc9bfcf821f608815870d06198eb2adf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/linux/Config.in b/linux/Config.in
index 7aed6f8075e139b498c40ef7d8361ae9f38c4425..e91bdb99c7294959737082baf725beaccdf600da 100644 (file)
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -391,6 +391,19 @@ config BR2_LINUX_KERNEL_INSTALL_TARGET
          /boot if DTBs have been generated by the kernel build
          process.
 
+config BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL
+       bool "Needs host OpenSSL"
+       help
+         Some Linux kernel configuration options (such as
+         CONFIG_SYSTEM_TRUSTED_KEYRING) require building a host
+         program called extract-cert, which itself needs
+         OpenSSL. Enabling this option will ensure host-openssl gets
+         built before the Linux kernel.
+
+         Enable this option if you get a Linux kernel build failure
+         such as "scripts/extract-cert.c:21:25: fatal error:
+         openssl/bio.h: No such file or directory".
+
 # Linux extensions
 source "linux/Config.ext.in"
 

diff --git a/linux/linux.mk b/linux/linux.mk
index 2be2403570b5c8ab9282cfb8237b99800df1f4dc..359f21c75c463bebdb02fd882c05eaa7650dd7f6 100644 (file)
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -80,6 +80,10 @@ LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZMA) += CONFIG_KERNEL_LZMA
 LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZO) += CONFIG_KERNEL_LZO
 LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_XZ) += CONFIG_KERNEL_XZ
 
+ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL),y)
+LINUX_DEPENDENCIES += host-openssl
+endif
+
 # If host-uboot-tools is selected by the user, assume it is needed to
 # create a custom image
 ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y)