diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index c789622d0..d3531c7bd 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -4,6 +4,7 @@ - improved powerpc optimisation options to make ISA selectable - fixed linux24 include/asm-i386/byteorder.h for user-space apps (like kdemultimedia) + - updated linux26 - and adapted the ROCK kconfig patches *) 2003-08-22 (2.0.0-camp - 2.0.0-rc1) diff --git a/package/base/linux26-header/linux26-header.desc b/package/base/linux26-header/linux26-header.desc index c664122bc..71e60ebe5 100644 --- a/package/base/linux26-header/linux26-header.desc +++ b/package/base/linux26-header/linux26-header.desc @@ -38,10 +38,10 @@ [E] group kernel-header -[O] vanilla_ver="2.6.0-test2" +[O] vanilla_ver="2.6.0-test4" [L] GPL [S] Beta -[V] 2.6.0-test2 +[V] 2.6.0-test4 [P] O 01-------9 103.000 diff --git a/package/base/linux26-src/linux26-src.desc b/package/base/linux26-src/linux26-src.desc index 5f372420d..5bf35ff6c 100644 --- a/package/base/linux26-src/linux26-src.desc +++ b/package/base/linux26-src/linux26-src.desc @@ -38,10 +38,10 @@ [E] group kernel-src -[O] vanilla_ver="2.6.0-test2" +[O] vanilla_ver="2.6.0-test4" [L] GPL [S] Beta -[V] 2.6.0-test2 +[V] 2.6.0-test4 [P] X -1-------9 107.000 diff --git a/package/base/linux26/12-conf-hacks.patch b/package/base/linux26/12-conf-hacks.patch index 9848e135f..2835cf7df 100644 --- a/package/base/linux26/12-conf-hacks.patch +++ b/package/base/linux26/12-conf-hacks.patch @@ -20,8 +20,46 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- ---- ./scripts/kconfig/conf.c.orig 2003-01-13 17:11:05.000000000 +0100 -+++ ./scripts/kconfig/conf.c 2003-01-13 23:20:21.000000000 +0100 +Set all unset options to module. Needed by the ROCK Linux kernel +configuration. + +Initally written by Clifford Wold and adapted +for various new 2.5/2.6 kernels by Rene Rebe . + +diff -ru linux-2.6.0-test4/scripts/kconfig/Makefile linux-2.6.0-test4-rock/scripts/kconfig/Makefile +--- linux-2.6.0-test4/scripts/kconfig/Makefile 2003-08-23 02:02:34.000000000 +0200 ++++ linux-2.6.0-test4-rock/scripts/kconfig/Makefile 2003-08-23 16:51:01.000000000 +0200 +@@ -20,7 +20,7 @@ + oldconfig: scripts/kconfig/conf + ./scripts/kconfig/conf -o arch/$(ARCH)/Kconfig + +-.PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig ++.PHONY: randconfig allyesconfig allnoconfig allmodconfig no2modconfig defconfig + + randconfig: scripts/kconfig/conf + ./scripts/kconfig/conf -r arch/$(ARCH)/Kconfig +@@ -34,6 +34,9 @@ + allmodconfig: scripts/kconfig/conf + ./scripts/kconfig/conf -m arch/$(ARCH)/Kconfig + ++no2modconfig: scripts/kconfig/conf ++ ./scripts/kconfig/conf -M arch/$(ARCH)/Kconfig ++ + defconfig: scripts/kconfig/conf + ./scripts/kconfig/conf -d arch/$(ARCH)/Kconfig + +@@ -45,6 +48,7 @@ + @echo ' gconfig - Update current config utilising a GTK based front-end' + @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 minimal config' + +Only in linux-2.6.0-test4-rock/scripts/kconfig: conf +diff -ru linux-2.6.0-test4/scripts/kconfig/conf.c linux-2.6.0-test4-rock/scripts/kconfig/conf.c +--- linux-2.6.0-test4/scripts/kconfig/conf.c 2003-08-23 01:59:45.000000000 +0200 ++++ linux-2.6.0-test4-rock/scripts/kconfig/conf.c 2003-08-23 16:48:07.000000000 +0200 @@ -20,6 +20,7 @@ ask_all, ask_new, @@ -30,8 +68,8 @@ set_default, set_yes, set_mod, -@@ -102,6 +103,15 @@ - line[1] = 0; +@@ -81,6 +82,15 @@ + } switch (input_mode) { + case ask_no2mod: @@ -46,7 +84,7 @@ case ask_new: case ask_silent: if (sym_has_value(sym)) { -@@ -354,6 +354,7 @@ +@@ -344,6 +354,7 @@ break; } check_stdin(); @@ -54,7 +92,7 @@ case ask_all: fflush(stdout); fgets(line, 128, stdin); -@@ -506,6 +517,9 @@ +@@ -504,6 +515,9 @@ case 'm': input_mode = set_mod; break; @@ -64,7 +102,7 @@ case 'y': input_mode = set_yes; break; -@@ -545,7 +559,8 @@ +@@ -543,6 +557,7 @@ } case ask_all: case ask_new: @@ -72,26 +110,3 @@ conf_read(NULL); break; default: - - ---- ./Makefile.orig 2003-05-05 01:53:34.000000000 +0200 -+++ ./Makefile 2003-06-07 17:41:56.000000000 +0200 -@@ -204,7 +204,7 @@ - - noconfig_targets := xconfig gconfig menuconfig config oldconfig randconfig \ - defconfig allyesconfig allnoconfig allmodconfig \ -- clean mrproper distclean rpm \ -+ no2modconfig clean mrproper distclean rpm \ - help tags TAGS cscope sgmldocs psdocs pdfdocs htmldocs \ - checkconfig checkhelp checkincludes - -@@ -636,6 +636,9 @@ - allmodconfig: scripts/kconfig/conf - ./scripts/kconfig/conf -m arch/$(ARCH)/Kconfig - -+no2modconfig: scripts/kconfig/conf -+ ./scripts/kconfig/conf -M arch/$(ARCH)/Kconfig -+ - defconfig: scripts/kconfig/conf - ./scripts/kconfig/conf -d arch/$(ARCH)/Kconfig - diff --git a/package/base/linux26/linux26.desc b/package/base/linux26/linux26.desc index 91ed6d34c..a67051635 100644 --- a/package/base/linux26/linux26.desc +++ b/package/base/linux26/linux26.desc @@ -38,10 +38,10 @@ [L] GPL [S] Beta -[V] 2.6.0-test2 +[V] 2.6.0-test4 [P] X -1---5---9 110.000 -[O] vanilla_ver="2.6.0-test2" +[O] vanilla_ver="2.6.0-test4" -[D] 383336300 linux-2.6.0-test2.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ +[D] 0 linux-2.6.0-test4.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/