From 5bba21e574cbb8d7639837ef5eb20d9da4e31bee Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Fri, 5 Sep 2003 01:37:48 +0000 Subject: [PATCH] linux24benh update git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1311 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 4 ++++ architecture/powerpc/config.in | 12 ++++++------ .../linux24benh-header/linux24benh-header.desc | 6 +++--- package/powerpc/linux24benh-src/linux24benh-src.desc | 6 +++--- .../linux24benh/arch-ppc-horizon-name-clash.patch | 11 +++++++++++ package/powerpc/linux24benh/linux24benh.desc | 10 +++++----- 6 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index e37268f7c..2f5794a0b 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,8 @@ +*) 2003-09-03 (2.0.0-rc1 - 2.0.0-rc2) + + - updated linux24benh + *) 2003-09-02 (2.0.0-rc1 - 2.0.0-rc2) - Sebastian Jaenicke: updated bsd-games, ircii and dialog diff --git a/architecture/powerpc/config.in b/architecture/powerpc/config.in index c5dc4f13b..19f096c77 100644 --- a/architecture/powerpc/config.in +++ b/architecture/powerpc/config.in @@ -21,12 +21,12 @@ # --- ROCK-COPYRIGHT-NOTE-END --- choice ROCKCFG_POWERPC_ISA common \ - common "Utilize the common subset of POWER and PowerPC" \ - power "Optimised for POWER" \ - power2 "Optimised for POWER2" \ - 601 "Optimised for mixed POWER/PowerPC (only MPC601)" \ - powerpc "Optimised for pure PowerPC" \ - powerpc64 "Optimised for PowerPC64" + common "Utilise the common subset of POWER and PowerPC" \ + power "Utilise the POWER ISA" \ + power2 "Utilise the POWER2 ISA" \ + 601 "Utilise the mixed POWER/PowerPC (only MPC601) ISA" \ + powerpc "Utilise the PowerPC ISA" \ + powerpc64 "Utilise the PowerPC64 ISA" choice ROCKCFG_POWERPC_OPT generic \ generic "No special optimisation" \ diff --git a/package/powerpc/linux24benh-header/linux24benh-header.desc b/package/powerpc/linux24benh-header/linux24benh-header.desc index 22fdc7d70..95d87b867 100644 --- a/package/powerpc/linux24benh-header/linux24benh-header.desc +++ b/package/powerpc/linux24benh-header/linux24benh-header.desc @@ -38,12 +38,12 @@ [E] group kernel-src -[O] vanilla_ver="2.4.21" -[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2" +[O] vanilla_ver="2.4.22" +[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2" [L] GPL [S] Stable -[V] 2.4.21-benh2 +[V] 2.4.22-benh2 [P] X 01-------9 104.000 [R] + powerpc diff --git a/package/powerpc/linux24benh-src/linux24benh-src.desc b/package/powerpc/linux24benh-src/linux24benh-src.desc index a4619b0c7..125aa20cc 100644 --- a/package/powerpc/linux24benh-src/linux24benh-src.desc +++ b/package/powerpc/linux24benh-src/linux24benh-src.desc @@ -38,12 +38,12 @@ [E] group kernel-src -[O] vanilla_ver="2.4.21" -[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2" +[O] vanilla_ver="2.4.22" +[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2" [L] GPL [S] Stable -[V] 2.4.21-benh2 +[V] 2.4.22-benh2 [P] X -1---5---9 106.000 [R] + powerpc diff --git a/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch b/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch new file mode 100644 index 000000000..f5235c0d2 --- /dev/null +++ b/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch @@ -0,0 +1,11 @@ +--- ./drivers/atm/horizon.c.orig 2003-09-04 20:22:19.000000000 +0200 ++++ ./drivers/atm/horizon.c 2003-09-04 20:24:36.000000000 +0200 +@@ -481,7 +481,7 @@ + return; + } + +-static inline void dump_regs (hrz_dev * dev) { ++static inline void dump_horizon_regs (hrz_dev * dev) { + #ifdef DEBUG_HORIZON + PRINTD (DBG_REGS, "CONTROL 0: %#x", rd_regl (dev, CONTROL_0_REG)); + PRINTD (DBG_REGS, "RX CONFIG: %#x", rd_regw (dev, RX_CONFIG_OFF)); diff --git a/package/powerpc/linux24benh/linux24benh.desc b/package/powerpc/linux24benh/linux24benh.desc index 3dc7d32d1..195e8cacd 100644 --- a/package/powerpc/linux24benh/linux24benh.desc +++ b/package/powerpc/linux24benh/linux24benh.desc @@ -37,13 +37,13 @@ [L] GPL [S] Stable -[V] 2.4.21-benh2 +[V] 2.4.22-benh2 [P] X -1---5---9 108.000 [R] + powerpc -[O] vanilla_ver="2.4.21" -[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2" +[O] vanilla_ver="2.4.22" +[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2" -[D] 4044266806 linux-2.4.21.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ -[D] 2875783741 patch-2.4.21-ben2.bz2 ftp://ftp.kernel.org/pub/linux/kernel/people/benh/ +[D] 0 linux-2.4.22.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ +[D] 0 patch-2.4.22-ben2.bz2 ftp://ftp.kernel.org/pub/linux/kernel/people/benh/