From dd0e227216e247d2040cdd40bf7397702880cdc4 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Mon, 9 Oct 2017 23:05:00 +0200 Subject: Kconfiglib 2 backup WIP --- makefile.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefile.patch') diff --git a/makefile.patch b/makefile.patch index e8c4425..aefb021 100644 --- a/makefile.patch +++ b/makefile.patch @@ -38,7 +38,7 @@ index d9b1fef..e6311ed 100644 + "import kconfiglib; \ + import sys; \ + c = kconfiglib.Config(sys.argv[4 if \"$(PYTHONCMD)\".startswith(\"ipython\") else 1]); \ -+ print(\"A Config instance 'c' for the architecture ({0}) has been created.\".format(c.get_arch()))" \ ++ print(\"A Config instance 'c' for the architecture has been created.\")" \ + $(srctree)/$(Kconfig) + +# Used by testsuite.py to be able to compare output for nonsensical -- cgit v1.2.3 From abbc119b766345b3ee54406339086f3a84802358 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Thu, 2 Nov 2017 06:58:03 +0100 Subject: Update makefile patch Looks like I already accidentally committed a partial update though... Now prints ARCH again. --- makefile.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'makefile.patch') diff --git a/makefile.patch b/makefile.patch index aefb021..3b1f116 100644 --- a/makefile.patch +++ b/makefile.patch @@ -1,4 +1,4 @@ -From 6ced956acfe037b0c303780487be86ec71fa2942 Mon Sep 17 00:00:00 2001 +From 01899aa5e6d1f33e1965d7934bea2ff97a48bc89 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Tue, 9 Jun 2015 13:01:34 +0200 Subject: [PATCH] Kconfiglib scripts/kconfig/Makefile patch. @@ -8,10 +8,10 @@ Subject: [PATCH] Kconfiglib scripts/kconfig/Makefile patch. 1 file changed, 35 insertions(+) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile -index d9b1fef..e6311ed 100644 +index 8c12c20c55a6..88c618b34915 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile -@@ -62,1 +62,36 @@ else +@@ -27,1 +27,36 @@ gconfig: $(obj)/gconf +PHONY += scriptconfig iscriptconfig kconfiglibtestconfig + +ifneq ($(filter scriptconfig iscriptconfig,$(MAKECMDGOALS)),) @@ -37,8 +37,8 @@ index d9b1fef..e6311ed 100644 + $(Q)PYTHONPATH="$(srctree)/Kconfiglib:$$PYTHONPATH" "$(PYTHONCMD)" -i -c \ + "import kconfiglib; \ + import sys; \ -+ c = kconfiglib.Config(sys.argv[4 if \"$(PYTHONCMD)\".startswith(\"ipython\") else 1]); \ -+ print(\"A Config instance 'c' for the architecture has been created.\")" \ ++ 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) + +# Used by testsuite.py to be able to compare output for nonsensical @@ -49,5 +49,5 @@ index d9b1fef..e6311ed 100644 + menuconfig: $(obj)/mconf -- -2.1.4 +2.14.1 -- cgit v1.2.3 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(-) (limited to 'makefile.patch') 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 From 7b8ac38304a8f6e67df325390a6d53cb79e7524e Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Mon, 6 Nov 2017 04:01:52 +0100 Subject: Call it 'kconf' in iscriptconfig too Consistency --- makefile.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'makefile.patch') diff --git a/makefile.patch b/makefile.patch index 47f043c..5b71d10 100644 --- a/makefile.patch +++ b/makefile.patch @@ -37,8 +37,8 @@ index 8c12c20c55a6..88c618b34915 100644 + $(Q)PYTHONPATH="$(srctree)/Kconfiglib:$$PYTHONPATH" "$(PYTHONCMD)" -i -c \ + "import kconfiglib; \ + 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.\")" \ ++ kconf = kconfiglib.Kconfig(sys.argv[4 if \"$(PYTHONCMD)\".startswith(\"ipython\") else 1]); \ ++ print(\"A Kconfig instance 'kconf' for the architecture $(ARCH) has been created.\")" \ + $(Kconfig) + +# Used by testsuite.py to be able to compare output for nonsensical -- cgit v1.2.3