From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752895AbZEYOnm (ORCPT ); Mon, 25 May 2009 10:43:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751905AbZEYOnX (ORCPT ); Mon, 25 May 2009 10:43:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41921 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751503AbZEYOnW (ORCPT ); Mon, 25 May 2009 10:43:22 -0400 Date: Mon, 25 May 2009 16:43:22 +0200 From: Michal Marek To: Andi Kleen Cc: Sam Ravnborg , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] kbuild: handle non-existing options in scripts/config Message-ID: <20090525144322.GB22686@sepie.suse.cz> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If an option does not exist in .config, set it at the end of the file. Signed-off-by: Michal Marek --- scripts/config | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/scripts/config b/scripts/config index db6084b..22cceff 100755 --- a/scripts/config +++ b/scripts/config @@ -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,28 @@ checkarg() { ARG="`echo $ARG | tr a-z A-Z`" } -replace() { - sed -i -e "$@" $FN +# set_var name value [before-var] +set_var() { + awk -vnew="$2" " + /^# $1 is not set|^$1=/ { + if (new) + print new; + new = 0; + next; + } + \"$3\" && /^# $3 is not set|^$3=/ { + print; + if (new) + print new; + new = 0; + next; + } + { print } + END { + if (new) + print new; + } + " "$FN" >"$FN.tmp" && mv -f "$FN.tmp" "$FN" } if [ "$1" = "--file" ]; then @@ -70,20 +88,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 +126,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 +136,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 +146,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 ;; -- 1.6.3