Browse Source

Alejandro Mery <amery@geeks.cl>:

linux26-test9: patches adapted


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1637 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Alejandro Mery 21 years ago
parent
commit
f1cd301675
7 changed files with 24 additions and 78 deletions
  1. +1
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +2
    -2
      package/base/linux26-header/linux26-header.desc
  3. +2
    -3
      package/base/linux26-src/linux26-src.desc
  4. +1
    -1
      package/base/linux26/05-devfs-not-exp.patch
  5. +14
    -15
      package/base/linux26/12-conf-hacks.patch
  6. +0
    -53
      package/base/linux26/arch-ppc-smp-hotfix.patch
  7. +4
    -4
      package/base/linux26/linux26.desc

+ 1
- 0
Documentation/Developers/CHANGELOG-RENE

@ -2,6 +2,7 @@
*) 2003-10-26 (2.0.0-rc2 - 2.0.0-rc3)
- added nxcomp and nxproxy
- Alejandro Mery: updated linux26 (2.6.0-test9)
*) 2003-10-21 (2.0.0-rc2 - 2.0.0-rc3)

+ 2
- 2
package/base/linux26-header/linux26-header.desc

@ -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

+ 2
- 3
package/base/linux26-src/linux26-src.desc

@ -34,14 +34,13 @@
[M] Rene Rebe <rene@rocklinux.org>
[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

+ 1
- 1
package/base/linux26/05-devfs-not-exp.patch

@ -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

+ 14
- 15
package/base/linux26/12-conf-hacks.patch

@ -26,29 +26,28 @@ configuration.
Initally written by Clifford Wold <clifford@clifford.at> and adapted
for various new 2.5/2.6 kernels by Rene Rebe <rene.rebe@gmx.net>.
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'

+ 0
- 53
package/base/linux26/arch-ppc-smp-hotfix.patch

@ -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 http://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 <rene@rocklinux.org>
--- 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 */

+ 4
- 4
package/base/linux26/linux26.desc

@ -32,16 +32,16 @@
[M] Rene Rebe <rene@rocklinux.org>
[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/

|||||||
100:0
Loading…
Cancel
Save