64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
From 93a7edf4bc9bfcf821f608815870d06198eb2adf Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Date: Sun, 4 Mar 2018 22:31:15 +0100
|
|
Subject: [PATCH 1/1] 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>
|
|
---
|
|
linux/Config.in | 13 +++++++++++++
|
|
linux/linux.mk | 4 ++++
|
|
2 files changed, 17 insertions(+)
|
|
|
|
diff --git a/linux/Config.in b/linux/Config.in
|
|
index bc6cd1b..57bb11c 100644
|
|
--- a/linux/Config.in
|
|
+++ b/linux/Config.in
|
|
@@ -407,6 +407,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 3b69524..91d8751 100644
|
|
--- 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)
|
|
--
|
|
2.7.4
|
|
|