From 65639b40bd90d79afc1ffdcada926c99e6954102 Mon Sep 17 00:00:00 2001
From: Ulf Magnusson <ulfalizer@gmail.com>
Date: Tue, 11 Dec 2012 08:38:20 +0100
Subject: Make it possible to pass an argument via scriptconfig.

---
 makefile.patch | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'makefile.patch')

diff --git a/makefile.patch b/makefile.patch
index 2c8d56c..38f30ba 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,17 +1,17 @@
-From 79b531fed7fdf05069c04a3f78c3c97ab9d4d3a0 Mon Sep 17 00:00:00 2001
+From 7329f3d49ccc1bb698ab2d2556d85747ea2b168a Mon Sep 17 00:00:00 2001
 From: Ulf Magnusson <ulfalizer@gmail.com>
 Date: Fri, 7 Dec 2012 03:58:36 +0100
 Subject: [PATCH] Kconfiglib scripts/kconfig/Makefile patch.
 
 ---
- scripts/kconfig/Makefile |   28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
+ scripts/kconfig/Makefile |   35 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
 
 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index 3091794..d3bb0d6 100644
+index 3091794..0f29810 100644
 --- a/scripts/kconfig/Makefile
 +++ b/scripts/kconfig/Makefile
-@@ -11,6 +11,34 @@ else
+@@ -11,6 +11,41 @@ else
  Kconfig := Kconfig
  endif
  
@@ -21,13 +21,20 @@ index 3091794..d3bb0d6 100644
 +PYTHONCMD ?= python
 +endif
 +
++ifneq ($(filter scriptconfig,$(MAKECMDGOALS)),)
++ifndef SCRIPT
++$(error Use "make scriptconfig SCRIPT=<path to script> [SCRIPT_ARG=<argument>]")
++endif
++endif
++
 +scriptconfig:
-+	$(Q)if [ -z "$(SCRIPT)" ]; then                                                                       \
-+			echo 'No script argument provided; use "make scriptconfig SCRIPT=<path to script>".'; \
-+	else                                                                                                  \
-+			PYTHONPATH="$(srctree)/Kconfiglib:$$PYTHONPATH"                                       \
-+			  "$(PYTHONCMD)" "$(SCRIPT)" $(srctree)/$(Kconfig);                                   \
-+	fi
++ifdef SCRIPT_ARG
++	$(Q)PYTHONPATH="$(srctree)/Kconfiglib:$$PYTHONPATH" \
++	  "$(PYTHONCMD)" "$(SCRIPT)" "$(srctree)/$(Kconfig)" "$(SCRIPT_ARG)"
++else
++	$(Q)PYTHONPATH="$(srctree)/Kconfiglib:$$PYTHONPATH" \
++	  "$(PYTHONCMD)" "$(SCRIPT)" "$(srctree)/$(Kconfig)"
++endif
 +
 +iscriptconfig:
 +	$(Q)PYTHONPATH="$(srctree)/Kconfiglib:$$PYTHONPATH" "$(PYTHONCMD)" -i -c \
-- 
cgit v1.2.3