From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Mon, 3 Jan 2005 04:23:14 +0000 (+0000)
Subject: Setup default headers to be 2.4 once 2.6 gets merged into linux-headers.  dev profile... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e90d8e7ca238a50546327d4cc50043a0fa50ab5c;p=gentoo.git

Setup default headers to be 2.4 once 2.6 gets merged into linux-headers.  dev profiles use 2.6 still.
---

diff --git a/profiles/default-linux/sparc/packages b/profiles/default-linux/sparc/packages
index 029137a74aca..822d5129d1de 100644
--- a/profiles/default-linux/sparc/packages
+++ b/profiles/default-linux/sparc/packages
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/packages,v 1.11 2004/11/06 18:11:46 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/packages,v 1.12 2005/01/03 04:23:14 eradicator Exp $
 
 # Top-level sparc profile
 
@@ -10,3 +10,6 @@
 # Lock to gcc-3.3.x and allow 3.4 for the testing profile only
 *<sys-devel/gcc-3.4.1
 
+# Use 2.4 linux-headers by default
+-*virtual/os-headers
+*<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc64-multilib/packages b/profiles/default-linux/sparc/sparc64-multilib/packages
index f595a56659f2..1b869fd87cf1 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/packages
+++ b/profiles/default-linux/sparc/sparc64-multilib/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.11 2004/12/31 21:30:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.12 2005/01/03 04:23:14 eradicator Exp $
 
 # Sometimes necessary to trick programs into thinking we're really
 # a sparc32 system.
@@ -9,6 +9,10 @@
 # Our gcc goes in /usr/lib/gcc rather than /usr/lib/gcc-bin
 *>=sys-devel/gcc-config-1.3.7-r5
 
+# We use 2.6 headers
+-*<sys-kernel/linux-headers-2.5
+*<sys-kernel/linux-headers-2.7
+
 # Force toolchain versions that have been tested to work and are multilib aware
 *>=sys-apps/portage-2.0.51-r8
 *>=sys-devel/binutils-2.15.92.0.2-r2
diff --git a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
index 10f0009b2d46..11d1c47e25f7 100644
--- a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
+++ b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages,v 1.3 2004/11/29 12:58:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages,v 1.4 2005/01/03 04:23:14 eradicator Exp $
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
 # we need gcc-sparc64 for kernels.
@@ -15,3 +15,6 @@
 -*<sys-devel/gcc-3.4.1
 *sys-devel/gcc
 
+# We use 2.6 headers           
+-*<sys-kernel/linux-headers-2.5
+*<sys-kernel/linux-headers-2.7