kbuild: handle non-existing options in scripts/config
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/3 kbuild: handle non-existing options in scripts/config
If an option does not exist in .config, set it at the end of the file.
--- scripts/config | 51 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 18 deletions(-)
scripts/config +33 -18
@@ -26,8 +26,6 @@ options: config doesn't check the validity of the .config file. This is done at next make time. -The options need to be already in the file before they can be changed, -but sometimes you can cheat with the --*-after options. EOL exit 1 }
@@ -45,8 +43,33 @@ checkarg() { ARG="`echo $ARG | tr a-z A-Z`" } -replace() { - sed -i -e "$@" $FN +# set_var name value [before-var] +set_var() { + awk -vvar="$1" -vnew="$2" -vbefore="$3" ' + function is_var(l, v) + { + return (l == "# " v " is not set" || l ~ "^" v "="); + } + { + if (is_var($0, var)) { + if (new) + print new; + new = ""; + } else if (before && is_var($0, before)) { + print; + if (new) + print new; + new = ""; + } else { + print; + } + } + END { + if (new) + print new; + } + ' "$FN" >"$FN.tmp" + mv -f "$FN.tmp" "$FN" } if [ "$1" = "--file" ]; then
@@ -70,20 +93,19 @@ while [ "$1" != "" ] ; do case "$CMD" in --enable|-e) checkarg "$1" - replace "s/# CONFIG_$ARG is not set/CONFIG_$ARG=y/" + set_var "CONFIG_$ARG" "CONFIG_$ARG=y" shift ;; --disable|-d) checkarg "$1" - replace "s/CONFIG_$ARG=[my]/# CONFIG_$ARG is not set/" + set_var "CONFIG_$ARG" "# CONFIG_$ARG is not set" shift ;; --module|-m) checkarg "$1" - replace "s/CONFIG_$ARG=y/CONFIG_$ARG=m/" \ - -e "s/# CONFIG_$ARG is not set/CONFIG_$ARG=m/" + set_var "CONFIG_$ARG" "CONFIG_$ARG=m" shift ;;
@@ -109,9 +131,7 @@ while [ "$1" != "" ] ; do A=$ARG checkarg "$2" B=$ARG - replace "/CONFIG_$A=[my]/aCONFIG_$B=y" \ - -e "/# CONFIG_$ARG is not set/a/CONFIG_$ARG=y" \ - -e "s/# CONFIG_$ARG is not set/CONFIG_$ARG=y/" + set_var "CONFIG_$B" "CONFIG_$B=y" "CONFIG_$A" shift shift ;;
@@ -121,9 +141,7 @@ while [ "$1" != "" ] ; do A=$ARG checkarg "$2" B=$ARG - replace "/CONFIG_$A=[my]/a# CONFIG_$B is not set" \ - -e "/# CONFIG_$ARG is not set/a/# CONFIG_$ARG is not set" \ - -e "s/CONFIG_$ARG=[my]/# CONFIG_$ARG is not set/" + set_var "CONFIG_$B" "# CONFIG_$B is not set" "CONFIG_$A" shift shift ;;
@@ -133,10 +151,7 @@ while [ "$1" != "" ] ; do A=$ARG checkarg "$2" B=$ARG - replace "/CONFIG_$A=[my]/aCONFIG_$B=m" \ - -e "/# CONFIG_$ARG is not set/a/CONFIG_$ARG=m" \ - -e "s/CONFIG_$ARG=y/CONFIG_$ARG=m/" \ - -e "s/# CONFIG_$ARG is not set/CONFIG_$ARG=m/" + set_var "CONFIG_$B" "CONFIG_$B=m" "CONFIG_$A" shift shift ;;
Signature · 1 line
1.6.3
scripts/config checkarg() { · line 48
Quoted 5 lines
scripts/config +3
-2-replace() { - sed -i -e "$@" $FN +# set_var name value [before-var] +set_var() { + awk -vvar="$1" -vnew="$2" -vbefore="$3" '
This seems rather complicated compared to what was there before.
I would just cmp the output file to the input file and if they are the same then add it at the end with a echo
Review
Quoted 2 lines
(quoted diff) +2
-0+ } + ' "$FN" >"$FN.tmp"
This should be a &&, otherwise you risk removing the output file on ctrl-c
-Andi
Signature · 1 line
[email protected] -- Speaking for myself only.
Andi Kleen napsal(a):
Quoted 7 lines
scripts/config checkarg() { · line 48
Quoted 5 lines
scripts/config +3
-2-replace() { - sed -i -e "$@" $FN +# set_var name value [before-var] +set_var() { + awk -vvar="$1" -vnew="$2" -vbefore="$3" 'This seems rather complicated compared to what was there before.
Calling the function is simpler otoh...
Quoted 2 lines
I would just cmp the output file to the input file and if they are the same then add it at the end with a echo
Just doing that would duplicate the variable if it was already set to the desired value, causing a "warning: override: reassigning to symbol" warning from kbuild.
Hmm, willll try to simplify it somehow.
Quoted 6 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ } + ' "$FN" >"$FN.tmp"This should be a &&, otherwise you risk removing the output file on ctrl-c
Ah, good point.
Michal
PATCH 2/3 kbuild: simplify argument loop in scripts/config
In reply to a message not in the archive--- scripts/config | 44 ++++++++++++++++---------------------------- 1 files changed, 16 insertions(+), 28 deletions(-)
scripts/config +16 -28
@@ -77,8 +77,7 @@ if [ "$1" = "--file" ]; then if [ "$FN" = "" ] ; then usage fi - shift - shift + shift 2 else FN=.config fi
@@ -91,26 +90,34 @@ while [ "$1" != "" ] ; do CMD="$1" shift case "$CMD" in - --enable|-e) + --refresh) + ;; + --*-after) + checkarg "$1" + A=$ARG + checkarg "$2" + B=$ARG + shift 2 + ;; + --*) checkarg "$1" - set_var "CONFIG_$ARG" "CONFIG_$ARG=y" shift ;; + esac + case "$CMD" in + --enable|-e) + set_var "CONFIG_$ARG" "CONFIG_$ARG=y" + ;; --disable|-d) - checkarg "$1" set_var "CONFIG_$ARG" "# CONFIG_$ARG is not set" - shift ;; --module|-m) - checkarg "$1" set_var "CONFIG_$ARG" "CONFIG_$ARG=m" - shift ;; --state|-s) - checkarg "$1" if grep -q "# CONFIG_$ARG is not set" $FN ; then echo n else
@@ -123,37 +130,18 @@ while [ "$1" != "" ] ; do echo "$V" fi fi - shift ;; --enable-after|-E) - checkarg "$1" - A=$ARG - checkarg "$2" - B=$ARG set_var "CONFIG_$B" "CONFIG_$B=y" "CONFIG_$A" - shift - shift ;; --disable-after|-D) - checkarg "$1" - A=$ARG - checkarg "$2" - B=$ARG set_var "CONFIG_$B" "# CONFIG_$B is not set" "CONFIG_$A" - shift - shift ;; --module-after|-M) - checkarg "$1" - A=$ARG - checkarg "$2" - B=$ARG set_var "CONFIG_$B" "CONFIG_$B=m" "CONFIG_$A" - shift - shift ;; # undocumented because it ignores --file (fixme)
Signature · 1 line
1.6.3
PATCH 3/3 kbuild: add generic --set option to scripts/config
In reply to a message not in the archive--- scripts/config | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-)
scripts/config +15 -2
@@ -9,8 +9,11 @@ config options command ... commands: --enable|-e option Enable option --disable|-d option Disable option - --module|-m option Turn option into a module - --state|-s option Print state of option (n,y,m,undef) + --module|-m option Turn option into a module + --set option value Set option to arbitrary value + --set-str option value + Same as --set, bu quote value + --state|-s option Print state of option (n,y,m,undef) --enable-after|-E beforeopt option Enable option directly after other option
@@ -117,6 +120,16 @@ while [ "$1" != "" ] ; do set_var "CONFIG_$ARG" "CONFIG_$ARG=m" ;; + --set) + set_var "CONFIG_$ARG" "CONFIG_$ARG=$1" + shift + ;; + + --set-str) + set_var "CONFIG_$ARG" "CONFIG_$ARG=\"$1\"" + shift + ;; + --state|-s) if grep -q "# CONFIG_$ARG is not set" $FN ; then echo n
Signature · 1 line
1.6.3
Re: [PATCH 3/3] kbuild: add generic --set option to scripts/config
scripts/config config options command ... · line 13
Quoted 4 lines
scripts/config +2
-2- --module|-m option Turn option into a module - --state|-s option Print state of option (n,y,m,undef) + --module|-m option Turn option into a module + --set option value Set option to arbitrary value
--set seems like fluff to me, it's redundant compared to what was there before.
scripts/config config options command ... · line 15
Quoted 2 lines
scripts/config +2
-0+ --set-str option value + Same as --set, bu quote value
But that's ok.
scripts/config config options command ... · line 16
Quoted 1 line
scripts/config +1
-0+ --state|-s option Print state of option (n,y,m,undef)
Thanks.
-Andi
Signature · 1 line
[email protected] -- Speaking for myself only.
Re: [PATCH 3/3] kbuild: add generic --set option to scripts/config
Andi Kleen napsal(a):
Quoted 7 lines
scripts/config config options command ... · line 13
Quoted 4 lines
scripts/config +2
-2- --module|-m option Turn option into a module - --state|-s option Print state of option (n,y,m,undef) + --module|-m option Turn option into a module + --set option value Set option to arbitrary value--set seems like fluff to me, it's redundant compared to what was there before.
It could be useful for setting integer options. I personally don't need that, I just added it for completeness. I can remove it if you don't like it.
Michal