[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-449-g35683c19d
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2018-07-11 15:32:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 35683c19d44ec88312fdf6a1bebb8b67c8ae6a90 (commit)
from eeb613865798cdffb89e9aced493f35286731e75 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 35683c19d44ec88312fdf6a1bebb8b67c8ae6a90
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jul 11 17:42:41 2018 +0200
[BUILDROOT] 2017.02: linux: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL
To fix fatal error: openssl/bio.h no such file build error.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 1 +
buildroot/configs/opos6ulnano_defconfig | 1 +
...x-add-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL.patch | 60 ++++++++++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 1 +
4 files changed, 63 insertions(+)
create mode 100644 patches/buildroot/2017.02/234-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL.patch
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 3599f9e73..c8a461236 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -29,6 +29,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev imx6ul-opos6uldev-dual-ethernet imx6ull-opos6uldev-dual-ethernet"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_IMXREGS=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index da6c9e3f0..87ce6251b 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -29,6 +29,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6ulnanodev imx6ull-opos6ulnanodev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_IMXREGS=y
diff --git a/patches/buildroot/2017.02/234-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL.patch b/patches/buildroot/2017.02/234-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL.patch
new file mode 100644
index 000000000..f62027f8b
--- /dev/null
+++ b/patches/buildroot/2017.02/234-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL.patch
@@ -0,0 +1,60 @@
+From 93a7edf4bc9bfcf821f608815870d06198eb2adf Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <tho...@bo...>
+Date: Sun, 4 Mar 2018 22:31:15 +0100
+Subject: [PATCH] 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 <tho...@bo...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ linux/Config.in | 13 +++++++++++++
+ linux/linux.mk | 4 ++++
+ 2 files changed, 17 insertions(+)
+
+Index: buildroot/linux/Config.in
+===================================================================
+--- buildroot.orig/linux/Config.in
++++ buildroot/linux/Config.in
+@@ -395,6 +395,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"
+
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -78,6 +78,10 @@ LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL
+ 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
++
+ ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
+ LINUX_DEPENDENCIES += host-uboot-tools
+ endif
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index afa886e8e..e9f9061e5 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -14,6 +14,7 @@ rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
+rm -rf buildroot/linux/Config.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
rm -rf buildroot/linux/linux.mk
rm -rf buildroot/package/Config.in
hooks/post-receive
--
armadeus
|