Skip to content

Commit d577865

Browse files
committed
Remove Python 3 menuconfig special-casing from Makefile patch
Since it's now compatible with Python 2, it can use PYTHONCMD like the other targets.
1 parent c209188 commit d577865

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

makefile.patch

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
From 4605632b820e60d6b468bf061447113602087759 Mon Sep 17 00:00:00 2001
1+
From 93daf46f309b0c8f86149ef58c4906387d054c22 Mon Sep 17 00:00:00 2001
22
From: Ulf Magnusson <ulfalizer@gmail.com>
33
Date: Tue, 9 Jun 2015 13:01:34 +0200
44
Subject: [PATCH] Kconfiglib scripts/kconfig/Makefile patch
55

66
---
7-
scripts/kconfig/Makefile | 32 ++++++++++++++++++++++++++++++++
8-
1 file changed, 32 insertions(+)
7+
scripts/kconfig/Makefile | 29 +++++++++++++++++++++++++++++
8+
1 file changed, 29 insertions(+)
99

1010
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
11-
index 7c5dc31c1d95..c0e3b3f8c981 100644
11+
index 3f327e21f60e..8b7dd1292005 100644
1212
--- a/scripts/kconfig/Makefile
1313
+++ b/scripts/kconfig/Makefile
14-
@@ -27,2 +27,34 @@ gconfig: $(obj)/gconf
14+
@@ -27,2 +27,31 @@ gconfig: $(obj)/gconf
1515

1616
+PHONY += scriptconfig iscriptconfig kmenuconfig guiconfig dumpvarsconfig
1717
+
18-
+PYTHONCMD ?= python
19-
+kpythonpath := PYTHONPATH=$(srctree)/Kconfiglib:$$PYTHONPATH
20-
+kpython := $(kpythonpath) $(PYTHONCMD)
21-
+kpython3 := $(kpythonpath) python3
18+
+PYTHONCMD ?= python
19+
+kpython := PYTHONPATH=$(srctree)/Kconfiglib:$$PYTHONPATH $(PYTHONCMD)
2220
+
2321
+ifneq ($(filter scriptconfig,$(MAKECMDGOALS)),)
2422
+ifndef SCRIPT
@@ -35,9 +33,8 @@ index 7c5dc31c1d95..c0e3b3f8c981 100644
3533
+ kconf = kconfiglib.Kconfig('$(Kconfig)'); \
3634
+ print('A Kconfig instance \'kconf\' for the architecture $(ARCH) has been created.')"
3735
+
38-
+# The terminal menuconfig only runs under Python 3
3936
+kmenuconfig:
40-
+ $(Q)$(kpython3) $(srctree)/Kconfiglib/menuconfig.py $(Kconfig)
37+
+ $(Q)$(kpython) $(srctree)/Kconfiglib/menuconfig.py $(Kconfig)
4138
+
4239
+guiconfig:
4340
+ $(Q)$(kpython) $(srctree)/Kconfiglib/guiconfig.py $(Kconfig)

0 commit comments

Comments
 (0)