diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2017-11-09 11:43:13 +0100 |
|---|---|---|
| committer | Ulf Magnusson <ulfalizer@gmail.com> | 2017-11-09 11:43:13 +0100 |
| commit | 395c2db0e9761def8eb992e3e8068ba2d3ab179c (patch) | |
| tree | 7b14ac791dbf9d4b9354f1c6149444e090068309 /makefile.patch | |
| parent | 8c978ee0b9c0f7f8406f58d24478a73330512056 (diff) | |
| parent | 4bffd653148d6fa1c8e626872ae4f445e2b0a24c (diff) | |
Make Kconfiglib 2 official
Merge in the 'kconfiglib-2-backup' branch.
Diffstat (limited to 'makefile.patch')
| -rw-r--r-- | makefile.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/makefile.patch b/makefile.patch index e8c4425..5b71d10 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 <ulfalizer@gmail.com> 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)),) @@ -27,27 +27,27 @@ index d9b1fef..e6311ed 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: + $(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 ({0}) has been created.\".format(c.get_arch()))" \ -+ $(srctree)/$(Kconfig) ++ 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 +# 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 -- -2.1.4 +2.14.1 |