kbuild: fix building with O=.. options (18c32dac) · Commits · 戴 / test

The check introduced in commit: "kbuild: fix infinite make recursion" caused certain external modules not to build and also caused 'make targz-pkg' to fail. This is a minimal fix so we revert to previous behaviour - but we do not overwrite the Makefile in the top-level directory. Signed-off-by:

Sam Ravnborg <sam@ravnborg.org> Tested-by:

Jay Cliburn <jacliburn@bellsouth.net> Cc: Jay Cliburn <jacliburn@bellsouth.net>

Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -118,9 +118,6 @@ saved-output := $(KBUILD_OUTPUT)
		KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
		$(if $(KBUILD_OUTPUT),, \
		$(error output directory "$(saved-output)" does not exist))
		# Check that OUTPUT directory is not the same as where we have kernel src
		$(if $(filter-out $(KBUILD_OUTPUT),$(shell /bin/pwd)),, \
		$(error Output directory (O=...) specifies kernel src dir))

		PHONY += $(MAKECMDGOALS) sub-make

scripts/mkmakefile

+6 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,12 @@


		test ! -r $2/Makefile -o -O $2/Makefile \|\| exit 0
		# Only overwrite automatically generated Makefiles
		# (so we do not overwrite kernel Makefile)
		if ! grep -q Automatically $2/Makefile
		then
		exit 0
		fi
		echo " GEN $2/Makefile"

		cat << EOF > $2/Makefile

Admin message