From 40d485aa5fde39413f6e1720d4437c7dbc8cd6e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 6 Dec 2006 17:03:08 +0000 Subject: [PATCH] Double-check the ALSA_CARDS variable by checking that the requested drivers are supported by the ebuild and they are available on the architecture. Package-Manager: portage-2.1.2_rc2-r5 --- media-sound/alsa-driver/ChangeLog | 7 ++- media-sound/alsa-driver/Manifest | 22 ++++----- .../alsa-driver-1.0.14_pre20061130.ebuild | 45 +++++++++---------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog index 34e2acd6cf2e..21a8625c1f49 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.240 2006/12/06 11:43:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.241 2006/12/06 17:03:08 flameeyes Exp $ + + 06 Dec 2006; Diego Pettenò + alsa-driver-1.0.14_pre20061130.ebuild: + Double-check the ALSA_CARDS variable by checking that the requested drivers + are supported by the ebuild and they are available on the architecture. 06 Dec 2006; Diego Pettenò alsa-driver-1.0.14_pre20061130.ebuild: diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest index bdf8bd7e3c6b..ed57132722d1 100644 --- a/media-sound/alsa-driver/Manifest +++ b/media-sound/alsa-driver/Manifest @@ -46,18 +46,18 @@ EBUILD alsa-driver-1.0.13.ebuild 5160 RMD160 abad5a48b406673f2a8fa62a41415fe4342 MD5 50ff8f799846587b055c416226461783 alsa-driver-1.0.13.ebuild 5160 RMD160 abad5a48b406673f2a8fa62a41415fe434299338 alsa-driver-1.0.13.ebuild 5160 SHA256 497b820de807f9c3812b2e33dc117a9be8f3bbe00db67e31f2800775cdd9e95a alsa-driver-1.0.13.ebuild 5160 -EBUILD alsa-driver-1.0.14_pre20061130.ebuild 6505 RMD160 ce0689d8ea6247c3a8628d541c9fe9aed95cad97 SHA1 62044056121f74ecb872af428b9722ea0ed8c90d SHA256 47db73f481f397d9c1b842d7908bc6cc82f888bf89b485ebd5035e311e0a0a7e -MD5 4a373322d9d4324f7cba2ea87bcbb915 alsa-driver-1.0.14_pre20061130.ebuild 6505 -RMD160 ce0689d8ea6247c3a8628d541c9fe9aed95cad97 alsa-driver-1.0.14_pre20061130.ebuild 6505 -SHA256 47db73f481f397d9c1b842d7908bc6cc82f888bf89b485ebd5035e311e0a0a7e alsa-driver-1.0.14_pre20061130.ebuild 6505 +EBUILD alsa-driver-1.0.14_pre20061130.ebuild 6442 RMD160 110ec7d9241d8555b1a8bd2e0f83918614a1f3f0 SHA1 734f09593358488147a37ab16a2e2e48de381125 SHA256 bf3d50db96c19a4c0d75f6272d3fea80eb34fd5af341e0330ab81feffeebda20 +MD5 65acb4f8a70d72df9f9779e6719ee33f alsa-driver-1.0.14_pre20061130.ebuild 6442 +RMD160 110ec7d9241d8555b1a8bd2e0f83918614a1f3f0 alsa-driver-1.0.14_pre20061130.ebuild 6442 +SHA256 bf3d50db96c19a4c0d75f6272d3fea80eb34fd5af341e0330ab81feffeebda20 alsa-driver-1.0.14_pre20061130.ebuild 6442 EBUILD alsa-driver-9999.ebuild 4939 RMD160 ffc8cdac211e2136904639fe54c9aca242c3d7a9 SHA1 7fcb2126ef4c538a3128c954172652283310bf99 SHA256 92c3eea9df5cc7a53049d601098f0f296a01dd7f69e76ad1b874c2e9896ad22c MD5 c34a52c4d50bc207111ac34f68f82cdb alsa-driver-9999.ebuild 4939 RMD160 ffc8cdac211e2136904639fe54c9aca242c3d7a9 alsa-driver-9999.ebuild 4939 SHA256 92c3eea9df5cc7a53049d601098f0f296a01dd7f69e76ad1b874c2e9896ad22c alsa-driver-9999.ebuild 4939 -MISC ChangeLog 41422 RMD160 357016851e55214ec595d4106a3f73eae77adae6 SHA1 586a325740eb9fac67ea7a186e0b8d829ebf7ebe SHA256 6c7e4928ccfe036d3ef339f968d37fb3afdc6fece54148cbc2417d42c125976e -MD5 1cca64688f19e5a8c2b3a8a1f9efa412 ChangeLog 41422 -RMD160 357016851e55214ec595d4106a3f73eae77adae6 ChangeLog 41422 -SHA256 6c7e4928ccfe036d3ef339f968d37fb3afdc6fece54148cbc2417d42c125976e ChangeLog 41422 +MISC ChangeLog 41669 RMD160 9888333a1f40f824730b6a2087c9312af98d9277 SHA1 f6db7a77abaf675a023f37aa1162aa8d93583919 SHA256 0134fa9384c46f4460693dbe0bb7fa7875d7df51a96f4961db7350f0ae9cc295 +MD5 2000d3e8b949d732cf2363174bca6cbe ChangeLog 41669 +RMD160 9888333a1f40f824730b6a2087c9312af98d9277 ChangeLog 41669 +SHA256 0134fa9384c46f4460693dbe0bb7fa7875d7df51a96f4961db7350f0ae9cc295 ChangeLog 41669 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220 @@ -83,7 +83,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFdq0FAiZjviIA2XgRApo3AKC3cE9a1nIHWo+/n9r7hlXCO5lESACgkL3X -sINeNDg3RyWh5Jovqhp5gU4= -=hMrV +iD8DBQFFdvfdAiZjviIA2XgRAuUrAKC5BXKh2avEfwzw/uRdQ+ARxqv0iwCgwdCP +7XLTxxK/7Ct+24tzA4xWUWM= +=fOiW -----END PGP SIGNATURE----- diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild index 52d16a8b7d99..a397d1b5365b 100644 --- a/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild +++ b/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild,v 1.2 2006/12/06 11:43:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild,v 1.3 2006/12/06 17:03:08 flameeyes Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -58,7 +58,13 @@ pkg_setup() { # # env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver # - ALSA_CARDS=${ALSA_CARDS:-all} + ALSA_CARDS=${ALSA_CARDS:-${IUSE_ALSA_CARDS}} + + local TMP_ALSA_CARDS + for card in ${ALSA_CARDS}; do + has alsa_cards_${card} ${IUSE} && use alsa_cards_${card} && TMP_ALSA_CARDS="${TMP_ALSA_CARDS} ${card}" + done + ALSA_CARDS="${TMP_ALSA_CARDS}" # Which drivers need PNP local PNP_DRIVERS="interwave interwave-stb" @@ -71,29 +77,18 @@ pkg_setup() { local PNP_ERROR="Some of the drivers you selected require PnP support in your kernel (${PNP_DRIVERS}). Either enable PnP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf." local FW_LOADER_ERROR="Some of the drivers you selected require 'Userspace firmware loading support' in your kernel (${FW_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf." - if [[ "${ALSA_CARDS}" == "all" ]]; then - # Ignore PNP checks for ppc architecture, as PNP can't be enabled there. - case ${ARCH} in - ppc|ppc64) ;; - *) - CONFIG_CHECK="${CONFIG_CHECK} PNP" - ;; - esac - CONFIG_CHECK="${CONFIG_CHECK} FW_LOADER" - else - for pnpdriver in ${PNP_DRIVERS}; do - if use alsa_cards_${pnpdriver}; then - CONFIG_CHECK="${CONFIG_CHECK} PNP" - break; - fi - done - for fwdriver in ${FW_DRIVERS}; do - if use alsa_cards_${fwdriver}; then - CONFIG_CHECK="${CONFIG_CHECK} FW_LOADER" - break; - fi - done - fi + for pnpdriver in ${PNP_DRIVERS}; do + if use alsa_cards_${pnpdriver}; then + CONFIG_CHECK="${CONFIG_CHECK} PNP" + break; + fi + done + for fwdriver in ${FW_DRIVERS}; do + if use alsa_cards_${fwdriver}; then + CONFIG_CHECK="${CONFIG_CHECK} FW_LOADER" + break; + fi + done linux-mod_pkg_setup -- 2.26.2