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

linux26: adapted OpenSDE specific kernel config patch which adds the 'no2modconfig' make target to kernel version 2.6.32

user/karasz/test/ecn
Christian Wiese 16 years ago committed by Alejandro Mery
parent
8ab79cb5a8
commit
b141b8b821
1 changed files with 63 additions and 56 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. 119
      base/linux26/12-conf-hacks.patch

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

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../linux26/12-conf-hacks.patch
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2008 - 2010 The OpenSDE Project
# Copyright (C) 2004 - 2008 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
#
@ -16,16 +16,52 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Set all unset options to module. Needed by the T2 SDE Linux kernel
Set all unset options to module. Needed by the OpenSDE Linux kernel
auto configuration.
Initally written by Clifford Wolf <[email protected]> and adapted
for various new 2.5/2.6 kernels by Rene Rebe <[email protected]>.
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 \
- 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
-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 $(Kconfig)
diff -ur linux-2.6.27/scripts/kconfig/conf.c linux-2.6.27.work/scripts/kconfig/conf.c
--- linux-2.6.27/scripts/kconfig/conf.c 2008-10-10 00:13:53.000000000 +0200
+++ linux-2.6.27.work/scripts/kconfig/conf.c 2008-10-19 14:39:10.000000000 +0200
@@ -22,6 +22,7 @@
+no2modconfig: $(obj)/conf
+ $< -M $(Kconfig)
+
defconfig: $(obj)/conf
ifeq ($(KBUILD_DEFCONFIG),)
$< -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'
+ @echo ' no2modconfig - New config selecting modules for disabled options'
@echo ' allyesconfig - New config where all options are accepted with yes'
@echo ' allnoconfig - New config where all options are answered with no'
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,
@ -33,7 +69,7 @@ diff -ur linux-2.6.27/scripts/kconfig/conf.c linux-2.6.27.work/scripts/kconfig/c
set_default,
set_yes,
set_mod,
@@ -438,7 +439,7 @@
@@ -439,7 +440,7 @@
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@ -42,7 +78,7 @@ diff -ur linux-2.6.27/scripts/kconfig/conf.c linux-2.6.27.work/scripts/kconfig/c
switch (opt) {
case 'o':
input_mode = ask_silent;
@@ -460,6 +461,9 @@
@@ -461,6 +462,9 @@
case 'm':
input_mode = set_mod;
break;
@ -52,7 +88,7 @@ diff -ur linux-2.6.27/scripts/kconfig/conf.c linux-2.6.27.work/scripts/kconfig/c
case 'y':
input_mode = set_yes;
break;
@@ -533,6 +537,9 @@
@@ -548,6 +552,9 @@
else if (!stat("all.config", &tmpstat))
conf_read_simple("all.config", S_DEF_USER);
break;
@ -62,7 +98,7 @@ diff -ur linux-2.6.27/scripts/kconfig/conf.c linux-2.6.27.work/scripts/kconfig/c
default:
break;
}
@@ -559,6 +566,9 @@
@@ -574,6 +581,9 @@
case set_mod:
conf_set_all_new_symbols(def_mod);
break;
@ -72,50 +108,10 @@ diff -ur linux-2.6.27/scripts/kconfig/conf.c linux-2.6.27.work/scripts/kconfig/c
case set_random:
conf_set_all_new_symbols(def_random);
break;
diff -ur linux-2.6.27/scripts/kconfig/lkc.h linux-2.6.27.work/scripts/kconfig/lkc.h
--- linux-2.6.27/scripts/kconfig/lkc.h 2008-10-10 00:13:53.000000000 +0200
+++ linux-2.6.27.work/scripts/kconfig/lkc.h 2008-10-19 14:14:59.000000000 +0200
@@ -46,6 +46,7 @@
def_default,
def_yes,
def_mod,
+ def_no2mod,
def_no,
def_random
};
diff -ur linux-2.6.27/scripts/kconfig/Makefile linux-2.6.27.work/scripts/kconfig/Makefile
--- linux-2.6.27/scripts/kconfig/Makefile 2008-10-10 00:13:53.000000000 +0200
+++ linux-2.6.27.work/scripts/kconfig/Makefile 2008-10-19 14:14:59.000000000 +0200
@@ -2,7 +2,7 @@
# Kernel configuration targets
# 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
Kconfig := arch/$(SRCARCH)/Kconfig
@@ -61,6 +61,9 @@
allmodconfig: $(obj)/conf
$< -m $(Kconfig)
+no2modconfig: scripts/kconfig/conf
+ $< -M $(Kconfig)
+
defconfig: $(obj)/conf
ifeq ($(KBUILD_DEFCONFIG),)
$< -d $(Kconfig)
@@ -83,6 +86,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'
+ @echo ' no2modconfig - New config selecting modules for disabled options'
@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.27.vanilla/scripts/kconfig/confdata.c 2008-10-10 00:13:53.000000000 +0200
+++ linux-2.6.27/scripts/kconfig/confdata.c 2008-10-20 12:45:07.000000000 +0200
@@ -824,6 +824,17 @@
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;
@ -133,3 +129,14 @@ diff -ur linux-2.6.27/scripts/kconfig/Makefile linux-2.6.27.work/scripts/kconfig
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