WebHosting Paid by #1Payday.Loans


   The ROCK Linux project has been discontinued in 2010. Here are the old data for the historical record!

[rock-linux] [PATCH][UPDATE] linux26-2.6.0-test9

ROCK Mailing List Archives

Attachments
Entire message
+ (text/plain)
+ base_updates.diff (text/plain)
Author: 
Date:   
To: 
Subject: [rock-linux] [PATCH][UPDATE] linux26-2.6.0-test9
linux26-test9: patches adapted, ppc/smp hotfix disabled... blind adaptation impossible.
builds on x86

Alejandro
[ Generated by ./scripts/Create-Diff for ROCK Linux 2.0.0-rc3 ]
--- rock-old/package/base/linux26/05-devfs-not-exp.patch 2003-07-19 14:38:09.000000000 -0400
+++ rock-new/package/base/linux26/05-devfs-not-exp.patch 2003-10-25 22:56:32.000000000 -0300
@@ -26,7 +26,7 @@
            programs depend on this, so everyone should say Y here.
  
  config DEVFS_FS
-- bool "/dev file system support (EXPERIMENTAL)"
+- bool "/dev file system support (OBSOLETE)"
 -        depends on EXPERIMENTAL
 +        bool "/dev file system support (Required for ROCK Linux)"
 +        default y
--- rock-old/package/base/linux26/12-conf-hacks.patch 2003-08-25 10:45:18.000000000 -0400
+++ rock-new/package/base/linux26/12-conf-hacks.patch 2003-10-25 23:10:16.000000000 -0300
@@ -26,29 +26,28 @@
 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
+--- ./scripts/kconfig/Makefile.orig 2003-10-25 15:44:56.000000000 -0300
++++ ./scripts/kconfig/Makefile 2003-10-25 23:06:06.000000000 -0300
+@@ -23,7 +23,7 @@
+ silentoldconfig: $(obj)/conf
+ $< -s 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
+ randconfig: $(obj)/conf
+ $< -r arch/$(ARCH)/Kconfig
+@@ -37,6 +37,9 @@
+ allmodconfig: $(obj)/conf
+ $< -m arch/$(ARCH)/Kconfig
  
 +no2modconfig: scripts/kconfig/conf
-+ ./scripts/kconfig/conf -M arch/$(ARCH)/Kconfig
++ $< -M arch/$(ARCH)/Kconfig
 +
- defconfig: scripts/kconfig/conf
- ./scripts/kconfig/conf -d arch/$(ARCH)/Kconfig
+ defconfig: $(obj)/conf
+ $< -d arch/$(ARCH)/Kconfig
  
