2022-09-01 02:02:53

by Masahiro Yamada

Subject: [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 <[email protected]>
---

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

2022-09-01 06:50:42

by Richard Weinberger

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

----- Ursprüngliche Mail -----
> Von: "masahiroy" <[email protected]>
> An: "linux-kbuild" <[email protected]>
> CC: "masahiroy" <[email protected]>, "Michal Marek" <[email protected]>, "Nick Desaulniers"
> <[email protected]>, "Randy Dunlap" <[email protected]>, "richard" <[email protected]>, "linux-kernel"
> <[email protected]>
> 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 <[email protected]>

Acked-by: Richard Weinberger <[email protected]>

Thanks,
//richard