From 8aa106dfbd9f7dcce99f23c21b0c479eff874f2b Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Thu, 2 Nov 2017 07:54:32 +0100 Subject: Specify $(Kconfig) without $(srctree) Kconfiglib already respects $srctree internally. --- makefile.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makefile.patch b/makefile.patch index 3b1f116..47f043c 100644 --- a/makefile.patch +++ b/makefile.patch @@ -27,10 +27,10 @@ index 8c12c20c55a6..88c618b34915 100644 +scriptconfig: +ifdef SCRIPT_ARG + $(Q)PYTHONPATH="$(srctree)/Kconfiglib:$$PYTHONPATH" \ -+ "$(PYTHONCMD)" "$(SCRIPT)" "$(srctree)/$(Kconfig)" "$(SCRIPT_ARG)" ++ "$(PYTHONCMD)" "$(SCRIPT)" $(Kconfig) "$(SCRIPT_ARG)" +else + $(Q)PYTHONPATH="$(srctree)/Kconfiglib:$$PYTHONPATH" \ -+ "$(PYTHONCMD)" "$(SCRIPT)" "$(srctree)/$(Kconfig)" ++ "$(PYTHONCMD)" "$(SCRIPT)" $(Kconfig) +endif + +iscriptconfig: @@ -39,13 +39,13 @@ index 8c12c20c55a6..88c618b34915 100644 + import sys; \ + c = kconfiglib.Kconfig(sys.argv[4 if \"$(PYTHONCMD)\".startswith(\"ipython\") else 1]); \ + print(\"A Kconfig instance 'c' for the architecture $(ARCH) has been created.\")" \ -+ $(srctree)/$(Kconfig) ++ $(Kconfig) + +# Used by testsuite.py to be able to compare output for nonsensical +# arch/defconfig combinations, which has proven effective for finding obscure +# bugs +kconfiglibtestconfig: $(obj)/conf -+ $(Q)$< --defconfig=.config $(srctree)/$(Kconfig) ++ $(Q)$< --defconfig=.config $(Kconfig) + menuconfig: $(obj)/mconf -- -- cgit v1.2.3