| 1 |
mrness 09/06/20 20:48:11 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: slmodem-2.9.11_pre20090222-r1.ebuild |
| 5 |
Removed: slmodem-2.9.11_pre20090222.ebuild |
| 6 |
Log: |
| 7 |
Add .conf suffix to the installed modprobe.d file (#212257). |
| 8 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.102 net-dialup/slmodem/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/slmodem/ChangeLog?rev=1.102&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/slmodem/ChangeLog?rev=1.102&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/slmodem/ChangeLog?r1=1.101&r2=1.102 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v |
| 20 |
retrieving revision 1.101 |
| 21 |
retrieving revision 1.102 |
| 22 |
diff -u -r1.101 -r1.102 |
| 23 |
--- ChangeLog 20 Jun 2009 09:25:15 -0000 1.101 |
| 24 |
+++ ChangeLog 20 Jun 2009 20:48:10 -0000 1.102 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for net-dialup/slmodem |
| 27 |
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.101 2009/06/20 09:25:15 mrness Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.102 2009/06/20 20:48:10 mrness Exp $ |
| 30 |
+ |
| 31 |
+*slmodem-2.9.11_pre20090222-r1 (20 Jun 2009) |
| 32 |
+ |
| 33 |
+ 20 Jun 2009; Alin Năstac <mrness@g.o> |
| 34 |
+ -slmodem-2.9.11_pre20090222.ebuild, +slmodem-2.9.11_pre20090222-r1.ebuild: |
| 35 |
+ Add .conf suffix to the installed modprobe.d file (#212257). |
| 36 |
|
| 37 |
*slmodem-2.9.11_pre20090222 (20 Jun 2009) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 net-dialup/slmodem/slmodem-2.9.11_pre20090222-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20090222-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20090222-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: slmodem-2.9.11_pre20090222-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2009 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20090222-r1.ebuild,v 1.1 2009/06/20 20:48:10 mrness Exp $ |
| 52 |
|
| 53 |
EAPI="2" |
| 54 |
|
| 55 |
inherit eutils linux-mod multilib |
| 56 |
|
| 57 |
UNGRAB_PV="20080126" |
| 58 |
|
| 59 |
DESCRIPTION="Driver for Smart Link modem" |
| 60 |
HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/" |
| 61 |
SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz |
| 62 |
http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-${UNGRAB_PV}.tar.gz" |
| 63 |
|
| 64 |
LICENSE="Smart-Link" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="-* ~amd64 ~x86" |
| 67 |
IUSE="alsa usb" |
| 68 |
|
| 69 |
DEPEND="alsa? ( media-libs/alsa-lib ) |
| 70 |
amd64? ( app-emulation/emul-linux-x86-soundlibs )" |
| 71 |
|
| 72 |
RDEPEND="${DEPEND} |
| 73 |
virtual/logger" |
| 74 |
|
| 75 |
QA_EXECSTACK="usr/sbin/slmodem_test usr/sbin/slmodemd" |
| 76 |
|
| 77 |
S="${WORKDIR}"/${P/_pre/-} |
| 78 |
|
| 79 |
pkg_setup() { |
| 80 |
use amd64 && multilib_toolchain_setup x86 |
| 81 |
|
| 82 |
MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})" |
| 83 |
CONFIG_CHECK="" |
| 84 |
MY_SLMODULES="" |
| 85 |
if ! use amd64; then |
| 86 |
MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)" |
| 87 |
MY_SLMODULES="${MY_SLMODULES} slamr.o" |
| 88 |
fi |
| 89 |
if kernel_is ge 2 6 25; then |
| 90 |
if use usb; then |
| 91 |
ewarn "slusb module will not be installed because is not compatible with kernels >=2.6.25" |
| 92 |
fi |
| 93 |
elif use usb; then |
| 94 |
MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)" |
| 95 |
CONFIG_CHECK="${CONFIG_CHECK} USB" |
| 96 |
MY_SLMODULES="${MY_SLMODULES} slusb.o" |
| 97 |
fi |
| 98 |
BUILD_TARGETS="all" |
| 99 |
if kernel_is ge 2 6 24; then |
| 100 |
CONFIG_CHECK="${CONFIG_CHECK} PCI_LEGACY" |
| 101 |
fi |
| 102 |
linux-mod_pkg_setup |
| 103 |
BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}" |
| 104 |
} |
| 105 |
|
| 106 |
src_prepare() { |
| 107 |
cd "${WORKDIR}" |
| 108 |
sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}:" \ |
| 109 |
ungrab-winmodem-${UNGRAB_PV}/Makefile |
| 110 |
convert_to_m ungrab-winmodem-${UNGRAB_PV}/Makefile |
| 111 |
|
| 112 |
cd "${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}" |
| 113 |
epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch |
| 114 |
|
| 115 |
cd "${S}" |
| 116 |
epatch "${FILESDIR}/${P%%_*}-makefile-r1.patch" |
| 117 |
|
| 118 |
cd "${S}"/drivers |
| 119 |
sed -i -e "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \ |
| 120 |
-e "s|^obj-m:=.*$|obj-m:=${MY_SLMODULES}|" \ |
| 121 |
Makefile |
| 122 |
convert_to_m Makefile |
| 123 |
sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c |
| 124 |
sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \ |
| 125 |
amrmo_init.c old_st7554.c |
| 126 |
} |
| 127 |
|
| 128 |
src_compile() { |
| 129 |
local MAKE_PARAMS="" |
| 130 |
if use alsa; then |
| 131 |
MAKE_PARAMS="SUPPORT_ALSA=1" |
| 132 |
fi |
| 133 |
emake ${MAKE_PARAMS} modem || die "failed to build modem" |
| 134 |
|
| 135 |
use amd64 && multilib_toolchain_setup amd64 |
| 136 |
linux-mod_src_compile |
| 137 |
} |
| 138 |
|
| 139 |
src_install() { |
| 140 |
linux-mod_src_install |
| 141 |
|
| 142 |
cd "${S}" |
| 143 |
newsbin modem/modem_test slmodem_test |
| 144 |
dosbin modem/slmodemd |
| 145 |
dodir /var/lib/slmodem |
| 146 |
fowners root:dialout /var/lib/slmodem |
| 147 |
keepdir /var/lib/slmodem |
| 148 |
|
| 149 |
newconfd "${FILESDIR}/slmodem-confd" ${PN} |
| 150 |
newinitd "${FILESDIR}/slmodem-initd" ${PN} |
| 151 |
|
| 152 |
# configure for alsa - or not for alsa |
| 153 |
if use alsa; then |
| 154 |
sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \ |
| 155 |
-e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" "${D}/etc/conf.d/slmodem" |
| 156 |
elif use usb; then |
| 157 |
sed -i "s/# MODULE=slusb/MODULE=slusb/" "${D}/etc/conf.d/slmodem" |
| 158 |
else |
| 159 |
sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem" |
| 160 |
fi |
| 161 |
|
| 162 |
# Add module aliases |
| 163 |
insinto /etc/modprobe.d/ |
| 164 |
newins "${FILESDIR}/slmodem-modprobe" ${PN}.conf |
| 165 |
|
| 166 |
# Add configuration for udev |
| 167 |
dodir /etc/udev/rules.d/ |
| 168 |
echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \ |
| 169 |
"${D}/etc/udev/rules.d/55-${PN}.rules" |
| 170 |
if use usb; then |
| 171 |
exeinto /$(get_libdir)/udev |
| 172 |
newexe "${FILESDIR}/slusb-udev.script" slmodem_usb.sh |
| 173 |
echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout" RUN+="slmodem_usb.sh"' >> \ |
| 174 |
"${D}/etc/udev/rules.d/55-${PN}.rules" |
| 175 |
fi |
| 176 |
|
| 177 |
dodoc Changes README |
| 178 |
newdoc "${WORKDIR}"/ungrab-winmodem-${UNGRAB_PV}/Readme.txt README-ungrab-winmodem.txt |
| 179 |
} |
| 180 |
|
| 181 |
pkg_postinst() { |
| 182 |
linux-mod_pkg_postinst |
| 183 |
|
| 184 |
# Make some devices if we aren't using devfs or udev |
| 185 |
if [ -e "${ROOT}/dev/.udev" ]; then |
| 186 |
ebegin "Reloading udev rules..." |
| 187 |
udevadm control --reload-rules |
| 188 |
eend $? |
| 189 |
else |
| 190 |
cd "${S}/drivers" |
| 191 |
make DESTDIR="${ROOT}" install-devices |
| 192 |
fi |
| 193 |
|
| 194 |
elog "You must edit /etc/conf.d/${PN} for your configuration" |
| 195 |
elog "To add slmodem to your startup - type : rc-update add slmodem default" |
| 196 |
elog |
| 197 |
|
| 198 |
if use alsa; then |
| 199 |
elog "I hope you have already added alsa to your startup: " |
| 200 |
elog "otherwise type: rc-update add alsasound boot" |
| 201 |
elog |
| 202 |
elog "If you need to use snd-intel8x0m from the kernel" |
| 203 |
elog "compile it as a module and edit /etc/modules.d/alsa" |
| 204 |
elog 'to: "alias snd-card-(number) snd-intel8x0m"' |
| 205 |
elog |
| 206 |
fi |
| 207 |
|
| 208 |
elog "You need to be in the uucp AND dialout group to make calls as a user." |
| 209 |
elog |
| 210 |
elog "If you see the following in dmesg:" |
| 211 |
elog " slamr: device 10b9:5457 is grabbed by driver serial" |
| 212 |
elog "you need to modprobe ungrab-winmodem before slamr" |
| 213 |
} |
Archives