Adding ebuild kludgery to get alsa-driver to work with 2.6 kernels. Closes bug #42062.

6 files changed, 64 insertions, 38 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index e17fda225143..ff78fea6c15e 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.74 2004/03/05 03:29:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.75 2004/03/24 03:42:56 eradicator Exp $
+
+  23 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.3.ebuild:
+  Adding ebuild kludgery to get alsa-driver to work with 2.6 kernels. Closes bug
+  #42062.
 
   04 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-0.9.8.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index e475188ae790..a3ada0e5e9d0 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,10 +1,10 @@
-MD5 220461bdfd49bb34c1e5fbaf6364754c alsa-driver-1.0.0_rc2.ebuild 2494
+MD5 ba28cea0621e353315f72e69e4f725e3 alsa-driver-1.0.0_rc2.ebuild 2493
 MD5 3a832f8e243a523db06b78f64496010f alsa-driver-0.5.12a.ebuild 1674
 MD5 5b3c57a23a9a20cf50693dcbd71387e5 alsa-driver-0.9.2.ebuild 2695
-MD5 5e8bf3d068c83a20f7efe95e80dc1608 alsa-driver-1.0.1.ebuild 2507
-MD5 9fefa9bc57a21f8f55e97b261fd3db78 alsa-driver-1.0.3.ebuild 2548
-MD5 1fcfd50be4aa9b12108b880587ca67f1 ChangeLog 12953
-MD5 a1bb7cf38e541ced77768a1e01ab27e4 alsa-driver-1.0.2c.ebuild 2552
+MD5 86fe8db7e7e7e84fd8bbdc7ca883a88c alsa-driver-1.0.1.ebuild 2506
+MD5 a649f50d1f44434e24cdec0e0d863aa4 alsa-driver-1.0.3.ebuild 3265
+MD5 ceefbf37de0034a74652cc8c9911cf2c ChangeLog 13130
+MD5 9b40ed843fca37aab3ffbb4dcf98ccef alsa-driver-1.0.2c.ebuild 2670
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 67c2da5b847168398d251c18c8c6f683 alsa-driver-0.9.0_rc2.ebuild 2664
 MD5 5e31f1bdeec484dd5f15692fac91a864 alsa-driver-0.9.8.ebuild 2377
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild
index 8f3597ee32fa..94eddf7c5cce 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild,v 1.5 2004/02/15 08:22:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild,v 1.6 2004/03/24 03:42:56 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -38,7 +38,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	ewarn "This does not work with kernel 2.6 !!!"
-	ewarn "Please use the kernel modules or alsa-driver-1.0.2c or greater"
+	ewarn "Please use the kernel modules or alsa-driver-1.0.3 or greater"
 	# The makefile still installs an alsasound initscript,
 	# which we REALLY dont want.
 	# This patch stops that
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild
index 70c1d2da7727..c348f94eeae9 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild,v 1.5 2004/02/15 08:22:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild,v 1.6 2004/03/24 03:42:56 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -38,7 +38,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	ewarn "This does not work with kernel 2.6 !!!"
-	ewarn "Please use the kernel modules or alsa-driver-1.0.2c or greater"
+	ewarn "Please use the kernel modules or alsa-driver-1.0.3 or greater"
 	# The makefile still installs an alsasound initscript,
 	# which we REALLY dont want.
 	# This patch stops that
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild
index 686a216bd929..bbd9260fd591 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild,v 1.2 2004/02/15 08:22:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild,v 1.3 2004/03/24 03:42:56 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -37,6 +37,8 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	ewarn "This does not work with kernel 2.6 !!!"
+	ewarn "Please use the kernel modules or alsa-driver-1.0.3 or greater"
 	# The makefile still installs an alsasound initscript,
 	# which we REALLY dont want.
 	# This patch stops that
@@ -87,7 +89,7 @@ pkg_postinst() {
 	einfo "Also, remember that all mixer channels will be MUTED by default."
 	einfo "Use the 'alsamixer' program to unmute them."
 	einfo
-	einfo "Version 1.0.2c and above should work with version 2.6 kernels."
+	einfo "Version 1.0.3 and above should work with version 2.6 kernels."
 	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
 	einfo
 }
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
index 5bd74cdf20a8..74f6d8406349 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild,v 1.1 2004/03/01 08:53:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild,v 1.2 2004/03/24 03:42:56 eradicator Exp $
+
+inherit eutils kernel-mod
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -13,25 +15,25 @@ LICENSE="GPL-2 LGPL-2.1"
 #
 #   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
 #
