karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

linux26-rt: replaced 12-conf-hacks.patch with the one from linux26

user/karasz/test/ecn
Alejandro Mery 15 years ago committed by Alejandro Mery
parent
183e23e565
commit
2e9f71caac
1 changed files with 92 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 147
      base/linux26-rt/12-conf-hacks.patch

147
base/linux26-rt/12-conf-hacks.patch
Unescape View File

@ -2,9 +2,9 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../linux26-rt/12-conf-hacks.patch
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
# Copyright (C) 2008 - 2010 The OpenSDE Project
# Copyright (C) 2004 - 2008 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
#
# More information can be found in the files COPYING and README.
#
@ -16,34 +16,41 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Set all unset options to module. Needed by the T2 / ROCK Linux kernel
configuration.
Set all unset options to module. Needed by the OpenSDE Linux kernel
auto configuration.
Initally written by Clifford Wold <clifford@clifford.at> and adapted
for various new 2.5/2.6 kernels by Rene Rebe <rene@exactcode.de>.
--- ./scripts/kconfig/Makefile.orig 2006-03-19 19:38:46.080184500 +0100
+++ ./scripts/kconfig/Makefile 2006-03-19 20:01:55.859040250 +0100
@@ -2,7 +2,7 @@
# Kernel configuration targets
diff -ruN linux-2.6.32.10-orig/scripts/kconfig/Makefile linux-2.6.32.10/scripts/kconfig/Makefile
--- linux-2.6.32.10-orig/scripts/kconfig/Makefile 2009-12-03 04:51:21.000000000 +0100
+++ linux-2.6.32.10/scripts/kconfig/Makefile 2010-03-25 10:15:26.297247478 +0100
@@ -3,7 +3,7 @@
# These targets are used from top-level makefile
-PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
+PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig no2modconfig update-po-config
PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
- localmodconfig localyesconfig
+ localmodconfig localyesconfig no2modconfig
ifdef KBUILD_KCONFIG
Kconfig := $(KBUILD_KCONFIG)
@@ -81,7 +81,7 @@
$(Q)rm -f arch/um/Kconfig.arch
$(Q)rm -f $(obj)/config.pot
xconfig: $(obj)/qconf
$< arch/$(ARCH)/Kconfig
@@ -56,6 +56,9 @@
-PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
+PHONY += randconfig allyesconfig allnoconfig allmodconfig no2modconfig defconfig
randconfig: $(obj)/conf
$< -r $(Kconfig)
@@ -95,6 +95,9 @@
allmodconfig: $(obj)/conf
$< -m arch/$(ARCH)/Kconfig
$< -m $(Kconfig)
+no2modconfig: scripts/kconfig/conf
+ $< -M arch/$(ARCH)/Kconfig
+no2modconfig: $(obj)/conf
+ $< -M $(Kconfig)
+
defconfig: $(obj)/conf
ifeq ($(KBUILD_DEFCONFIG),)
$< -d arch/$(ARCH)/Kconfig
@@ -77,6 +80,7 @@
$< -d $(Kconfig)
@@ -119,6 +122,7 @@
@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'
@ -51,9 +58,10 @@ for various new 2.5/2.6 kernels by Rene Rebe <rene@exactcode.de>.
@echo ' allyesconfig - New config where all options are accepted with yes'
@echo ' allnoconfig - New config where all options are answered with no'
--- linux-2.6.17/scripts/kconfig/conf.c 2006-06-18 03:49:35.000000000 +0200
+++ linux26.macbook/scripts/kconfig/conf.c 2006-07-22 11:57:17.000000000 +0200
@@ -21,6 +21,7 @@
diff -ruN linux-2.6.32.10-orig/scripts/kconfig/conf.c linux-2.6.32.10/scripts/kconfig/conf.c
--- linux-2.6.32.10-orig/scripts/kconfig/conf.c 2009-12-03 04:51:21.000000000 +0100
+++ linux-2.6.32.10/scripts/kconfig/conf.c 2010-03-25 10:04:47.777577480 +0100
@@ -23,6 +23,7 @@
ask_all,
ask_new,
ask_silent,
@ -61,31 +69,16 @@ for various new 2.5/2.6 kernels by Rene Rebe <rene@exactcode.de>.
set_default,
set_yes,
set_mod,
@@ -83,6 +84,15 @@
}
@@ -439,7 +440,7 @@
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
switch (input_mode) {
+ case set_no2mod:
+ if (type == S_TRISTATE &&
+ sym_get_tristate_value(sym) == no) {
+ fprintf(stderr, "Setting %s to 'm'.\n", sym->name);
+ line[0] = 'm';
+ line[1] = '\n';
+ line[2] = 0;
+ break;
+ }
case set_no:
case set_mod:
case set_yes:
@@ -372,6 +382,7 @@
break;
case set_random:
def = (random() % cnt) + 1;
+ case set_no2mod:
case set_default:
case set_yes:
case set_mod:
@@ -523,6 +534,9 @@
- while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
+ while ((opt = getopt(ac, av, "osdD:nmMyrh")) != -1) {
switch (opt) {
case 'o':
input_mode = ask_silent;
@@ -461,6 +462,9 @@
case 'm':
input_mode = set_mod;
break;
@ -95,11 +88,55 @@ for various new 2.5/2.6 kernels by Rene Rebe <rene@exactcode.de>.
case 'y':
input_mode = set_yes;
break;
@@ -565,6 +579,7 @@
}
case ask_all:
case ask_new:
@@ -548,6 +552,9 @@
else if (!stat("all.config", &tmpstat))
conf_read_simple("all.config", S_DEF_USER);
break;
+ case set_no2mod:
+ conf_read_simple(".config", S_DEF_USER);
+ break;
default:
break;
}
@@ -574,6 +581,9 @@
case set_mod:
conf_set_all_new_symbols(def_mod);
break;
+ case set_no2mod:
conf_read(NULL);
+ conf_set_all_new_symbols(def_no2mod);
+ break;
case set_random:
conf_set_all_new_symbols(def_random);
break;
case set_no:
diff -ruN linux-2.6.32.10-orig/scripts/kconfig/confdata.c linux-2.6.32.10/scripts/kconfig/confdata.c
--- linux-2.6.32.10-orig/scripts/kconfig/confdata.c 2009-12-03 04:51:21.000000000 +0100
+++ linux-2.6.32.10/scripts/kconfig/confdata.c 2010-03-25 10:04:47.781566395 +0100
@@ -828,6 +828,17 @@
for_all_symbols(i, sym) {
if (sym_has_value(sym))
continue;
+ if ((mode == def_no2mod) && (sym_get_type(sym) == S_TRISTATE)) {
+ if (sym_get_tristate_value(sym) == no)
+ fprintf(stderr, "Setting %s to 'm'.\n", sym->name);
+ if (sym_get_tristate_value(sym) == mod)
+ fprintf(stderr, "Keep %s as 'm'.\n", sym->name);
+ if (sym_get_tristate_value(sym) != yes)
+ sym->def[S_DEF_USER].tri = mod;
+ if (!sym_is_choice(sym))
+ sym->flags |= SYMBOL_DEF_USER;
+ continue;
+ }
switch (sym_get_type(sym)) {
case S_BOOLEAN:
case S_TRISTATE:
diff -ruN linux-2.6.32.10-orig/scripts/kconfig/lkc.h linux-2.6.32.10/scripts/kconfig/lkc.h
--- linux-2.6.32.10-orig/scripts/kconfig/lkc.h 2009-12-03 04:51:21.000000000 +0100
+++ linux-2.6.32.10/scripts/kconfig/lkc.h 2010-03-25 10:04:47.777577480 +0100
@@ -46,6 +46,7 @@
def_default,
def_yes,
def_mod,
+ def_no2mod,
def_no,
def_random
};

Write Preview
Loading…
Cancel
Save