Skip to contentSkip to conversation

kbuild: add automatic updateconfig target

PATCH In review maximilian attems 4 participants 9 messages Jan 18, 2006 – Jan 19, 2006 Kconfig

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: add automatic updateconfig target

From: Bastian Blank <[email protected]>

current hack for daily build linux-2.6-git is quite ugly:
yes "n" | make oldconfig

belows target helps to build git snapshots in a more automated way, setting the new options to their default.

scripts/kconfig/Makefile +4 -0
index 5760e05..5bf2718 100644
@@ -23,6 +23,9 @@ oldconfig: $(obj)/conf
 silentoldconfig: $(obj)/conf
 	$< -s arch/$(ARCH)/Kconfig
 
+updateconfig: $(obj)/conf
+	$< -U arch/$(ARCH)/Kconfig
+
 update-po-config: $(obj)/kxgettext
 	xgettext --default-domain=linux \
           --add-comments --keyword=_ --keyword=N_ \
@@ -74,6 +77,7 @@ help:
 	@echo  '  xconfig	  - Update current config utilising a QT based front-end'
 	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'
 	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'
+	@echo  '  updateconfig	  - Update current config in an automated way'
 	@echo  '  randconfig	  - New config with random answer to all options'
 	@echo  '  defconfig	  - New config with default answer to all options'
 	@echo  '  allmodconfig	  - New config selecting modules when possible'
scripts/kconfig/conf.c +8 -1
index 10eeae5..4e7b6a1 100644
@@ -24,7 +24,8 @@ enum {
 	set_yes,
 	set_mod,
 	set_no,
-	set_random
+	set_random,
+	update_default,
 } input_mode = ask_all;
 char *defconfig_file;
 