-[ x"${ALSA_CARDS}" = x ] && ALSA_CARDS=all
+[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
 
 IUSE="oss"
 
-# Need the baselayout 1.7.9 or newer for the init script to work correctly.
-DEPEND="sys-devel/autoconf
-	virtual/glibc
+RDEPEND="virtual/modutils"
+
+DEPEND="${RDEPEND}
 	virtual/linux-sources
-	>=sys-apps/portage-1.9.10
-	>=sys-apps/baselayout-1.7.9"
+	sys-devel/autoconf
+	sys-apps/debianutils"
+
 PROVIDE="virtual/alsa"
 
 SLOT="${KV}"
 KEYWORDS="~x86 ~ppc -sparc ~amd64 ~alpha ~ia64"
 
 MY_P=${P/_rc/rc}
-#SRC_URI="ftp://ftp.alsa-project.org/pub/driver/${MY_P}.tar.bz2"
 SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
-RESTRICT="nomirror"
+RESTRICT="nomirror" # nouserpriv is neccessary for 2.6.x kernels... Hopefully the ALSA guys will figure out another way to do this...
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
@@ -42,28 +44,45 @@ src_unpack() {
 	# This patch stops that
 	epatch ${FILESDIR}/makefile.patch || die "Makefile patch failed"
 	epatch ${FILESDIR}/${PN}-0.9.8-au-fix.patch
-}
 
+	if kernel-mod_is_2_6_kernel || kernel-mod_is_2_5_kernel; then
+		FULL_KERNEL_PATH="${ROOT}/usr/src/${KV_DIR}"
+
+		if ! [ -d "${FULL_KERNEL_PATH}" ]; then
+			eerror "An error seems to have occurred.  We looked in ${FULL_KERNEL_PATH} for your kernel sources, but we didn't see them."
+			die "ALSA driver configuration failure."
+		fi
+
+		einfo "A 2.5 or 2.6 kernel was detected.  We are copying the kernel source tree from"
+		einfo "${FULL_KERNEL_PATH} to ${T}/linux"
+		einfo "because the alsa-driver build process overwrites files in the 2.6.x kernel tree."
+
+		# Copy everything over to our tmp dir...
+		cp -a ${FULL_KERNEL_PATH} ${T}/linux
+	fi
+}
 
 src_compile() {
-	# Portage should determine the version of the kernel sources
-	check_KV
-
-	myconf=""
-	use oss && myconf="$myconf --with-oss=yes" || \
-		myconf="$myconf --with-oss=no"
-
-	./configure \
-		$myconf \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--with-kernel="${ROOT}usr/src/linux" \
+	# Default ARCH & kernel path to set in compilation and make
+	KER_ARCH=${ARCH}
+	KER_DIR=${KERNEL_DIR}
+
+	# If we're using a 2.5 or 2.6 kernel, use our copied kernel tree.
+	if [ -d "${T}/linux" ]; then
+		KER_DIR="${T}/linux"
+
+		# Set the kernel ARCH
+		use x86 && KER_ARCH="i386"
+		use amd64 && KER_ARCH="x86_64"
+	fi
+
+	econf `use_with oss` \
+		--with-kernel="${KER_DIR}" \
 		--with-isapnp=yes \
 		--with-sequencer=yes \
-		--with-cards="${ALSA_CARDS}" \
-		|| die "./configure failed"
+		--with-cards="${ALSA_CARDS}"
 
-	emake || die "Parallel Make Failed"
+	emake ARCH="${KER_ARCH}" || die "Parallel Make Failed"
 }
 
 
@@ -87,7 +106,7 @@ pkg_postinst() {
 	einfo "Also, remember that all mixer channels will be MUTED by default."
 	einfo "Use the 'alsamixer' program to unmute them."
 	einfo
-	einfo "Version 1.0.2c and above should work with version 2.6 kernels."
+	einfo "Version 1.0.3 and above should work with version 2.6 kernels."
 	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
 	einfo
 }