diff --git a/pkg/u-boot/Dockerfile b/pkg/u-boot/Dockerfile index 15fed38b9e..4c4dc11ce0 100644 --- a/pkg/u-boot/Dockerfile +++ b/pkg/u-boot/Dockerfile @@ -1,5 +1,5 @@ FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f AS build-base -ENV BUILD_PKGS bash binutils-dev build-base bc bison flex openssl-dev python3 swig dtc util-linux-dev gnutls-dev +ENV BUILD_PKGS bash binutils-dev build-base bc bison flex openssl-dev python3 swig dtc ENV BUILD_PKGS_amd64 python3-dev py-pip RUN eve-alpine-deploy.sh @@ -22,6 +22,7 @@ RUN mkdir /boot FROM build-base AS build-amd64 ENV TARGET qemu-x86_64_defconfig +RUN for p in /tmp/patches/patches-"${VERSION}"/*.patch ; do patch -p1 < "$p" || exit 1 ; done # FIXME: we need to get to the bottom of this weird workaround on x86/Alpine RUN sed -ie 's#CONFIG_IS_ENABLED(X86_64)#1#' ./arch/x86/include/asm/byteorder.h diff --git a/pkg/u-boot/patches/patches-v2024.10-rc2/0004-Disable-mkeficapsule-tool.patch b/pkg/u-boot/patches/patches-v2024.10-rc2/0004-Disable-mkeficapsule-tool.patch new file mode 100644 index 0000000000..ece7a694ad --- /dev/null +++ b/pkg/u-boot/patches/patches-v2024.10-rc2/0004-Disable-mkeficapsule-tool.patch @@ -0,0 +1,45 @@ +From c968256eabe9547d20a4b1c811ce4e32f39e4d2d Mon Sep 17 00:00:00 2001 +From: Dimitrios Poulios +Date: Mon, 4 Nov 2024 19:13:08 +0200 +Subject: [PATCH] Disable mkeficapsule tool + +Disable mkeficapsule tool to overcome riscv64 build error in +alpine 3.16 + +Signed-off-by: Dimitrios Poulios +--- + configs/qemu-riscv64_smode_defconfig | 1 + + configs/qemu-x86_64_defconfig | 1 + + configs/rpi_4_defconfig | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig +index 6baad1de..bd58f4cc 100644 +--- a/configs/qemu-riscv64_smode_defconfig ++++ b/configs/qemu-riscv64_smode_defconfig +@@ -23,3 +23,4 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_DM_MTD=y + CONFIG_FLASH_SHOW_PROGRESS=0 + CONFIG_SYS_MAX_FLASH_BANKS=2 ++# CONFIG_TOOLS_MKEFICAPSULE is not set +diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig +index 008eb46a..bd7664f4 100644 +--- a/configs/qemu-x86_64_defconfig ++++ b/configs/qemu-x86_64_defconfig +@@ -89,3 +89,4 @@ CONFIG_SPL_VIDEO=y + # CONFIG_SPL_USE_TINY_PRINTF is not set + CONFIG_GENERATE_ACPI_TABLE=y + # CONFIG_GZIP is not set ++# CONFIG_TOOLS_MKEFICAPSULE is not set +diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig +index db5bbe86..fe44933d 100644 +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -71,3 +71,4 @@ CONFIG_VIDEO_BCM2835=y + CONFIG_CONSOLE_SCROLL_LINES=10 + CONFIG_PHYS_TO_BUS=y + CONFIG_TPM=y ++# CONFIG_TOOLS_MKEFICAPSULE is not set +-- +2.45.2 +