In the following use case, when compiling the kernel for the UML architecture, for example: * `make ARCH=um defconfig && make ARCH=um -j8`, SUBARCH files are generated, however when we run the command: * `mrproper ARCH=um` the files `arch/$(SUBARCH)/include/generated/ aren't cleaned up. This generates compilation errors by running the following command: * `make ARCH=um defconfig O=./build_um && make ARCH=um -j8 O=./build_um` This PATCH fix that problem. This makes it possible to compile on different architectures that use the SUBARCH variable, in different build directories and root directory of the linux directory. This is important because we can compile without the object files being overwritten. This reduces the re-compilation time in this use case. Besides that, in the workflow of developing unit tests, using kunit, and compiling in different architectures to develop or test a PATCH, this use case applies. * This bug was introduced in this commit a788b2ed81abe * Related bug: https://bugzilla.kernel.org/show_bug.cgi?id=205219 Signed-off-by: Vitor Massaru Iha <vitor@xxxxxxxxxxx> Reviewed-by: Brendan Higgins <brendanhiggins@xxxxxxxxxx> Tested-by: Brendan Higgins <brendanhiggins@xxxxxxxxxx> --- v2: * Explains what this PATCH does and the importance as suggested by Brendan Higgins. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 70def4907036..e1a79796032e 100644 --- a/Makefile +++ b/Makefile @@ -532,7 +532,8 @@ outputmakefile: ifdef building_out_of_srctree $(Q)if [ -f $(srctree)/.config -o \ -d $(srctree)/include/config -o \ - -d $(srctree)/arch/$(SRCARCH)/include/generated ]; then \ + -d $(srctree)/arch/$(SRCARCH)/include/generated -o \ + -d $(srctree)/arch/$(SUBARCH)/include/generated ]; then \ echo >&2 "***"; \ echo >&2 "*** The source tree is not clean, please run 'make$(if $(findstring command line, $(origin ARCH)), ARCH=$(ARCH)) mrproper'"; \ echo >&2 "*** in $(abs_srctree)";\ @@ -1388,6 +1389,7 @@ CLEAN_FILES += modules.builtin modules.builtin.modinfo modules.nsdeps # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include/generated \ arch/$(SRCARCH)/include/generated .tmp_objdiff \ + arch/$(SUBARCH)/include/generated \ debian/ snap/ tar-install/ MRPROPER_FILES += .config .config.old .version \ Module.symvers \ -- 2.25.1
