From daa1f128fb419f11083afeb2405e9793cfb20650 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 9 Dec 2003 00:28:57 +0000 Subject: [PATCH] some first 2.4.23 kernel update adaptions ... git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1934 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../base/linux24-header/linux24-header.desc | 2 +- package/base/linux24-src/linux24-src.desc | 2 +- package/base/linux24/05-devfs-not-exp.patch | 20 +++++++++++++++---- package/base/linux24/linux24.desc | 6 +++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/package/base/linux24-header/linux24-header.desc b/package/base/linux24-header/linux24-header.desc index 96528280c..18825918a 100644 --- a/package/base/linux24-header/linux24-header.desc +++ b/package/base/linux24-header/linux24-header.desc @@ -39,7 +39,7 @@ [E] group kernel-header [O] vanilla_ver="2.4.23" -[O] var_append patchfiles " " "linux-2.4.23-i2c-2.8.1.patch" +[O] var_append patchfiles " " "i2c-2.8.1-2.4.23-rxr.patch.bz2" [L] GPL [S] Stable diff --git a/package/base/linux24-src/linux24-src.desc b/package/base/linux24-src/linux24-src.desc index c61b2a3e8..623c4f7fb 100644 --- a/package/base/linux24-src/linux24-src.desc +++ b/package/base/linux24-src/linux24-src.desc @@ -39,7 +39,7 @@ [E] group kernel-src [O] vanilla_ver="2.4.23" -[O] var_append patchfiles " " "linux-2.4.23-i2c-2.8.1.patch" +[O] var_append patchfiles " " "i2c-2.8.1-2.4.23-rxr.patch.bz2" [L] GPL [S] Stable diff --git a/package/base/linux24/05-devfs-not-exp.patch b/package/base/linux24/05-devfs-not-exp.patch index 0c6cc95ec..cce4f32fa 100644 --- a/package/base/linux24/05-devfs-not-exp.patch +++ b/package/base/linux24/05-devfs-not-exp.patch @@ -20,14 +20,26 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- ---- linux/fs/Config.in.orig Thu Oct 25 11:52:25 2001 -+++ linux/fs/Config.in Thu Oct 25 11:53:16 2001 -@@ -52,7 +52,7 @@ +Currently (at version 2.0.x) ROCK Linux required DevFS. It is highly +useful. Later version of ROCK Linux are planed to support other variants +(like old-style device nodes or udevfs). + + - Rene Rebe + +--- linux-2.4.23/fs/Config.in.orig 2003-11-28 19:26:21.000000000 +0100 ++++ linux-2.4.23/fs/Config.in 2003-12-09 00:55:11.000000000 +0100 +@@ -72,13 +72,9 @@ bool '/proc file system support' CONFIG_PROC_FS +-# For some reason devfs corrupts memory badly on x86-64. Disable it +-# for now. +-if [ "$CONFIG_X86_64" != "y" ] ; then -dep_bool '/dev file system support (EXPERIMENTAL)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL -+bool '/dev file system support (Required for ROCK Linux)' CONFIG_DEVFS_FS ++dep_bool '/dev file system support (Required for ROCK Linux)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL dep_bool ' Automatically mount at boot' CONFIG_DEVFS_MOUNT $CONFIG_DEVFS_FS dep_bool ' Debug devfs' CONFIG_DEVFS_DEBUG $CONFIG_DEVFS_FS +-fi + # It compiles as a module for testing only. It should not be used + # as a module in general. If we make this "tristate", a bunch of people diff --git a/package/base/linux24/linux24.desc b/package/base/linux24/linux24.desc index ebbf6d68d..27f12f9b4 100644 --- a/package/base/linux24/linux24.desc +++ b/package/base/linux24/linux24.desc @@ -42,8 +42,8 @@ [P] X -1---5---9 109.000 [O] vanilla_ver="2.4.23" -[O] var_append patchfiles " " "linux-2.4.23-i2c-2.8.1.patch" +[O] var_append patchfiles " " "i2c-2.8.1-2.4.23-rxr.patch.bz2" -[D] 1991898119 linux-2.4.23.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ -[D] 2127003197 linux-2.4.23-i2c-2.8.1.patch http://www.ensicaen.ismra.fr/~delvare/devel/i2c/linux-2.4.23/ +[D] 3490826844 linux-2.4.23.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ +[D] 3857961096 i2c-2.8.1-2.4.23-rxr.patch.bz2 http://www.rocklinux-consulting.de/oss/linux/i2c/