Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156e7cbb authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: do not overwrite .gitignore in output directory 

Commit 3a51ff34 ("kbuild: gitignore output directory") seemed to
bother people who version-control output directories.

Andre Przywara says:
"Unfortunately this breaks my setup, because I keep a totally separate
git repository in my build directories to track (various versions of)
.config. So .gitignore there is carefully crafted to ignore most build
artefacts, but not .config, for instance."

Link: https://lkml.org/lkml/2019/3/22/1819


Reported-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarAndre Przywara <andre.przywara@arm.com>
parent 221cc2d2

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -499,7 +499,8 @@ outputmakefile: 
ifneq ($(KBUILD_SRC),)

	$(Q)ln -fsn $(srctree) source

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)

	$(Q){ echo "# this is build directory, ignore it"; echo "*"; } > .gitignore

	$(Q)test -e .gitignore || \

	{ echo "# this is build directory, ignore it"; echo "*"; } > .gitignore

endif



ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)