diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2015-06-09 13:32:38 +0200 |
|---|---|---|
| committer | Ulf Magnusson <ulfalizer@gmail.com> | 2015-06-09 13:52:53 +0200 |
| commit | 7eace27993ad3aa1d6911866d9c60a11f32d36d9 (patch) | |
| tree | 60fe084bac482a80d1dd561dacdaaedee6b1c930 /makefile.patch | |
| parent | ef8fe2d55b438d2f6d25335d63e59a647214b69c (diff) | |
Support using Python 3 with iscriptconfig.
Can't use print as an expression.
Also switch to using a single context line (which should hopefully be
stable). This might make the patch more robust, and also makes it clear
approx. where it should go.
Also fix 'iscriptconfig' spelling in the readme.
Diffstat (limited to 'makefile.patch')
| -rw-r--r-- | makefile.patch | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/makefile.patch b/makefile.patch index 16a3baf..e8c4425 100644 --- a/makefile.patch +++ b/makefile.patch @@ -1,20 +1,17 @@ -From 61cfb087f144aeb17f4c663a998acbda03053943 Mon Sep 17 00:00:00 2001 +From 6ced956acfe037b0c303780487be86ec71fa2942 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson <ulfalizer@gmail.com> -Date: Fri, 13 Mar 2015 01:22:48 +0100 +Date: Tue, 9 Jun 2015 13:01:34 +0200 Subject: [PATCH] Kconfiglib scripts/kconfig/Makefile patch. --- - scripts/kconfig/Makefile | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) + scripts/kconfig/Makefile | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile -index 9645c07..be21e03 100644 +index d9b1fef..e6311ed 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile -@@ -11,6 +11,42 @@ else - Kconfig := Kconfig - endif - +@@ -62,1 +62,36 @@ else +PHONY += scriptconfig iscriptconfig kconfiglibtestconfig + +ifneq ($(filter scriptconfig iscriptconfig,$(MAKECMDGOALS)),) @@ -41,7 +38,7 @@ index 9645c07..be21e03 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 ({0}) has been created.\".format(c.get_arch()))" \ + $(srctree)/$(Kconfig) + +# Used by testsuite.py to be able to compare output for nonsensical @@ -50,10 +47,7 @@ index 9645c07..be21e03 100644 +kconfiglibtestconfig: $(obj)/conf + $(Q)$< --defconfig=.config $(srctree)/$(Kconfig) + -+ - # We need this, in case the user has it in its environment - unexport CONFIG_ - + menuconfig: $(obj)/mconf -- -2.1.0 +2.1.4 |