-@@ -45,6 +48,7 @@
+@@ -51,6 +54,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'
--- rock-old/package/base/linux26/arch-ppc-smp-hotfix.patch 2003-09-16 21:43:17.000000000 -0400
+++ rock-new/package/base/linux26/arch-ppc-smp-hotfix.patch 1969-12-31 21:00:00.000000000 -0300
@@ -1,53 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-#
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-#
-# ROCK Linux: rock-src/package/base/linux26/arch-ppc-smp-hotfix.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-#
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at https://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-#
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-This is only a quick fix to make the 2.6 kernel compile on PowerPC.
-Untested due to the lack of SMP hardware ...
-
- - Rene Rebe <>
-
---- linux-2.6.0-test4/arch/ppc/kernel/smp.c.orig 2003-08-23 02:00:45.000000000 +0200
-+++ linux-2.6.0-test4/arch/ppc/kernel/smp.c 2003-09-06 00:56:46.000000000 +0200
-@@ -47,7 +47,6 @@
- DEFINE_PER_CPU(unsigned int, prof_multiplier);
- DEFINE_PER_CPU(unsigned int, prof_counter);
- unsigned long cache_decay_ticks = HZ/100;
--unsigned long cpu_online_map = cpumask_of_cpu(0);
- unsigned long cpu_possible_map = 1UL;
- int smp_hw_index[NR_CPUS];
- struct thread_info *secondary_ti;
-@@ -361,6 +360,7 @@
-
- void __devinit smp_prepare_boot_cpu(void)
- {
-+ unsigned long cpu_online_map = cpumask_of_cpu(0);
- cpu_set(smp_processor_id(), cpu_online_map);
- cpu_set(smp_processor_id(), cpu_possible_map);
- }
-@@ -399,6 +399,7 @@
- struct task_struct *p;
- char buf[32];
- int c;
-+ unsigned long cpu_online_map = cpumask_of_cpu(0);
-
- /* create a process for the processor */
- /* only regs.msr is actually used, and 0 is OK for it */
--- rock-old/package/base/linux26/arch-ppc-smp-hotfix.patch.disable 1969-12-31 21:00:00.000000000 -0300
+++ rock-new/package/base/linux26/arch-ppc-smp-hotfix.patch.disable 2003-09-16 22:04:36.000000000 -0400
@@ -0,0 +1,53 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/base/linux26/arch-ppc-smp-hotfix.patch
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at https://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+This is only a quick fix to make the 2.6 kernel compile on PowerPC.
+Untested due to the lack of SMP hardware ...
+
+ - Rene Rebe <>
+
+--- linux-2.6.0-test4/arch/ppc/kernel/smp.c.orig 2003-08-23 02:00:45.000000000 +0200
++++ linux-2.6.0-test4/arch/ppc/kernel/smp.c 2003-09-06 00:56:46.000000000 +0200
+@@ -47,7 +47,6 @@
+ DEFINE_PER_CPU(unsigned int, prof_multiplier);
+ DEFINE_PER_CPU(unsigned int, prof_counter);
+ unsigned long cache_decay_ticks = HZ/100;
+-unsigned long cpu_online_map = cpumask_of_cpu(0);
+ unsigned long cpu_possible_map = 1UL;
+ int smp_hw_index[NR_CPUS];
+ struct thread_info *secondary_ti;
+@@ -361,6 +360,7 @@
+
+ void __devinit smp_prepare_boot_cpu(void)
+ {
++ unsigned long cpu_online_map = cpumask_of_cpu(0);
+ cpu_set(smp_processor_id(), cpu_online_map);
+ cpu_set(smp_processor_id(), cpu_possible_map);
+ }
+@@ -399,6 +399,7 @@
+ struct task_struct *p;
+ char buf[32];
+ int c;
++ unsigned long cpu_online_map = cpumask_of_cpu(0);
+
+ /* create a process for the processor */
+ /* only regs.msr is actually used, and 0 is OK for it */
--- rock-old/package/base/linux26/linux26.desc 2003-09-15 19:48:00.000000000 -0400
+++ rock-new/package/base/linux26/linux26.desc 2003-10-25 19:55:25.000000000 -0300
@@ -32,16 +32,16 @@
 [M] Rene Rebe <>

 [C] base/kernel
-[F] DIETLIBC KERNEL
+[F] KERNEL

 [E] group kernel-bin

 [L] GPL
 [S] Beta
-[V] 2.6.0-test4
+[V] 2.6.0-test9
 [P] X -1---5---9 110.000

-[O] vanilla_ver="2.6.0-test4"
+[O] vanilla_ver="2.6.0-test9"

-[D] 2074457667 linux-2.6.0-test4.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
+[D] 2993178141 linux-2.6.0-test9.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/

--- rock-old/package/base/linux26-header/linux26-header.desc 2003-08-25 10:45:13.000000000 -0400
+++ rock-new/package/base/linux26-header/linux26-header.desc 2003-10-25 20:56:57.000000000 -0300
@@ -38,10 +38,10 @@

 [E] group kernel-header

-[O] vanilla_ver="2.6.0-test4"
+[O] vanilla_ver="2.6.0-test9"

 [L] GPL
 [S] Beta
-[V] 2.6.0-test4
+[V] 2.6.0-test9
 [P] O 01-------9 103.000

--- rock-old/package/base/linux26-src/linux26-src.desc 2003-08-25 10:45:22.000000000 -0400
+++ rock-new/package/base/linux26-src/linux26-src.desc 2003-10-25 20:57:13.000000000 -0300
@@ -34,14 +34,13 @@
 [M] Rene Rebe <>

 [C] base/kernel
-[F] DIETLIBC

 [E] group kernel-src

-[O] vanilla_ver="2.6.0-test4"
+[O] vanilla_ver="2.6.0-test9"

 [L] GPL
 [S] Beta 
-[V] 2.6.0-test4
+[V] 2.6.0-test9
 [P] X -1-------9 107.000