Synchronise with v4.4

[kconfig-frontends] / utils / tweak.in.patch

diff --git a/utils/tweak.in.patch b/utils/tweak.in.patch
index fe8ca6836e3ca0523435a3d7c544ee5a29bec689..c4b85579021b5e02ccfc1d837607189f290c6c67 100644 (file)
--- a/utils/tweak.in.patch
+++ b/utils/tweak.in.patch
@@ -1,90 +1,23 @@
---- a/utils/tweak.in   2012-06-03 22:13:16.901125538 +0200
-+++ b/utils/tweak.in   2012-06-03 22:12:59.024523108 +0200
-@@ -1,6 +1,8 @@
- #!/bin/bash
- # Manipulate options in a .config file from the command line
+diff --git a/utils/tweak.in b/utils/tweak.in
+--- a/utils/tweak.in
++++ b/utils/tweak.in
+@@ -3,8 +3,8 @@
  
-+CONFIG_="@CONFIG_@"
-+
- usage() {
-       cat >&2 <<EOL
- Manipulate options in a .config file from the command line.
-@@ -40,11 +43,10 @@
-               usage
-       fi
-       case "$ARG" in
--      CONFIG_*)
--              ARG="${ARG/CONFIG_/}"
-+      ${CONFIG_}*)
-+              ARG="${ARG/${CONFIG_}/}"
-               ;;
-       esac
--      ARG="`echo $ARG | tr a-z A-Z`"
- }
- 
- set_var() {
-@@ -95,37 +97,37 @@
-       esac
-       case "$CMD" in
-       --enable|-e)
--              set_var "CONFIG_$ARG" "CONFIG_$ARG=y"
-+              set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=y"
-               ;;
- 
-       --disable|-d)
--              set_var "CONFIG_$ARG" "# CONFIG_$ARG is not set"
-+              set_var "${CONFIG_}$ARG" "# ${CONFIG_}$ARG is not set"
-               ;;
- 
-       --module|-m)
--              set_var "CONFIG_$ARG" "CONFIG_$ARG=m"
-+              set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=m"
-               ;;
- 
-       --set-str)
-               # sed swallows one level of escaping, so we need double-escaping
--              set_var "CONFIG_$ARG" "CONFIG_$ARG=\"${1//\"/\\\\\"}\""
-+              set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=\"${1//\"/\\\\\"}\""
-               shift
-               ;;
+ myname=${0##*/}
  
-       --set-val)
--              set_var "CONFIG_$ARG" "CONFIG_$ARG=$1"
-+              set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=$1"
-               shift
-               ;;
+-# If no prefix forced, use the default CONFIG_
+-CONFIG_="${CONFIG_-CONFIG_}"
++# If no prefix forced, use the default @CONFIG_@
++CONFIG_="${CONFIG_-@CONFIG_@}"
  
-       --state|-s)
--              if grep -q "# CONFIG_$ARG is not set" $FN ; then
-+              if grep -q "# ${CONFIG_}$ARG is not set" $FN ; then
-                       echo n
-               else
--                      V="$(grep "^CONFIG_$ARG=" $FN)"
-+                      V="$(grep "^${CONFIG_}$ARG=" $FN)"
-                       if [ $? != 0 ] ; then
-                               echo undef
-                       else
--                              V="${V/#CONFIG_$ARG=/}"
-+                              V="${V/#${CONFIG_}$ARG=/}"
-                               V="${V/#\"/}"
-                               V="${V/%\"/}"
-                               V="${V/\\\"/\"}"
-@@ -135,15 +137,15 @@
-               ;;
- 
-       --enable-after|-E)
--              set_var "CONFIG_$B" "CONFIG_$B=y" "CONFIG_$A"
-+              set_var "${CONFIG_}$B" "${CONFIG_}$B=y" "${CONFIG_}$A"
-               ;;
- 
-       --disable-after|-D)
--              set_var "CONFIG_$B" "# CONFIG_$B is not set" "CONFIG_$A"
-+              set_var "${CONFIG_}$B" "# ${CONFIG_}$B is not set" "${CONFIG_}$A"
-               ;;
- 
-       --module-after|-M)
--              set_var "CONFIG_$B" "CONFIG_$B=m" "CONFIG_$A"
-+              set_var "${CONFIG_}$B" "${CONFIG_}$B=m" "${CONFIG_}$A"
-               ;;
- 
-       # undocumented because it ignores --file (fixme)
+ usage() {
+       cat >&2 <<EOL
+@@ -41,7 +41,7 @@
+ By default, $myname will upper-case the given symbol. Use --keep-case to keep
+ the case of all following symbols unchanged.
+ 
+-$myname uses 'CONFIG_' as the default symbol prefix. Set the environment
++$myname uses '@CONFIG_@' as the default symbol prefix. Set the environment
+ variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" $myname ...
+ EOL
+       exit 1