From: Sam Ravnborg <sam@ravnborg.org> To: Michal Marek <mmarek@suse.cz> Cc: lkml <linux-kernel@vger.kernel.org>, linux-kbuild <linux-kbuild@vger.kernel.org>, Roman Zippel <zippel@linux-m68k.org>, Aristeu Rozanski <aris@redhat.com> Subject: [PATCH 1/2] kconfig: rename loose_nonint_oldconfig => oldnoconfig Date: Thu, 29 Jul 2010 10:15:39 +0200 [thread overview] Message-ID: <20100729081539.GA5157@merkur.ravnborg.org> (raw) In-Reply-To: <20100729081316.GA4990@merkur.ravnborg.org> >From a76c17f4fa213ad68227456374be6c84c825c3a5 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg <sam@ravnborg.org> Date: Thu, 29 Jul 2010 09:34:43 +0200 Subject: [PATCH 1/2] kconfig: rename loose_nonint_oldconfig => oldnoconfig Rename target to something that fall more in line with the other kconfig targets. oldnoconfig shall read as: - read the old configuration and set all new options to no Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Aristeu Rozanski <aris@redhat.com> --- scripts/kconfig/Makefile | 9 ++++----- scripts/kconfig/conf.c | 14 +++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ed3f157..6c71306 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -3,7 +3,7 @@ # These targets are used from top-level makefile PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ - localmodconfig localyesconfig + localmodconfig localyesconfig oldnoconfig ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) @@ -72,10 +72,10 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf fi $(Q)rm -f .tmp.config -nonint_oldconfig: $(obj)/conf +nonit_oldconfig: $(obj)/conf $< --$@ $(Kconfig) -loose_nonint_oldconfig: $(obj)/conf +oldnoconfig: $(obj)/conf $< --$@ $(Kconfig) # Create new linux.pot file @@ -138,8 +138,7 @@ help: @echo ' allnoconfig - New config where all options are answered with no' @echo ' nonint_oldconfig - Checks the current configuration and fails if an option is ' @echo ' not set' - @echo ' loose_nonint_oldconfig - Same as nonint_oldconfig, but updates the config file with ' - @echo ' missing config options as unset' + @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)' # lxdialog stuff check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 36bd331..3c8f31b 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -35,7 +35,7 @@ enum input_mode { defconfig, readdefconfig, nonint_oldconfig, - loose_nonint_oldconfig, + oldnoconfig, } input_mode = oldaskconfig; char *defconfig_file; @@ -368,7 +368,7 @@ static void conf(struct menu *menu) case P_MENU: if ((input_mode == silentoldconfig || input_mode == nonint_oldconfig || - input_mode == loose_nonint_oldconfig) && + input_mode == oldnoconfig) && rootEntry != menu) { check_conf(menu); return; @@ -428,7 +428,7 @@ static void check_conf(struct menu *menu) if (sym_is_changable(sym) || (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { if (input_mode == nonint_oldconfig || - input_mode == loose_nonint_oldconfig) { + input_mode == oldnoconfig) { if (input_mode == nonint_oldconfig && sym->name && !sym_is_choice_value(sym)) { if (!unset_variables) @@ -462,7 +462,7 @@ static struct option long_opts[] = { {"allmodconfig", no_argument, NULL, allmodconfig}, {"allrandconfig", no_argument, NULL, allrandconfig}, {"nonint_oldconfig", no_argument, NULL, nonint_oldconfig}, - {"loose_nonint_oldconfig", no_argument, NULL, loose_nonint_oldconfig}, + {"oldnoconfig", no_argument, NULL, oldnoconfig}, {NULL, 0, NULL, 0} }; @@ -543,7 +543,7 @@ int main(int ac, char **av) case oldaskconfig: case oldconfig: case nonint_oldconfig: - case loose_nonint_oldconfig: + case oldnoconfig: conf_read(NULL); break; case allnoconfig: @@ -607,7 +607,7 @@ int main(int ac, char **av) input_mode = silentoldconfig; /* fall through */ case nonint_oldconfig: - case loose_nonint_oldconfig: + case oldnoconfig: case silentoldconfig: /* Update until a loop caused no more changes */ do { @@ -615,7 +615,7 @@ int main(int ac, char **av) check_conf(&rootmenu); } while (conf_cnt && (input_mode != nonint_oldconfig && - input_mode != loose_nonint_oldconfig)); + input_mode != oldnoconfig)); break; } -- 1.6.0.6
WARNING: multiple messages have this Message-ID (diff)
From: Sam Ravnborg <sam@ravnborg.org> To: Michal Marek <mmarek@suse.cz> Cc: lkml <linux-kernel@vger.kernel.org>, linux-kbuild <linux-kbuild@vger.kernel.org>, Roman Zippel <zippel@linux-m68k.org>, Aristeu Rozanski <aris@redhat.com> Subject: [PATCH 1/2] kconfig: rename loose_nonint_oldconfig => oldnoconfig Date: Thu, 29 Jul 2010 10:15:39 +0200 [thread overview] Message-ID: <20100729081539.GA5157@merkur.ravnborg.org> (raw) In-Reply-To: <20100729081316.GA4990@merkur.ravnborg.org> From a76c17f4fa213ad68227456374be6c84c825c3a5 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg <sam@ravnborg.org> Date: Thu, 29 Jul 2010 09:34:43 +0200 Subject: [PATCH 1/2] kconfig: rename loose_nonint_oldconfig => oldnoconfig Rename target to something that fall more in line with the other kconfig targets. oldnoconfig shall read as: - read the old configuration and set all new options to no Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Aristeu Rozanski <aris@redhat.com> --- scripts/kconfig/Makefile | 9 ++++----- scripts/kconfig/conf.c | 14 +++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ed3f157..6c71306 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -3,7 +3,7 @@ # These targets are used from top-level makefile PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ - localmodconfig localyesconfig + localmodconfig localyesconfig oldnoconfig ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) @@ -72,10 +72,10 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf fi $(Q)rm -f .tmp.config -nonint_oldconfig: $(obj)/conf +nonit_oldconfig: $(obj)/conf $< --$@ $(Kconfig) -loose_nonint_oldconfig: $(obj)/conf +oldnoconfig: $(obj)/conf $< --$@ $(Kconfig) # Create new linux.pot file @@ -138,8 +138,7 @@ help: @echo ' allnoconfig - New config where all options are answered with no' @echo ' nonint_oldconfig - Checks the current configuration and fails if an option is ' @echo ' not set' - @echo ' loose_nonint_oldconfig - Same as nonint_oldconfig, but updates the config file with ' - @echo ' missing config options as unset' + @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)' # lxdialog stuff check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 36bd331..3c8f31b 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -35,7 +35,7 @@ enum input_mode { defconfig, readdefconfig, nonint_oldconfig, - loose_nonint_oldconfig, + oldnoconfig, } input_mode = oldaskconfig; char *defconfig_file; @@ -368,7 +368,7 @@ static void conf(struct menu *menu) case P_MENU: if ((input_mode == silentoldconfig || input_mode == nonint_oldconfig || - input_mode == loose_nonint_oldconfig) && + input_mode == oldnoconfig) && rootEntry != menu) { check_conf(menu); return; @@ -428,7 +428,7 @@ static void check_conf(struct menu *menu) if (sym_is_changable(sym) || (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { if (input_mode == nonint_oldconfig || - input_mode == loose_nonint_oldconfig) { + input_mode == oldnoconfig) { if (input_mode == nonint_oldconfig && sym->name && !sym_is_choice_value(sym)) { if (!unset_variables) @@ -462,7 +462,7 @@ static struct option long_opts[] = { {"allmodconfig", no_argument, NULL, allmodconfig}, {"allrandconfig", no_argument, NULL, allrandconfig}, {"nonint_oldconfig", no_argument, NULL, nonint_oldconfig}, - {"loose_nonint_oldconfig", no_argument, NULL, loose_nonint_oldconfig}, + {"oldnoconfig", no_argument, NULL, oldnoconfig}, {NULL, 0, NULL, 0} }; @@ -543,7 +543,7 @@ int main(int ac, char **av) case oldaskconfig: case oldconfig: case nonint_oldconfig: - case loose_nonint_oldconfig: + case oldnoconfig: conf_read(NULL); break; case allnoconfig: @@ -607,7 +607,7 @@ int main(int ac, char **av) input_mode = silentoldconfig; /* fall through */ case nonint_oldconfig: - case loose_nonint_oldconfig: + case oldnoconfig: case silentoldconfig: /* Update until a loop caused no more changes */ do { @@ -615,7 +615,7 @@ int main(int ac, char **av) check_conf(&rootmenu); } while (conf_cnt && (input_mode != nonint_oldconfig && - input_mode != loose_nonint_oldconfig)); + input_mode != oldnoconfig)); break; } -- 1.6.0.6
next prev parent reply other threads:[~2010-07-29 8:15 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-07-25 21:38 [RFC] kconfig: introduce alldefconfig + savedefconfig Sam Ravnborg 2010-07-25 21:38 ` [PATCH 1/4] kconfig: save location of config symbols Sam Ravnborg 2010-07-25 21:38 ` Sam Ravnborg 2010-07-25 21:39 ` [PATCH 2/4] kconfig: print more info when we see a recursive dependency Sam Ravnborg 2010-07-25 21:39 ` Sam Ravnborg 2010-07-25 21:39 ` [PATCH 3/4] kconfig: add alldefconfig Sam Ravnborg 2010-07-25 21:39 ` Sam Ravnborg 2010-07-25 21:40 ` [PATCH 4/4] kconfig: add savedefconfig Sam Ravnborg 2010-07-25 21:40 ` Sam Ravnborg 2010-07-27 15:42 ` Michal Marek 2010-07-27 16:50 ` Sam Ravnborg 2010-07-28 20:36 ` [RFC PATCH] kconfig: use long options in conf Sam Ravnborg 2010-07-28 20:36 ` Sam Ravnborg 2010-07-29 8:13 ` Sam Ravnborg 2010-07-29 8:15 ` Sam Ravnborg [this message] 2010-07-29 8:15 ` [PATCH 1/2] kconfig: rename loose_nonint_oldconfig => oldnoconfig Sam Ravnborg 2010-07-29 8:16 ` [PATCH 2/2] kconfig: change nonint_oldconfig to listnewconfig Sam Ravnborg 2010-07-29 8:16 ` Sam Ravnborg 2010-07-29 9:23 ` [RFC PATCH] kconfig: use long options in conf Michal Marek 2010-07-29 14:47 ` Aristeu Rozanski 2010-07-29 15:04 ` Michal Marek 2010-07-29 15:16 ` Aristeu Rozanski 2010-07-29 19:34 ` Sam Ravnborg 2010-07-29 19:50 ` Aristeu Rozanski 2010-07-29 23:04 ` Sam Ravnborg 2010-07-30 14:53 ` Aristeu Rozanski 2010-07-29 9:17 ` Michal Marek 2010-07-29 9:39 ` Sam Ravnborg 2010-07-29 10:08 ` Michal Marek 2010-07-29 14:30 ` Randy Dunlap 2010-07-29 19:29 ` Sam Ravnborg 2010-07-25 22:20 ` [RFC] kconfig: introduce alldefconfig + savedefconfig Sam Ravnborg 2010-07-28 6:47 ` Uwe Kleine-König
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20100729081539.GA5157@merkur.ravnborg.org \ --to=sam@ravnborg.org \ --cc=aris@redhat.com \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mmarek@suse.cz \ --cc=zippel@linux-m68k.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.