From: Roy Marples Date: Tue, 13 Mar 2007 18:26:49 +0000 (+0000) Subject: New init script works with non bash shells. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=558a35223b3e30c054f5c827e2f4637f6fbdbd2f;p=gentoo.git New init script works with non bash shells. Package-Manager: portage-2.1.2.2 --- diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index c42de7d72493..83a77519eae8 100644 --- a/media-sound/alsa-utils/ChangeLog +++ b/media-sound/alsa-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/alsa-utils # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.196 2007/02/18 14:00:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.197 2007/03/13 18:26:49 uberlord Exp $ + +*alsa-utils-1.0.14_rc2-r2 (13 Mar 2007) + + 13 Mar 2007; Roy Marples +files/alsasound.initd, + +alsa-utils-1.0.14_rc2-r2.ebuild: + New init script works with non bash shells. 18 Feb 2007; Diego Pettenò files/alsasound-init-20070218: diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index 528f6dcf7bb2..1e8752747ae6 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX alsa-modules.conf-rc 1028 RMD160 7d0a1ebde9eac035b030d9e8f61ede35198f0ada SHA1 72f200a491acdbd4304a78e4334f18cd9f606908 SHA256 f2174cbd3536eaaf1968f4e0e0f644731503a3ad2226ee176676d9d1fb79fe07 MD5 60c1ed26ca121888de61bb61699a61cc files/alsa-modules.conf-rc 1028 RMD160 7d0a1ebde9eac035b030d9e8f61ede35198f0ada files/alsa-modules.conf-rc 1028 @@ -29,6 +26,10 @@ AUX alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 SHA1 6d5 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 files/alsasound.confd 515 SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827 files/alsasound.confd 515 +AUX alsasound.initd 6307 RMD160 8fa6cad465e1b29e2d92a353e76b26faa426f137 SHA1 7f1caf0a4d0a490c3a657e43f231422fe37580cf SHA256 60045efe6a71a1108d704258e512b06c4781a04b465d06d7b5439b1874db29d7 +MD5 9a3976f5d74f8f95741da92854c430ea files/alsasound.initd 6307 +RMD160 8fa6cad465e1b29e2d92a353e76b26faa426f137 files/alsasound.initd 6307 +SHA256 60045efe6a71a1108d704258e512b06c4781a04b465d06d7b5439b1874db29d7 files/alsasound.initd 6307 DIST alsa-utils-1.0.11.tar.bz2 990018 RMD160 17da9d3743a70352ae448569fbeb2f2aab3e78b0 SHA1 abc890763afb5c4e9d5a3b4a1649a0145368d389 SHA256 4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b DIST alsa-utils-1.0.12.tar.bz2 979797 RMD160 26ff9d4fed31bdecbfeb65b09ef52c05aecba733 SHA1 ea43e407ae50ec50a00679d79c86909f895f632c SHA256 a2fb425ee6b824f2442d38ce14ce630ae8332b1f4a6eeb45bee1c0cafac725a8 DIST alsa-utils-1.0.13.tar.bz2 980874 RMD160 2a3cd882543232f81e211d216c9e8112da3f8977 SHA1 05b460a0e7ae6519ea37240476f026b59dbc710d SHA256 d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0 @@ -54,14 +55,18 @@ EBUILD alsa-utils-1.0.14_rc2-r1.ebuild 2271 RMD160 7448a8ada8af57566883bf77b8833 MD5 1fce62685902f8816c67b72b46996256 alsa-utils-1.0.14_rc2-r1.ebuild 2271 RMD160 7448a8ada8af57566883bf77b883347ac183f71d alsa-utils-1.0.14_rc2-r1.ebuild 2271 SHA256 a86d2a5ab768b68b029e705a4dc1929f2ec628ef5dc44d78b62f0adf3cec88aa alsa-utils-1.0.14_rc2-r1.ebuild 2271 +EBUILD alsa-utils-1.0.14_rc2-r2.ebuild 2262 RMD160 9af437a34ecd98401cb123a914c745c0ef83bb50 SHA1 0b828c2001a241086ddc6ce0e816232dc1d0ec2b SHA256 faf54c74838c0b3df94e7c35873f4338a51cccea53970620fc0ea22c2f876342 +MD5 69bd13f88bcb92a2d494cdc205ec1307 alsa-utils-1.0.14_rc2-r2.ebuild 2262 +RMD160 9af437a34ecd98401cb123a914c745c0ef83bb50 alsa-utils-1.0.14_rc2-r2.ebuild 2262 +SHA256 faf54c74838c0b3df94e7c35873f4338a51cccea53970620fc0ea22c2f876342 alsa-utils-1.0.14_rc2-r2.ebuild 2262 EBUILD alsa-utils-1.0.14_rc2.ebuild 3025 RMD160 0fdafd51671c8b60e0fed78adac5d197677ddca3 SHA1 5e90bd71552166f5e12db46324ac988386923789 SHA256 3b36bd45c61657c96f82f168f299ce6c754abbb16a213dfa94325209896bd2ef MD5 5ccd9fda3711bbbc3c718c5b1a0b3830 alsa-utils-1.0.14_rc2.ebuild 3025 RMD160 0fdafd51671c8b60e0fed78adac5d197677ddca3 alsa-utils-1.0.14_rc2.ebuild 3025 SHA256 3b36bd45c61657c96f82f168f299ce6c754abbb16a213dfa94325209896bd2ef alsa-utils-1.0.14_rc2.ebuild 3025 -MISC ChangeLog 29443 RMD160 2f481d1497916670fe8407ce3ade99144a2b7bb7 SHA1 4125032583ccfdb947af34f84bc776d76476b229 SHA256 2f88d47ff2570e41f9ffc78a8e84d1e733715cc6784c68612e6113af8db7af57 -MD5 ee0be0a8810d573aac55d00f29c9c733 ChangeLog 29443 -RMD160 2f481d1497916670fe8407ce3ade99144a2b7bb7 ChangeLog 29443 -SHA256 2f88d47ff2570e41f9ffc78a8e84d1e733715cc6784c68612e6113af8db7af57 ChangeLog 29443 +MISC ChangeLog 29639 RMD160 201c1b5f3ccb0e040e910908c12fea2506c0055c SHA1 d85da88159cfdccc6c44766d41b8ae205c09c05f SHA256 b621a47f4c914755db88fc7d0dd1b9e0043a965fd791c5f32533fb20966993eb +MD5 19f8541c9f6b7289e330913835ae71a7 ChangeLog 29639 +RMD160 201c1b5f3ccb0e040e910908c12fea2506c0055c ChangeLog 29639 +SHA256 b621a47f4c914755db88fc7d0dd1b9e0043a965fd791c5f32533fb20966993eb ChangeLog 29639 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220 @@ -84,10 +89,6 @@ SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/di MD5 353bea327d899275d0d9c7addde48a99 files/digest-alsa-utils-1.0.14_rc2-r1 265 RMD160 fb49ddc8d34d96b51008565f020638b4dc742958 files/digest-alsa-utils-1.0.14_rc2-r1 265 SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/digest-alsa-utils-1.0.14_rc2-r1 265 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF2FwgAiZjviIA2XgRAksdAKCgKQ3mNCiwATmlq6NnTSC8j6466ACaA5zc -weJYouYVxxp3xNKwY3UfNng= -=SyLg ------END PGP SIGNATURE----- +MD5 353bea327d899275d0d9c7addde48a99 files/digest-alsa-utils-1.0.14_rc2-r2 265 +RMD160 fb49ddc8d34d96b51008565f020638b4dc742958 files/digest-alsa-utils-1.0.14_rc2-r2 265 +SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/digest-alsa-utils-1.0.14_rc2-r2 265 diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r2.ebuild new file mode 100644 index 000000000000..8ab0144b2b77 --- /dev/null +++ b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r2.ebuild,v 1.1 2007/03/13 18:26:49 uberlord Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils autotools + +MY_P="${P/_rc/rc}" + +DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" +HOMEPAGE="http://www.alsa-project.org/" +SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0.9" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="nls midi" + +DEPEND=">=sys-libs/ncurses-5.1 + dev-util/dialog + >=media-libs/alsa-lib-1.0.14_rc1" +RDEPEND="${DEPEND} + virtual/modutils + sys-apps/pciutils" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "" + eerror "To be able to build alsa-utils with midi support you need" + eerror "to have built media-libs/alsa-lib with midi USE flag." + die "Missing midi USE flag on media-libs/alsa-lib" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch" + epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch" + epatch "${FILESDIR}/${P}-seq.patch" + + AT_M4DIR="m4" eautoreconf +} + +src_compile() { + econf \ + $(use_enable nls) \ + $(use_enable midi sequencer) \ + || die "configure failed" + + emake || die "make failed" +} + +src_install() { + local ALSA_UTILS_DOCS="ChangeLog README TODO + seq/aconnect/README.aconnect + seq/aseqnet/README.aseqnet" + + emake DESTDIR="${D}" install || die "Installation Failed" + + dodoc ${ALSA_UTILS_DOCS} + newdoc alsamixer/README README.alsamixer + + newinitd "${FILESDIR}/alsasound.initd" alsasound + newconfd "${FILESDIR}/alsasound.confd" alsasound + insinto /etc/modules.d + newins "${FILESDIR}/alsa-modules.conf-rc" alsa + + keepdir /var/lib/alsa +} + +pkg_postinst() { + echo + elog "To take advantage of the init script, and automate the process of" + elog "loading and unloading the ALSA sound drivers as well as" + elog "storing and restoring sound-card mixer levels you should" + elog "add alsasound to the boot runlevel. You can do this as" + elog "root like so:" + elog " # rc-update add alsasound boot" + echo +} diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd new file mode 100644 index 000000000000..f8f13819f27c --- /dev/null +++ b/media-sound/alsa-utils/files/alsasound.initd @@ -0,0 +1,231 @@ +#!/sbin/runscript +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.1 2007/03/13 18:26:49 uberlord Exp $ +# Copyright 2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +alsastatedir=/var/lib/alsa +alsascrdir=/etc/alsa.d + +opts="save restore" + +depend() { + need localmount + after bootmmisc modules isapnp coldplug hotplug +} + +load_modules() { + # List of drivers for each card. + local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]+\) .*/\1/p')" + + # Fall back on the automated aliases if we don't have ALSA configured properly... + if [ -z "${DRIVERS}" ] && \ + ( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then + ewarn "Could not detect custom ALSA settings. Loading all detected alsa drivers." + DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)" + if [ -z "${DRIVERS}" ] ; then + eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" + fi + fi + + if [ "${ENABLE_OSS_EMUL}" = "yes" ] ; then + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.*oss/ s:\/.*\/\(.*\).ko:\1:p')" + fi + + # We want to ensure snd-seq is loaded as it is needed for things like + # timidity even if we don't use a real sequencer. + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.seq\./ s:\/.*\/\(.*\).ko:\1:p')" + + # We want to ensure snd-ioctl32 is loaded as it is needed for 32bit + # compatibility + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.ioctl32\./ s:\/.*\/\(.*\).ko:\1:p')" + + local DRIVER= DMOD= + for DRIVER in ${DRIVERS} ; do + [ "${DRIVER}" = "off" ] && continue + DMOD="$(echo "${DRIVER}" | sed -e 's/-/_/g')" + if ! grep -q "^${DMOD} " /proc/modules ; then + ebegin "Loading: ${DRIVER}" + modprobe ${DRIVER} + eend $? + fi + done + + if [ -f /proc/asound/seq/drivers ] ; then + local SEQUENCERS="$(sed -n -e 's/\([^,]*\),empty,.*/\1/p' /proc/asound/seq/drivers)" + local SEQUENCER + for SEQUENCER in ${SEQUENCERS} ; do + DMOD="$(echo "${SEQUENCER}" | sed -e 's/-/_/g')" + if ! grep -q "^${DMOD} " /proc/modules ; then + ebegin "Loading: ${SEQUENCER}" + modprobe ${SEQUENCER} + eend $? + fi + done + fi + + for DRIVER in ${DRIVERS} + do + local TMP=${DRIVER##snd-} + TMP=${TMP##snd_} + if [ -x "${alsascrdir}/${TMP}" ] ; then + ebegin "Running: ${alsascrdir}/${TMP}" + "${alsascrdir}/${TMP}" + eend $? + fi + done + + if [ ! -d /proc/asound ] || grep -q ' no soundcards ' /proc/asound/cards ; then + eerror "ERROR: Failed to load necessary drivers" + return 1 + fi +} + +unload_modules_24() { + local LOADED_MODULES="$(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p')" + local MODULE + for MODULE in ${LOADED_MODULES} ; do + rmmod "${MODULE}" + done + rmmod soundcore 2>/dev/null + rmmod gameport 2>/dev/null + + lsmod | grep -vq '^snd' +} + +unload_modules_recursive() { + local revdeps="$(lsmod | sed -n -e "s/,/ /g" -e "s/^$1 *[0-9]* *[0-9]* \(.*\)/\1/p")" + + for module in ${revdeps} ; do + unload_modules_recursive "${module}" + done + + vebegin "Unloading: $1" + rmmod --wait "$1" + veend $? +} + +unload_modules_26() { + # First of all, remove the snd module and all the modules depending + # on it, this should remove already most of ALSA modules. + unload_modules_recursive snd + + # Then find the remaining ones, and handle them too. + for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do + unload_modules_recursive "${module}" + done + + lsmod | grep -vq '^snd' +} + +terminate() { + # + # Kill processes holding open sound devices + # + # DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*` + local ossdevs="/dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \ + /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi0* /dev/mixer* /dev/music \ + /dev/patmgr* /dev/sequencer* /dev/sndstat" + local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*" + fuser -k ${ossdevs} ${alsadevs} >/dev/null 2>/dev/null + + # remove all sequencer connections if any + [ -f /proc/asound/seq/clients ] && type aconnect >/dev/null 2>/dev/null && aconnect --removeall +} + +restore() { + ebegin "Restoring Mixer Levels" + + if [ ! -r "${alsastatedir}/asound.state" ] ; then + ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" + eend 0 + return 0 + fi + + local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" + local CARDNUM + for cardnum in ${cards}; do + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + alsactl -f "${alsastatedir}/asound.state" restore ${cardnum} \ + || ewarn "Errors while restoring defaults, ignoring" + done + + for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do + # We use cat because I'm not sure if cp works properly on /proc + local procfile=${ossfile##${alsastatedir}/oss} + procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" + if [ -e /proc/asound/"${procfile}"/oss ] ; then + cat "${ossfile}" > /proc/asound/"${procfile}"/oss + fi + done + + eend 0 +} + +save() { + ebegin "Storing ALSA Mixer Levels" + + mkdir -p "${alsastatedir}" + if ! alsactl -f "${alsastatedir}/asound.state" store; then + eerror "Error saving levels." + eend 1 + return 1 + fi + + for ossfile in /proc/asound/card*/pcm*/oss; do + local device=${ossfile##/proc/asound/} ; device=${device%%/oss} + device="$(echo "${device}" | sed -e 's,/,_,g')" + mkdir -p "${alsastatedir}/oss/" + cp "${ossfile}" "${alsastatedir}/oss/${device}" + done + + eend 0 +} + +start() { + if [ -f /proc/modules ] ; then + ebegin "Loading ALSA modules" + eindent + load_modules + eoutdent + eend $? || return 1 + fi + + if [ ! -d /proc/asound ]; then + eerror "ALSA failed to load." + eend 1 + return 1 + fi + + [ "${RESTORE_ON_START}" = "yes" ] && restore + + return 0 +} + +stop() { + if [ ! -d /proc/asound ] ; then + eerror "ALSA is not loaded" + return 0 + fi + + [ "${SAVE_ON_STOP}" = "yes" ] && save + + ebegin "Killing processes using ALSA" + terminate + eend 0 + + if [ -f /proc/modules ]; then + local ver="24" + rmmod --version | grep -q module-init-tools && ver="26" + + ebegin "Unloading ALSA modules" + eindent + unload_modules_${ver} + eend $? + eoutdent + fi + + return 0 +} diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r2 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r2 new file mode 100644 index 000000000000..8db4c3f3529e --- /dev/null +++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r2 @@ -0,0 +1,3 @@ +MD5 7e9f132b34b7773d2a29b0ff14719a49 alsa-utils-1.0.14rc2.tar.bz2 981123 +RMD160 9975bc5c71df585ad1818647a1abb2be68910403 alsa-utils-1.0.14rc2.tar.bz2 981123 +SHA256 306bd7c4436c1c56a0a499317e23b5b58aea3718df17c138ab0df56fd9bf3e0c alsa-utils-1.0.14rc2.tar.bz2 981123