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

linux-rt: adapted patches to new version

user/amery/next/luajit
Alejandro Mery 13 years ago
parent
d1b6572333
commit
e9bc82bf28
1 changed files with 73 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 148
      base/linux-rt/12-conf-hacks.patch

148
base/linux-rt/12-conf-hacks.patch
Unescape View File

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../linux-rt/12-conf-hacks.patch # Filename: package/.../linux-rt/12-conf-hacks.patch
# Copyright (C) 2008 - 2010 The OpenSDE Project # Copyright (C) 2008 - 2012 The OpenSDE Project
# Copyright (C) 2004 - 2008 The T2 SDE Project # Copyright (C) 2004 - 2008 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project # Copyright (C) 1998 - 2003 ROCK Linux Project
# #
@ -19,90 +19,49 @@
Set all unset options to module. Needed by the OpenSDE Linux kernel Set all unset options to module. Needed by the OpenSDE Linux kernel
auto configuration. auto configuration.
diff -ruN linux-2.6.32.10-orig/scripts/kconfig/Makefile linux-2.6.32.10/scripts/kconfig/Makefile diff -up linux-2.6.36/scripts/kconfig/conf.c.conf_hack linux-2.6.36/scripts/kconfig/conf.c
--- linux-2.6.32.10-orig/scripts/kconfig/Makefile 2009-12-03 04:51:21.000000000 +0100 --- linux-2.6.36/scripts/kconfig/conf.c.conf_hack 2010-12-10 11:05:25.584361328 +0100
+++ linux-2.6.32.10/scripts/kconfig/Makefile 2010-03-25 10:15:26.297247478 +0100 +++ linux-2.6.36/scripts/kconfig/conf.c 2010-12-10 11:23:04.154359980 +0100
@@ -81,7 +81,7 @@ @@ -33,6 +33,7 @@ enum input_mode {
$(Q)rm -f arch/um/Kconfig.arch savedefconfig,
$(Q)rm -f $(obj)/config.pot listnewconfig,
oldnoconfig,
-PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig + no2modconfig,
+PHONY += randconfig allyesconfig allnoconfig allmodconfig no2modconfig defconfig } input_mode = oldaskconfig;
randconfig: $(obj)/conf
$< -r $(Kconfig)
@@ -95,6 +95,9 @@
allmodconfig: $(obj)/conf
$< -m $(Kconfig)
+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 char *defconfig_file;
--- linux-2.6.32.10-orig/scripts/kconfig/conf.c 2009-12-03 04:51:21.000000000 +0100 @@ -453,6 +454,7 @@ static struct option long_opts[] = {
+++ linux-2.6.32.10/scripts/kconfig/conf.c 2010-03-25 10:04:47.777577480 +0100 {"randconfig", no_argument, NULL, randconfig},
@@ -23,6 +23,7 @@ {"listnewconfig", no_argument, NULL, listnewconfig},
ask_all, {"oldnoconfig", no_argument, NULL, oldnoconfig},
ask_new, + {"no2modconfig", no_argument, NULL, no2modconfig},
ask_silent, {NULL, 0, NULL, 0}
+ set_no2mod, };
set_default,
set_yes,
set_mod,
@@ -439,7 +440,7 @@
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) { @@ -562,6 +564,9 @@ int main(int ac, char **av)
+ 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;
+ case 'M':
+ input_mode = set_no2mod;
+ break;
case 'y':
input_mode = set_yes;
break;
@@ -548,6 +552,9 @@
else if (!stat("all.config", &tmpstat)) else if (!stat("all.config", &tmpstat))
conf_read_simple("all.config", S_DEF_USER); conf_read_simple("all.config", S_DEF_USER);
break; break;
+ case set_no2mod: + case no2modconfig:
+ conf_read_simple(".config", S_DEF_USER); + conf_read_simple(".config", S_DEF_USER);
+ break; + break;
default: default:
break; break;
} }
@@ -574,6 +581,9 @@ @@ -597,6 +602,9 @@ int main(int ac, char **av)
case set_mod: case defconfig:
conf_set_all_new_symbols(def_mod); conf_set_all_new_symbols(def_default);
break; break;
+ case set_no2mod: + case no2modconfig:
+ conf_set_all_new_symbols(def_no2mod); + conf_set_all_new_symbols(def_no2mod);
+ break; + break;
case set_random: case savedefconfig:
conf_set_all_new_symbols(def_random);
break; break;
diff -ruN linux-2.6.32.10-orig/scripts/kconfig/confdata.c linux-2.6.32.10/scripts/kconfig/confdata.c case oldaskconfig:
--- linux-2.6.32.10-orig/scripts/kconfig/confdata.c 2009-12-03 04:51:21.000000000 +0100 diff -up linux-2.6.36/scripts/kconfig/confdata.c.conf_hack linux-2.6.36/scripts/kconfig/confdata.c
+++ linux-2.6.32.10/scripts/kconfig/confdata.c 2010-03-25 10:04:47.781566395 +0100 --- linux-2.6.36/scripts/kconfig/confdata.c.conf_hack 2010-12-10 11:10:30.434361827 +0100
@@ -828,6 +828,17 @@ +++ linux-2.6.36/scripts/kconfig/confdata.c 2010-12-10 11:05:25.622361376 +0100
@@ -991,6 +991,17 @@ void conf_set_all_new_symbols(enum conf_
for_all_symbols(i, sym) { for_all_symbols(i, sym) {
if (sym_has_value(sym)) if (sym_has_value(sym))
continue; continue;
@ -120,10 +79,10 @@ diff -ruN linux-2.6.32.10-orig/scripts/kconfig/confdata.c linux-2.6.32.10/script
switch (sym_get_type(sym)) { switch (sym_get_type(sym)) {
case S_BOOLEAN: case S_BOOLEAN:
case S_TRISTATE: case S_TRISTATE:
diff -ruN linux-2.6.32.10-orig/scripts/kconfig/lkc.h linux-2.6.32.10/scripts/kconfig/lkc.h diff -up linux-2.6.36/scripts/kconfig/lkc.h.conf_hack linux-2.6.36/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.36/scripts/kconfig/lkc.h.conf_hack 2010-12-10 11:10:46.819361946 +0100
+++ linux-2.6.32.10/scripts/kconfig/lkc.h 2010-03-25 10:04:47.777577480 +0100 +++ linux-2.6.36/scripts/kconfig/lkc.h 2010-12-10 11:05:25.623361366 +0100
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@ enum conf_def_mode {
def_default, def_default,
def_yes, def_yes,
def_mod, def_mod,
@ -131,3 +90,42 @@ diff -ruN linux-2.6.32.10-orig/scripts/kconfig/lkc.h linux-2.6.32.10/scripts/kco
def_no, def_no,
def_random def_random
}; };
diff -up linux-2.6.36/scripts/kconfig/Makefile.conf_hack linux-2.6.36/scripts/kconfig/Makefile
--- linux-2.6.36/scripts/kconfig/Makefile.conf_hack 2010-10-20 22:30:22.000000000 +0200
+++ linux-2.6.36/scripts/kconfig/Makefile 2010-12-10 11:23:35.187362246 +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)
@@ -95,7 +95,7 @@ update-po-config: $(obj)/kxgettext $(obj
$(Q)rm -f arch/um/Kconfig.arch
$(Q)rm -f $(obj)/config.pot
-PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
+PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig no2modconfig
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
$< --$@ $(Kconfig)
@@ -108,6 +108,9 @@ listnewconfig oldnoconfig: $(obj)/conf
savedefconfig: $(obj)/conf
$< --$@=defconfig $(Kconfig)
+no2modconfig: $(obj)/conf
+ $< --$@ $(Kconfig)
+
defconfig: $(obj)/conf
ifeq ($(KBUILD_DEFCONFIG),)
$< --defconfig $(Kconfig)
@@ -135,6 +138,7 @@ help:
@echo ' allnoconfig - New config where all options are answered with no'
@echo ' allyesconfig - New config where all options are accepted with yes'
@echo ' allmodconfig - New config selecting modules when possible'
+ @echo ' no2modconfig - New config selecting modules for disabled options'
@echo ' alldefconfig - New config with all symbols set to default'
@echo ' randconfig - New config with random answer to all options'
@echo ' listnewconfig - List new options'

Write Preview
Loading…
Cancel
Save