From 959e9f7fdef4d8b602740312649016245209ce73 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Thu, 13 Oct 2022 16:56:46 +0900 Subject: [PATCH] configs/sipeed_*_sdcard: Add dependency on host-openssl Gitlab CI reported build failures for the sipeed RISC-V nommu boards with the u-boot/sdcard enabled default configuration. The compilation errors are related to the openssl/evp.h header file missing, e.g.: In file included from tools/imagetool.h:24, from tools/fit_common.c:20: include/image.h:1166:12: fatal error: openssl/evp.h: No such file or directory 1166 | # include | ^~~~~~~~~~~~~~~ Fix this issue by adding BR2_TARGET_UBOOT_NEEDS_OPENSSL=y to the config files so that host-openssl gets built as a dependency of U-Boot. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3134229992 https://gitlab.com/buildroot.org/buildroot/-/jobs/3134229994 https://gitlab.com/buildroot.org/buildroot/-/jobs/3134229996 https://gitlab.com/buildroot.org/buildroot/-/jobs/3134229998 Suggested-by: Thomas Petazzoni Signed-off-by: Damien Le Moal Signed-off-by: Peter Korsgaard --- configs/sipeed_maix_bit_sdcard_defconfig | 1 + configs/sipeed_maix_dock_sdcard_defconfig | 1 + configs/sipeed_maix_go_sdcard_defconfig | 1 + configs/sipeed_maixduino_sdcard_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 8a19996090..34769eeca8 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -50,6 +50,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm" BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index d3d0f405e1..62f6a0e0b8 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -50,6 +50,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm" BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index 75300997b8..6c61e3aaaf 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -50,6 +50,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm" BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index add9369747..da8cbe45f9 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -50,6 +50,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm" BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y