From 3a9c474548b05e72406b423e1bba0040aa79704b Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 17 Jan 2023 15:07:58 -0800 Subject: u-boot-tools-xlnx: Avoid YP do_compile workaround do_compile workaround in YP can result in: | error: object directory ../git2/github.com.Xilinx.u-boot-xlnx.git/objects does not exist; check .git/objects/info/alternates. | fatal: unable to read 9e43f9c6c6c446128d036038e53c2d107d04edc8 Signed-off-by: Mark Hatle --- .../recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'meta-xilinx-core') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb index 95f73164..fe5ecf79 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb @@ -4,3 +4,18 @@ require u-boot-xlnx-2023.1.inc # MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct # bmp_logo.h SED_CONFIG_EFI:append = ' -e "s/CONFIG_VIDEO=.*/# CONFIG_VIDEO is not set/"' + +# Default do_compile fails with: +# | error: object directory ../downloads/git2/github.com.Xilinx.u-boot-xlnx.git/objects does not exist; check .git/objects/info/alternates. +# The regular workaround of calling 'git diff' seems to be problematic. +do_compile () { + oe_runmake -C ${S} tools-only_defconfig O=${B} + + # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and + # generating it requires bin2header tool, which for target build + # is built with target tools and thus cannot be executed on host. + sed -i -e "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" ${SED_CONFIG_EFI} ${B}/.config + + oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B} +} + -- cgit v1.2.3-54-g00ecf