kbuild: disable header exports for UML in a straightforward way

[PATCH] kbuild: disable header exports for UML in a straightforward way

Posted by Masahiro Yamada 3 years, 7 months ago

Previously 'make ARCH=um headers' stopped because of missing
arch/um/include/uapi/asm/Kbuild.

The error is not shown since commit ed102bf2afed ("um: Fix W=1
missing-include-dirs warnings") because UML got
arch/um/include/uapi/asm/Kbuild.

Hard-code the unsupported architecture, so it works like before.

Fixes: ed102bf2afed ("um: Fix W=1 missing-include-dirs warnings")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9d40255d1557..8d2047a4de9b 100644
--- a/Makefile
+++ b/Makefile
@@ -1304,8 +1304,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
 
 PHONY += headers
 headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts
-	$(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/Kbuild),, \
-	  $(error Headers not exportable for the $(SRCARCH) architecture))
+	$(if $(filter um, $(SRCARCH)), $(error Headers not exportable for UML))
 	$(Q)$(MAKE) $(hdr-inst)=include/uapi
 	$(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi
 
-- 
2.34.1

Re: [PATCH] kbuild: disable header exports for UML in a straightforward way

Posted by Richard Weinberger 3 years, 7 months ago

----- Ursprüngliche Mail -----
> Von: "masahiroy" <masahiroy@kernel.org>
> An: "linux-kbuild" <linux-kbuild@vger.kernel.org>
> CC: "masahiroy" <masahiroy@kernel.org>, "Michal Marek" <michal.lkml@markovi.net>, "Nick Desaulniers"
> <ndesaulniers@google.com>, "Randy Dunlap" <rdunlap@infradead.org>, "richard" <richard@nod.at>, "linux-kernel"
> <linux-kernel@vger.kernel.org>
> Gesendet: Donnerstag, 1. September 2022 03:12:52
> Betreff: [PATCH] kbuild: disable header exports for UML in a straightforward way

> Previously 'make ARCH=um headers' stopped because of missing
> arch/um/include/uapi/asm/Kbuild.
> 
> The error is not shown since commit ed102bf2afed ("um: Fix W=1
> missing-include-dirs warnings") because UML got
> arch/um/include/uapi/asm/Kbuild.
> 
> Hard-code the unsupported architecture, so it works like before.
> 
> Fixes: ed102bf2afed ("um: Fix W=1 missing-include-dirs warnings")
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Acked-by: Richard Weinberger <richard@nod.at>

Thanks,
//richard