summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-12-27 05:14:38 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-12-27 05:14:38 +0000
commit5768e2baac369a21ae9fd58370ae62f893e44273 (patch)
tree597670123f688239735b40982f58a0c36ea943c0 /sys-kernel
parentBump to version 0.99.3. This closes bug #75359. Thanks to James Stockton fo... (diff)
downloadgentoo-2-5768e2baac369a21ae9fd58370ae62f893e44273.tar.gz
gentoo-2-5768e2baac369a21ae9fd58370ae62f893e44273.tar.bz2
gentoo-2-5768e2baac369a21ae9fd58370ae62f893e44273.zip
Remove some sparc stuff from global scope. Exclude some patches on sparc that add features we can't use. Excluding Kconfig patch for sparc32 as it broke (my bad... will be fixed soon).
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/gentoo-dev-sources/ChangeLog8
-rw-r--r--sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild17
2 files changed, 21 insertions, 4 deletions
diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index 28330b5fe493..b426f5d2121e 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-kernel/gentoo-dev-sources
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.158 2004/12/26 09:53:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.159 2004/12/27 05:14:38 eradicator Exp $
+
+ 26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ gentoo-dev-sources-2.6.10-r1.ebuild:
+ Remove some sparc stuff from global scope. Exclude some patches on sparc
+ that add features we can't use. Excluding Kconfig patch for sparc32 as it
+ broke (my bad... will be fixed soon).
26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-gentoo-dev-sources-2.6.7-r10.ebuild,
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild
index efd10425d822..8b73bf6be32c 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild
@@ -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/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild,v 1.3 2004/12/26 09:43:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild,v 1.4 2004/12/27 05:14:38 eradicator Exp $
ETYPE="sources"
inherit kernel-2
@@ -26,8 +26,19 @@ SRC_URI="${KERNEL_URI} ${GPV_SRC} ${ARCH_URI}"
DEPEND="${DEPEND} >=dev-libs/ucl-1"
IUSE="ultra1"
-use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
-use sparc && UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 4905_speakup-20041020.patch"
+
+pkg_setup() {
+ if use sparc; then
+ # hme lockup hack on ultra1
+ use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
+
+ # sparc32's Kconfig is broken by this patch... It'll be fixed soon, but use vanilla for now.
+ [ "${PROFILE_ARCH}" = "sparc" ] && UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1362_sparc-kconfig-rework.patch 1363_sparc-kconfig-driver-rework.patch"
+
+ # Don't include features that don't work on sparc
+ UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 4300_evms-dm-bbr.patch 4305_dm-multipath.patch 4306_dm-mp-version.patch 4500_fbsplash-0.9.1.patch 4905_speakup-20041020.patch"
+ fi
+}
pkg_postinst() {
postinst_sources