From 6465c79166fed0c9a9b99a15d34c555a3141344f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 11 Nov 2022 22:57:58 +0100 Subject: [PATCH] arch/arch.mk.xtensa: relax check on overlay file to apply only to internal toolchains Commit 4cbf7336914f25478aea943456ba7dc3c892c21a ("arch/xtensa: custom configuration requires an overlay") added a check in arch/arch.mk.xtensa to bail out if a custom Xtensa core is selected but not overlay file is provided. While this is indeed a perfectly valid check to make when building an internal toolchain, with an external toolchain it's entirely possible to build with no overlay file: the toolchain already exists, and there's no overlay to be applied in the context of the Buildroot build. And indeed commit 4cbf7336914f25478aea943456ba7dc3c892c21a broke some of the runtime test cases that use a custom Xtensa core configuration, with no overlay, to test the toolchains.bootlin.com Xtensa external toolchain. By relaxing the check to only apply to internal toolchain configurations, we fix those test cases. It is to be noted that this still allows a configuration where gdb gets built for a custom core, but with no overlay, so basically that means the fsf variant, which can lead to build or run failures that 4cbf7336914f attempted to fix to begin with. This still covers the most common cases. Finally, it also means being able to build a kernel with no overlay, but this is offset by the fact that the kernel may be already patched with an overlay (as it is possible to specify a custom kernel), which is most probably what people using a custom core would have. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261966 https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261963 Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: extend commit log with last two paragraphs] Signed-off-by: Yann E. MORIN --- arch/arch.mk.xtensa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa index 7b6c59cecd..75145e725f 100644 --- a/arch/arch.mk.xtensa +++ b/arch/arch.mk.xtensa @@ -1,6 +1,6 @@ BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) -ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM):$(BR_ARCH_XTENSA_OVERLAY_FILE),yy:) +ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM)$(BR2_TOOLCHAIN_BUILDROOT):$(BR_ARCH_XTENSA_OVERLAY_FILE),yyy:) $(error No xtensa overlay file provided. Check your BR2_XTENSA_OVERLAY_FILE setting) endif