summaryrefslogtreecommitdiff
path: root/makefile.patch
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2019-05-21 11:10:04 +0200
committerUlf Magnusson <ulfalizer@gmail.com>2019-05-21 11:17:30 +0200
commit383c8b8a998d05dc0631228bf8c1c5c92f9c9738 (patch)
treefa300f2d4cde7220c61308b88deacc1c56861795 /makefile.patch
parent98dcbc03b0f5574ccd17aee9ea7d82636624e312 (diff)
Simplify iscriptconfig target in Makefile patch
Interpolate $(Kconfig) directly into the Python code and get rid of the separate argument. This also gets rid of the old ipython workaround, and might prevent similar gotchas in general.
Diffstat (limited to 'makefile.patch')
-rw-r--r--makefile.patch16
1 files changed, 7 insertions, 9 deletions
diff --git a/makefile.patch b/makefile.patch
index 92f1a11..fcd4d0b 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,17 +1,17 @@
-From fa2361b2d1aaa6030288aad94f9a49bc63620c29 Mon Sep 17 00:00:00 2001
+From 4605632b820e60d6b468bf061447113602087759 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
---
- scripts/kconfig/Makefile | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
+ scripts/kconfig/Makefile | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index 7c5dc31c1d95..5364001fb5f7 100644
+index 7c5dc31c1d95..c0e3b3f8c981 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
-@@ -27,2 +27,36 @@ gconfig: $(obj)/gconf
+@@ -27,2 +27,34 @@ gconfig: $(obj)/gconf
+PHONY += scriptconfig iscriptconfig kmenuconfig guiconfig dumpvarsconfig
+
@@ -32,10 +32,8 @@ index 7c5dc31c1d95..5364001fb5f7 100644
+iscriptconfig:
+ $(Q)$(kpython) -i -c \
+ "import kconfiglib; \
-+ import sys; \
-+ 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)
++ kconf = kconfiglib.Kconfig('$(Kconfig)'); \
++ print('A Kconfig instance \'kconf\' for the architecture $(ARCH) has been created.')"
+
+# The terminal menuconfig only runs under Python 3
+kmenuconfig: