Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2000-11-22 21:25:18 +0000
committerDaniel Robbins <drobbins@gentoo.org>2000-11-22 21:25:18 +0000
commite53b113e3f03cddaec9cca5fecc629106879b685 (patch)
treebfc91e075922a75d10e431fbc6b73f33ebd7e037
parentrc-update fix and new webtools (diff)
downloadhistorical-e53b113e3f03cddaec9cca5fecc629106879b685.tar.gz
historical-e53b113e3f03cddaec9cca5fecc629106879b685.tar.bz2
historical-e53b113e3f03cddaec9cca5fecc629106879b685.zip
kernel updates
Diffstat
-rw-r--r--sys-kernel/linux-sources/files/2.4.0_rc10/linux-sources-2.4.0_rc10.autoconf (renamed from sys-kernel/linux-sources/files/linux-sources-2.4.10_rc10.autoconf)0
-rw-r--r--sys-kernel/linux-sources/files/2.4.0_rc10/linux-sources-2.4.0_rc10.config (renamed from sys-kernel/linux-sources/files/linux-sources-2.4.10_rc10.config)0
-rw-r--r--sys-kernel/linux-sources/files/digest-linux-sources-2.4.10_rc109
-rw-r--r--sys-kernel/linux-sources/linux-sources-2.4.0_rc10-r1.ebuild (renamed from sys-kernel/linux-sources/linux-sources-2.4.10_rc10.ebuild)13
-rw-r--r--sys-kernel/linux/files/2.4.0_rc10/linux-2.4.0_rc10.autoconf (renamed from sys-kernel/linux/files/linux-2.4.10_rc10.autoconf)0
-rw-r--r--sys-kernel/linux/files/2.4.0_rc10/linux-2.4.0_rc10.config (renamed from sys-kernel/linux/files/linux-2.4.10_rc10.config)0
-rw-r--r--sys-kernel/linux/files/digest-linux-2.4.10_rc109
-rw-r--r--sys-kernel/linux/linux-2.4.0_rc10-r1.ebuild (renamed from sys-kernel/linux/linux-2.4.10_rc10.ebuild)13
8 files changed, 20 insertions, 24 deletions
diff --git a/sys-kernel/linux-sources/files/linux-sources-2.4.10_rc10.autoconf b/sys-kernel/linux-sources/files/2.4.0_rc10/linux-sources-2.4.0_rc10.autoconf
index a93b70337b72..a93b70337b72 100644
--- a/sys-kernel/linux-sources/files/linux-sources-2.4.10_rc10.autoconf
+++ b/sys-kernel/linux-sources/files/2.4.0_rc10/linux-sources-2.4.0_rc10.autoconf
diff --git a/sys-kernel/linux-sources/files/linux-sources-2.4.10_rc10.config b/sys-kernel/linux-sources/files/2.4.0_rc10/linux-sources-2.4.0_rc10.config
index f4fbf51382c8..f4fbf51382c8 100644
--- a/sys-kernel/linux-sources/files/linux-sources-2.4.10_rc10.config
+++ b/sys-kernel/linux-sources/files/2.4.0_rc10/linux-sources-2.4.0_rc10.config
diff --git a/sys-kernel/linux-sources/files/digest-linux-sources-2.4.10_rc10 b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.10_rc10
deleted file mode 100644
index 0ada5ec263a1..000000000000
--- a/sys-kernel/linux-sources/files/digest-linux-sources-2.4.10_rc10
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 8f281617879cf79c44561fb8fb90caec linux-2.4.0-test8.tar.bz2
-MD5 33f1208d6b07e42937de92b0be14fc99 linux-2.4.0-test9-reiserfs-3.6.18-patch.gz
-MD5 3878cd9f9f9e45bddb625dd4059e7e32 patch-2.4.0-test9.bz2
-MD5 3fb3759c30a51bf230a231815413d433 patch-2.4.0-test10.bz2
-MD5 039fb223e361d343e8d40c54f0a317e6 i2c-2.5.4.tar.gz
-MD5 c16f3df6b5f9e56b146071edfa5ec5d4 lm_sensors-2.5.4.tar.gz
-MD5 b2cf95e1189e63b44e6f7ae7fc27ae19 jfs-0.0.18-patch.tar.gz
-MD5 5d4983ad745464954aa770196167ad06 alsa-driver-0.5.9d.tar.bz2
-MD5 130d1e7bf56eda1a93a831189b4c6420 NVIDIA_kernel-0.9-5.tar.gz
diff --git a/sys-kernel/linux-sources/linux-sources-2.4.10_rc10.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.0_rc10-r1.ebuild
index 3e0288f73300..a2fa164be4e4 100644
--- a/sys-kernel/linux-sources/linux-sources-2.4.10_rc10.ebuild
+++ b/sys-kernel/linux-sources/linux-sources-2.4.0_rc10-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.10_rc10.ebuild,v 1.3 2000/11/20 16:47:18 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.0_rc10-r1.ebuild,v 1.1 2000/11/22 21:25:18 drobbins Exp $
A="linux-2.4.0-test8.tar.bz2 linux-2.4.0-test9-reiserfs-3.6.18-patch.gz
patch-2.4.0-test9.bz2 patch-2.4.0-test10.bz2
@@ -65,6 +65,13 @@ src_unpack() {
unpack alsa-driver-0.5.9d.tar.bz2
echo "Unpacking NVidia drivers..."
unpack NVIDIA_kernel-0.9-5.tar.gz
+ cd NVIDIA_kernel-0.9-5
+ # this is a little fix to make the NVidia drivers compile right with test10
+ mv nv.c nv.c.orig
+ echo '#define mem_map_inc_count(p) atomic_inc(&(p->count))' > nv.c
+ echo '#define mem_map_dec_count(p) atomic_dec(&(p->count))' >> nv.c
+ cat nv.c.orig >> nv.c
+ cd ${S}/extras
for x in lm_sensors i2c
do
echo "Unpacking and applying $x patch..."
@@ -78,8 +85,8 @@ src_unpack() {
echo "Preparing for compilation..."
cd ${S}
#this is the configuration for the bootdisk/cd
- cp ${FILESDIR}/${P}.config .config
- cp ${FILESDIR}/${P}.autoconf include/linux/autoconf.h
+ cp ${FILESDIR}/${PV}/${P}.config .config
+ cp ${FILESDIR}/${PV}/${P}.autoconf include/linux/autoconf.h
try make include/linux/version.h
try make symlinks
try make dep
diff --git a/sys-kernel/linux/files/linux-2.4.10_rc10.autoconf b/sys-kernel/linux/files/2.4.0_rc10/linux-2.4.0_rc10.autoconf
index a93b70337b72..a93b70337b72 100644
--- a/sys-kernel/linux/files/linux-2.4.10_rc10.autoconf
+++ b/sys-kernel/linux/files/2.4.0_rc10/linux-2.4.0_rc10.autoconf
diff --git a/sys-kernel/linux/files/linux-2.4.10_rc10.config b/sys-kernel/linux/files/2.4.0_rc10/linux-2.4.0_rc10.config
index f4fbf51382c8..f4fbf51382c8 100644
--- a/sys-kernel/linux/files/linux-2.4.10_rc10.config
+++ b/sys-kernel/linux/files/2.4.0_rc10/linux-2.4.0_rc10.config
diff --git a/sys-kernel/linux/files/digest-linux-2.4.10_rc10 b/sys-kernel/linux/files/digest-linux-2.4.10_rc10
deleted file mode 100644
index 0ada5ec263a1..000000000000
--- a/sys-kernel/linux/files/digest-linux-2.4.10_rc10
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 8f281617879cf79c44561fb8fb90caec linux-2.4.0-test8.tar.bz2
-MD5 33f1208d6b07e42937de92b0be14fc99 linux-2.4.0-test9-reiserfs-3.6.18-patch.gz
-MD5 3878cd9f9f9e45bddb625dd4059e7e32 patch-2.4.0-test9.bz2
-MD5 3fb3759c30a51bf230a231815413d433 patch-2.4.0-test10.bz2
-MD5 039fb223e361d343e8d40c54f0a317e6 i2c-2.5.4.tar.gz
-MD5 c16f3df6b5f9e56b146071edfa5ec5d4 lm_sensors-2.5.4.tar.gz
-MD5 b2cf95e1189e63b44e6f7ae7fc27ae19 jfs-0.0.18-patch.tar.gz
-MD5 5d4983ad745464954aa770196167ad06 alsa-driver-0.5.9d.tar.bz2
-MD5 130d1e7bf56eda1a93a831189b4c6420 NVIDIA_kernel-0.9-5.tar.gz
diff --git a/sys-kernel/linux/linux-2.4.10_rc10.ebuild b/sys-kernel/linux/linux-2.4.0_rc10-r1.ebuild
index fa01c6e2cafb..b51c3316a8e0 100644
--- a/sys-kernel/linux/linux-2.4.10_rc10.ebuild
+++ b/sys-kernel/linux/linux-2.4.0_rc10-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.10_rc10.ebuild,v 1.1 2000/11/20 16:47:18 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.0_rc10-r1.ebuild,v 1.1 2000/11/22 21:25:18 drobbins Exp $
A="linux-2.4.0-test8.tar.bz2 linux-2.4.0-test9-reiserfs-3.6.18-patch.gz
patch-2.4.0-test9.bz2 patch-2.4.0-test10.bz2
@@ -65,6 +65,13 @@ src_unpack() {
unpack alsa-driver-0.5.9d.tar.bz2
echo "Unpacking NVidia drivers..."
unpack NVIDIA_kernel-0.9-5.tar.gz
+ cd NVIDIA_kernel-0.9-5
+ # this is a little fix to make the NVidia drivers compile right with test10
+ mv nv.c nv.c.orig
+ echo '#define mem_map_inc_count(p) atomic_inc(&(p->count))' > nv.c
+ echo '#define mem_map_dec_count(p) atomic_dec(&(p->count))' >> nv.c
+ cat nv.c.orig >> nv.c
+ cd ${S}/extras
for x in lm_sensors i2c
do
echo "Unpacking and applying $x patch..."
@@ -78,8 +85,8 @@ src_unpack() {
echo "Preparing for compilation..."
cd ${S}
#this is the configuration for the bootdisk/cd
- cp ${FILESDIR}/${P}.config .config
- cp ${FILESDIR}/${P}.autoconf include/linux/autoconf.h
+ cp ${FILESDIR}/${PV}/${P}.config .config
+ cp ${FILESDIR}/${PV}/${P}.autoconf include/linux/autoconf.h
try make include/linux/version.h
try make symlinks
try make dep