From: Alin Năstac Date: Wed, 6 Dec 2006 16:28:51 +0000 (+0000) Subject: Apply makefile.patch (#157331). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd3608aec3a4c6d1d9668670c059972b3b31f73a;p=gentoo.git Apply makefile.patch (#157331). Package-Manager: portage-2.1.1-r1 --- diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog index 5303121a3480..9736e7ca5c74 100644 --- a/net-dialup/slmodem/ChangeLog +++ b/net-dialup/slmodem/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dialup/slmodem # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.75 2006/12/02 08:23:06 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.76 2006/12/06 16:28:51 mrness Exp $ + +*slmodem-2.9.11_pre20061021-r1 (06 Dec 2006) + + 06 Dec 2006; Alin Nastac + -slmodem-2.9.11_pre20061021.ebuild, +slmodem-2.9.11_pre20061021-r1.ebuild: + Apply makefile.patch (#157331). *slmodem-2.9.11_pre20061021 (02 Dec 2006) diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021-r1 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021-r1 new file mode 100644 index 000000000000..2754331a0334 --- /dev/null +++ b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021-r1 @@ -0,0 +1,6 @@ +MD5 8e1858b0a6d16fce73966759732986ab slmodem-2.9.11-20061021.tar.gz 839050 +RMD160 7f307d5267e2c9ecb165b34ccb0432032122eb6d slmodem-2.9.11-20061021.tar.gz 839050 +SHA256 7516ee6fbf897a1fad5689f4cb6ec03b1b459fc53e72cebd1f641d1a25916c98 slmodem-2.9.11-20061021.tar.gz 839050 +MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872 +RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf ungrab-winmodem.tar.gz 1872 +SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 ungrab-winmodem.tar.gz 1872 diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild new file mode 100644 index 000000000000..25d2d45ac5e3 --- /dev/null +++ b/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild,v 1.1 2006/12/06 16:28:51 mrness Exp $ + +inherit eutils linux-mod multilib + +DESCRIPTION="Driver for Smart Link modem" +HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/" +SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz + http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem.tar.gz" + +LICENSE="Smart-Link" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="alsa usb" + +DEPEND="alsa? ( media-libs/alsa-lib ) + amd64? ( app-emulation/emul-linux-x86-soundlibs )" + +QA_EXECSTACK="usr/sbin/slmodem_test usr/sbin/slmodemd" + +S="${WORKDIR}"/${P/_pre/-} + +pkg_setup() { + use amd64 && multilib_toolchain_setup x86 + + MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)" + if ! use amd64; then + MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)" + if use usb; then + MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)" + CONFIG_CHECK="USB" + fi + fi + BUILD_TARGETS="all" + linux-mod_pkg_setup + BUILD_PARAMS="KERNEL_DIR=${KV_DIR}" +} + +src_unpack() { + unpack ${A} + cd "${WORKDIR}" + sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \ + ungrab-winmodem/Makefile + convert_to_m ungrab-winmodem/Makefile + + epatch "${FILESDIR}/${P%%_*}-kernel-2.6.19.patch" + cd "${S}" + epatch "${FILESDIR}/${P%%_*}-makefile.patch" + + cd "${S}"/drivers + sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile + convert_to_m Makefile + sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c + sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \ + amrmo_init.c old_st7554.c +} + +src_compile() { + local MAKE_PARAMS="" + if use alsa || use amd64; then + MAKE_PARAMS="SUPPORT_ALSA=1" + fi + emake ${MAKE_PARAMS} modem || die "failed to build modem" + + use amd64 && multilib_toolchain_setup amd64 + linux-mod_src_compile +} + +src_install() { + linux-mod_src_install + + cd "${S}" + newsbin modem/modem_test slmodem_test + dosbin modem/slmodemd + dodir /var/lib/slmodem + fowners root:dialout /var/lib/slmodem + keepdir /var/lib/slmodem + + newconfd "${FILESDIR}/slmodem-confd" ${PN} + newinitd "${FILESDIR}/slmodem-initd" ${PN} + + # configure for alsa - or not for alsa + if use alsa; then + sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \ + -e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" "${D}/etc/conf.d/slmodem" + else + sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem" + fi + + + # Add module aliases and install hotplug script + insinto /etc/modules.d/; newins "${FILESDIR}/slmodem-modules" ${PN} + if use usb; then + exeinto /etc/hotplug/usb; newexe "${FILESDIR}/slusb.hotplug" slusb + fi + + dodir /etc/hotplug/blacklist.d + echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${PN}" + + # Add configuration for devfs, udev + if [ -e "${ROOT}/dev/.devfsd" ] ; then + insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN} + elif [ -e "${ROOT}/dev/.udev" ] ; then + dodir /etc/udev/rules.d/ + echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \ + "${D}/etc/udev/rules.d/55-${PN}.rules" + if use usb; then + echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \ + "${D}/etc/udev/rules.d/55-${PN}.rules" + fi + fi + + dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt" +} + +pkg_postinst() { + linux-mod_pkg_postinst + + # Make some devices if we aren't using devfs or udev + if [ -e "${ROOT}/dev/.devfsd" ]; then + ebegin "Restarting devfsd to reread devfs rules" + killall -HUP devfsd + eend $? + + elif [ -e "${ROOT}/dev/.udev" ]; then + ebegin "Restarting udev to reread udev rules" + udevstart + eend $? + else + cd "${S}/drivers" + make DESTDIR="${ROOT}" install-devices + fi + + if [ ! -e "${ROOT}/dev/ppp" ]; then + mknod "${ROOT}/dev/ppp" c 108 0 + fi + + ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist" + einfo "You must edit /etc/conf.d/${PN} for your configuration" + einfo "To add slmodem to your startup - type : rc-update add slmodem default" + + if use alsa; then + einfo "I hope you have already added alsa to your startup: " + einfo "otherwise type: rc-update add alsasound boot" + einfo + einfo "If you need to use snd-intel8x0m from the kernel" + einfo "compile it as a module and edit /etc/modules.d/alsa" + einfo 'to: "alias snd-card-(number) snd-intel8x0m"' + fi + + einfo "You need to be in the uucp AND dialout group to make calls as a user." + einfo + einfo "If you see the following in dmesg:" + echo slamr: device 10b9:5457 is grabbed by driver serial + einfo "you need to modprobe ungrab-winmodem before slamr" +}