@@ -117,6 +118,7 @@ static void conf_askvalue(struct symbol 
 		fgets_check_stream(line, 128, stdin);
 		return;
 	case set_default:
+	case update_default:
 		printf("%s\n", def);
 		return;
 	default:
@@ -390,6 +392,7 @@ static int conf_choice(struct menu *menu
 		case set_yes:
 		case set_mod:
 		case set_no:
+		case update_default:
 			cnt = def;
 			printf("%d\n", cnt);
 			break;
@@ -544,6 +547,9 @@ int main(int ac, char **av)
 			input_mode = set_random;
 			srandom(time(NULL));
 			break;
+		case 'U':
+			input_mode = update_default;
+			break;
 		case 'h':
 		case '?':
 			printf("%s [-o|-s] config\n", av[0]);
@@ -568,6 +574,7 @@ int main(int ac, char **av)
 		}
 		break;
 	case ask_silent:
+	case update_default:
 		if (stat(".config", &tmpstat)) {
 			printf(_("***\n"
 				"*** You have not yet configured your kernel!\n"
#1 lore raw
Quoted 7 lines · maximilian attems

From: Bastian Blank <[email protected]>

current hack for daily build linux-2.6-git is quite ugly:
yes "n" | make oldconfig

belows target helps to build git snapshots in a more automated way, setting the new options to their default.

Please always add Roman Zippel when dealing with kconfig changes. We had a similar though more advanced proposal named miniconfig a month or so ago but Roman had some grief with it so it was not applied.

I've let Roman decide on this one too.
Nitpicking below.

Sam

scripts/kconfig/Makefile oldconfig: $(obj)/conf · line 27

Quoted 2 lines
scripts/kconfig/Makefile +2 -0
+updateconfig: $(obj)/conf
+	$< -U arch/$(ARCH)/Kconfig

The other methods uses small letters so please change to '-u'

scripts/kconfig/conf.c enum { · line 28

Quoted 3 lines
scripts/kconfig/conf.c +2 -1
-	set_random
+	set_random,
+	update_default,

Keep same naming as the others. May I suggest set_default.

You did not introduce a specific update.config file like for the other targets. Any reason for that?

Sam

#2 lore raw
Quoted 1 line · Sam Ravnborg

Please always add Roman Zippel when dealing with kconfig changes.

And I should do so in my replies - yes!
Please use this mail for futher comments to keep all in the loop.

Sam

Quoted 39 lines · maximilian attems
Quoted 7 lines

From: Bastian Blank <[email protected]>

current hack for daily build linux-2.6-git is quite ugly:
yes "n" | make oldconfig

belows target helps to build git snapshots in a more automated way, setting the new options to their default.

Please always add Roman Zippel when dealing with kconfig changes. We had a similar though more advanced proposal named miniconfig a month or so ago but Roman had some grief with it so it was not applied.

I've let Roman decide on this one too.
Nitpicking below.

Sam

scripts/kconfig/Makefile oldconfig: $(obj)/conf · line 27

Quoted 2 lines
scripts/kconfig/Makefile +2 -0
+updateconfig: $(obj)/conf
+	$< -U arch/$(ARCH)/Kconfig

The other methods uses small letters so please change to '-u'

scripts/kconfig/conf.c enum { · line 28

Quoted 3 lines
scripts/kconfig/conf.c +2 -1
-	set_random
+	set_random,
+	update_default,

Keep same naming as the others. May I suggest set_default.

You did not introduce a specific update.config file like for the other targets. Any reason for that?

Sam
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#3 lore raw
Quoted 6 lines · Sam Ravnborg
Quoted 1 line · Sam Ravnborg

Please always add Roman Zippel when dealing with kconfig changes.

And I should do so in my replies - yes!
Please use this mail for futher comments to keep all in the loop.

Sam

ok will do.

Quoted 24 lines
Quoted 24 lines · maximilian attems
Quoted 7 lines

From: Bastian Blank <[email protected]>

current hack for daily build linux-2.6-git is quite ugly:
yes "n" | make oldconfig

belows target helps to build git snapshots in a more automated way, setting the new options to their default.

Please always add Roman Zippel when dealing with kconfig changes. We had a similar though more advanced proposal named miniconfig a month or so ago but Roman had some grief with it so it was not applied.

I've let Roman decide on this one too.
Nitpicking below.

Sam

scripts/kconfig/Makefile oldconfig: $(obj)/conf · line 27

Quoted 2 lines
scripts/kconfig/Makefile +2 -0
+updateconfig: $(obj)/conf
+	$< -U arch/$(ARCH)/Kconfig

The other methods uses small letters so please change to '-u'

Quoted 5 lines
Quoted 5 lines

scripts/kconfig/conf.c enum { · line 28

Quoted 3 lines
scripts/kconfig/conf.c +2 -1
-	set_random
+	set_random,
+	update_default,

Keep same naming as the others. May I suggest set_default.

ok easy stuff.

Quoted 4 lines
Quoted 4 lines

You did not introduce a specific update.config file like for the other targets. Any reason for that?

Sam

naah, looks more like an oversight.
will rediff and resend.

Signature · 1 line
maks
#4 lore raw
In reply to Sam Ravnborg

add an automated target for linux-2.6 daily builds, sets the new options to their default without manual intervention.

based on a patch by Bastian Blank <[email protected]>

--
thanks for your suggestions Sam,
the patch is much shorter than previous.

i'm not yet shure why one would introduce an update.config file? please explain :)

scripts/kconfig/Makefile +4 -0
index 5760e05..487e75f 100644
@@ -23,6 +23,9 @@ oldconfig: $(obj)/conf
 silentoldconfig: $(obj)/conf
 	$< -s arch/$(ARCH)/Kconfig
 
+updateconfig: $(obj)/conf
+	$< -u arch/$(ARCH)/Kconfig
+
 update-po-config: $(obj)/kxgettext
 	xgettext --default-domain=linux \
           --add-comments --keyword=_ --keyword=N_ \
@@ -74,6 +77,7 @@ help:
 	@echo  '  xconfig	  - Update current config utilising a QT based front-end'
 	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'
 	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'
+	@echo  '  updateconfig	  - Update current config in an automated way'
 	@echo  '  randconfig	  - New config with random answer to all options'
 	@echo  '  defconfig	  - New config with default answer to all options'
 	@echo  '  allmodconfig	  - New config selecting modules when possible'
scripts/kconfig/conf.c +3 -0
index 10eeae5..88c2738 100644
@@ -544,6 +544,9 @@ int main(int ac, char **av)
 			input_mode = set_random;
 			srandom(time(NULL));
 			break;
+		case 'u':
+			input_mode = set_default;
+			break;
 		case 'h':
 		case '?':
 			printf("%s [-o|-s] config\n", av[0]);
#5 lore raw
In reply to Sam Ravnborg
Quoted 1 line · Sam Ravnborg
Quoted 1 line

Keep same naming as the others. May I suggest set_default.

set_* is something different. It uses the default config, not the actual one.

Bastian

Signature · 2 lines
Those who hate and fight must stop themselves -- otherwise it is not stopped.
		-- Spock, "Day of the Dove", stardate unknown
#6 lore raw
In reply to maximilian attems

Hi,

Quoted 4 lines · maximilian attems

From: Bastian Blank <[email protected]>

current hack for daily build linux-2.6-git is quite ugly:
yes "n" | make oldconfig

What's wrong with 'yes "" | make oldconfig'?
If we added such a make target, it would be basically just this.

bye, Roman

#7 lore raw
Quoted 11 lines · Roman Zippel
Quoted 4 lines · maximilian attems

From: Bastian Blank <[email protected]>

current hack for daily build linux-2.6-git is quite ugly:
yes "n" | make oldconfig

What's wrong with 'yes "" | make oldconfig'?
If we added such a make target, it would be basically just this.

bye, Roman

why should we add this workaround, when adding a target that sets the default is so easy?

Signature · 1 line
maks
#8 lore raw

Hi,

Quoted 5 lines · maximilian attems
Quoted 2 lines

What's wrong with 'yes "" | make oldconfig'?
If we added such a make target, it would be basically just this.

why should we add this workaround, when adding a target that sets the default is so easy?

What advantages would this have compared to the "workaround"?

bye, Roman