diff options
author | 2008-09-25 20:44:03 +0000 | |
---|---|---|
committer | 2008-09-25 20:44:03 +0000 | |
commit | 6ad9447bf26d2eb1ff70cd5c7714bd05bcad3bd0 (patch) | |
tree | d49bd7d28c5c75d2d35a548ebbe9a4f56b96360f /net-dialup | |
parent | Updated patch to fix bug #238648 reported by Christof Schulze <christof.schul... (diff) | |
download | gentoo-2-6ad9447bf26d2eb1ff70cd5c7714bd05bcad3bd0.tar.gz gentoo-2-6ad9447bf26d2eb1ff70cd5c7714bd05bcad3bd0.tar.bz2 gentoo-2-6ad9447bf26d2eb1ff70cd5c7714bd05bcad3bd0.zip |
Replace udev file prefix 00 with 99 (#233498).
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-dialup')
-rw-r--r-- | net-dialup/hsfmodem/ChangeLog | 8 | ||||
-rw-r--r-- | net-dialup/hsfmodem/files/hsfmodem-7.68.00.13-gentoo.patch | 101 | ||||
-rw-r--r-- | net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild | 82 |
3 files changed, 190 insertions, 1 deletions
diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog index 0dbbd0af3bd8..f0083834afc9 100644 --- a/net-dialup/hsfmodem/ChangeLog +++ b/net-dialup/hsfmodem/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dialup/hsfmodem # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.49 2008/08/01 21:32:37 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.50 2008/09/25 20:44:02 mrness Exp $ + +*hsfmodem-7.68.00.13 (25 Sep 2008) + + 25 Sep 2008; Alin Năstac <mrness@gentoo.org> + +files/hsfmodem-7.68.00.13-gentoo.patch, +hsfmodem-7.68.00.13.ebuild: + Replace udev file prefix 00 with 99 (#233498). *hsfmodem-7.68.00.12 (30 Jul 2008) diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.13-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.13-gentoo.patch new file mode 100644 index 000000000000..9e0480c20a02 --- /dev/null +++ b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.13-gentoo.patch @@ -0,0 +1,101 @@ +diff -ur hsfmodem-7.68.00.13x86_64full.orig/modules/Makefile hsfmodem-7.68.00.13x86_64full/modules/Makefile +--- hsfmodem-7.68.00.13x86_64full.orig/modules/Makefile 2008-09-09 20:27:06.000000000 +0200 ++++ hsfmodem-7.68.00.13x86_64full/modules/Makefile 2008-09-25 22:39:21.000000000 +0200 +@@ -147,7 +147,7 @@ + ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-) + # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package + # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file +-CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n) ++# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n) + endif + + else +Only in hsfmodem-7.68.00.13x86_64full/modules: Makefile.orig +diff -ur hsfmodem-7.68.00.13x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.68.00.13x86_64full/scripts/cnxtconfig.in +--- hsfmodem-7.68.00.13x86_64full.orig/scripts/cnxtconfig.in 2008-09-08 17:26:30.000000000 +0200 ++++ hsfmodem-7.68.00.13x86_64full/scripts/cnxtconfig.in 2008-09-25 22:39:21.000000000 +0200 +@@ -1973,9 +1973,9 @@ + if [ -d /etc/udev/rules.d ]; then + rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules + if [ "@CNXTDRIVER@" = "dgc" ]; then +- echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules ++ echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules + else +- echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules ++ echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules + fi + fi + +diff -ur hsfmodem-7.68.00.13x86_64full.orig/scripts/rccnxt.in hsfmodem-7.68.00.13x86_64full/scripts/rccnxt.in +--- hsfmodem-7.68.00.13x86_64full.orig/scripts/rccnxt.in 2004-11-22 22:59:29.000000000 +0100 ++++ hsfmodem-7.68.00.13x86_64full/scripts/rccnxt.in 2008-09-25 22:39:21.000000000 +0200 +@@ -1,63 +1,12 @@ +-# +-# chkconfig: 2345 09 91 +-# description: @CNXTDRVDSC@ +-# +-### BEGIN INIT INFO +-# Provides: @CNXTTARGET@ +-# Should-Start: hotplug coldplug +-# Required-Start: $local_fs +-# Required-Stop: $network +-# Default-Start: 3 5 +-# Default-Stop: 0 1 2 6 +-# Description: Start @CNXTDRVDSC@ +-### END INIT INFO + +-if [ -e /etc/runlevels ]; then +- begincmd="ebegin" +- endcmd="eend" +-else +- begincmd="echo" +- endcmd="/bin/true" +-fi +- +- +-start() +-{ +- ${begincmd} "Starting @CNXTDRVDSC@" ++start() { ++ ebegin "Starting @CNXTDRVDSC@" + @CNXTSBINDIR@/@CNXTTARGET@config --rcstart +- ${endcmd} 0 ++ eend 0 + } + +-stop() +-{ +- ${begincmd} "Stopping @CNXTDRVDSC@" ++stop() { ++ ebegin "Stopping @CNXTDRVDSC@" + @CNXTSBINDIR@/@CNXTTARGET@config --rcstop +- ${endcmd} 0 ++ eend 0 + } +- +-restart() +-{ +- stop +- start +-} +- +-if [ ! -e /etc/runlevels ]; then +- case "$1" in +- start) +- start +- ;; +- stop) +- stop +- ;; +- restart|force-reload|reload) +- restart +- ;; +- status) +- exit 3 +- ;; +- *) +- echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" +- exit 1 +- ;; +- esac +-fi diff --git a/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild b/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild new file mode 100644 index 000000000000..8c2dca8b6640 --- /dev/null +++ b/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild,v 1.1 2008/09/25 20:44:02 mrness Exp $ + +inherit eutils linux-info + +#The document is the same as in hcfpcimodem, even if it has a different URL +MY_DOC="100498D_RM_HxF_Released.pdf" + +DESCRIPTION="Linuxant's modem driver for Conexant HSF chipset" +HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php" +SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz ) + amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz ) + doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )" + +LICENSE="Conexant" +KEYWORDS="-* ~amd64 ~x86" +IUSE="doc" +SLOT="0" + +DEPEND="dev-lang/perl + app-arch/cpio" + +S="${WORKDIR}" + +pkg_setup() { + linux-info_pkg_setup + if useq x86; then + MY_ARCH_S="${S}/${P}full" + elif useq amd64; then + MY_ARCH_S="${S}/${P}x86_64full" + fi + + local f + QA_EXECSTACK="" + for f in pcibasic2 mc97ich mc97via mc97ali mc97ati mc97sis usbcd2 soar hda engine ; do + QA_EXECSTACK="${QA_EXECSTACK} usr/lib/hsfmodem/modules/imported/hsf${f}-i386.O" + done +} + +src_unpack() { + unpack ${A} + cd "${MY_ARCH_S}" + epatch "${FILESDIR}/${P}-gentoo.patch" +} + +src_compile() { + cd "${MY_ARCH_S}" + emake all || die "make failed" +} + +src_install () { + cd "${MY_ARCH_S}" + make ROOT="${D}" install || die "make install failed" + + # on testing arches, kernelcompiler.sh permissions are 0600 (#158736) + fperms a+rx /usr/lib/hsfmodem/modules/kernelcompiler.sh + + use doc && dodoc "${DISTDIR}/${MY_DOC}" +} + +pkg_preinst() { + local NVMDIR="${ROOT}/etc/${PN}/nvm" + if [ -d "${NVMDIR}" ]; then + einfo "Cleaning ${NVMDIR}..." + rm -rf "${NVMDIR}" + eend + fi +} + +pkg_postinst() { + if [ "${ROOT}" = / ]; then + elog "To complete the installation and configuration of your HSF modem," + elog "please run hsfconfig." + fi +} + +pkg_prerm() { + if [ "${ROOT}" = / -a -f /etc/init.d/hsf ] ; then + hsfconfig --remove || die "hsfconfig --remove failed" + fi +} |