Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 17 years ago
parent
commit
8b38387e3c
3 changed files with 4 additions and 56 deletions
  1. +2
    -2
      package/base/linux/linux.desc
  2. +0
    -52
      package/base/linux/linux26/77-mc146818rtc_h.patch
  3. +2
    -2
      package/base/linux/linux26/82-raid5-niceer-output.patch

+ 2
- 2
package/base/linux/linux.desc

@ -50,8 +50,8 @@
#endif
#if xpkg == linux26.*
[V] 2.6.22.1
[D] 3202303695 linux-2.6.22.1.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
[V] 2.6.23.1
[D] 1833105149 linux-2.6.23.1.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
#endif
[CD] <COPY> for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done

+ 0
- 52
package/base/linux/linux26/77-mc146818rtc_h.patch

@ -1,52 +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/linux/linux26/77-mc146818rtc_h.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- linux-2.6.12.3/include/asm-i386/mc146818rtc.h
+++ linux-2.6.12.3/include/asm-i386/mc146818rtc.h
@@ -5,14 +5,21 @@
#define _ASM_MC146818RTC_H
#include <asm/io.h>
+
+#ifdef __KERNEL__
+
#include <asm/system.h>
#include <linux/mc146818rtc.h>
+#endif /* __KERNEL__ */
+
#ifndef RTC_PORT
#define RTC_PORT(x) (0x70 + (x))
#define RTC_ALWAYS_BCD 1 /* RTC operates in binary mode */
#endif
+#ifdef __KERNEL__
+
#ifdef __HAVE_ARCH_CMPXCHG
/*
* This lock provides nmi access to the CMOS/RTC registers. It has some
@@ -80,6 +87,8 @@
#define current_lock_cmos_reg() 0
#endif
+#endif /* __KERNEL__ */
+
/*
* The yet supported machines all access the RTC index register via
* an ISA port access but the way to access the date register differs ...

+ 2
- 2
package/base/linux/linux26/82-raid5-niceer-output.patch

@ -17,8 +17,8 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./drivers/md/xor.c.orig 2004-08-14 12:55:32.000000000 +0200
+++ ./drivers/md/xor.c 2004-08-17 18:57:24.679307424 +0200
--- ./crypto/xor.c.orig 2004-08-14 12:55:32.000000000 +0200
+++ ./crypto/xor.c 2004-08-17 18:57:24.679307424 +0200
@@ -117,6 +117,8 @@
#ifdef XOR_SELECT_TEMPLATE

Loading…
Cancel
Save