[patch] slmodem-2.9.11_pre20070505.ebuild.diff

slmodem-2.9.11_pre20070505.ebuild.diff (text/plain), 3.31 KB, created by Jakub Moc (RETIRED) on 2007-05-15 19:14:19 UTC

--- slmodem-2.9.11_pre20061021-r2.ebuild	2007-05-06 10:35:52.000000000 +0200
+++ slmodem-2.9.11_pre20070505.ebuild	2007-05-15 21:04:50.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r2.ebuild,v 1.2 2007/05/06 08:12:57 genone Exp $
+# $Header: $
 
 inherit eutils linux-mod multilib
 
@@ -44,10 +44,13 @@
 		ungrab-winmodem/Makefile
 	convert_to_m ungrab-winmodem/Makefile
 
-	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.19.patch"
+	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
+	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
@@ -90,59 +93,42 @@
 
 
 	# Add module aliases and install hotplug script
-	insinto /etc/modules.d/; newins "${FILESDIR}/slmodem-modules" ${PN}
+	insinto /etc/modules.d/
+	newins "${FILESDIR}/slmodem-modules-r1" ${PN}
 	if use usb; then
-		exeinto /etc/hotplug/usb; newexe "${FILESDIR}/slusb.hotplug" slusb
+		exeinto /lib/udev/
+		newexe "${FILESDIR}/slusb-udev.script" slmodem_usb.sh
 	fi
 
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${PN}"
+	dodir /etc/modprobe.d
+	echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/modprobe.d/blacklist-${PN}"
 
 	# Add configuration for devfs, udev
-	insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN}
 	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"' >> \
+		echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout" RUN+="/lib/udev/slmodem_usb.sh"' >> \
 			 "${D}/etc/udev/rules.d/55-${PN}.rules"
 	fi
 
 	dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt"
 }
 
-pkg_preinst() {
-	linux-mod_pkg_preinst
-
-	# Remove obsolete devfs configuration files if the box use udev
-	if [ -e "${ROOT}/dev/.udev" ]; then
-		rm -r "${D}/etc/devfs.d"
-	fi
-}
-
 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
+	if [ -e "${ROOT}/dev/.udev" ]; then
+		ebegin "Reloading udev rules..."
+			udevcontrol reload_rules && udevtrigger
 		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"
+	ewarn "To avoid problems, slusb/slamr have been added to /etc/modprobe.d/blacklist-${PN}"
 	elog "You must edit /etc/conf.d/${PN} for your configuration"
 	elog "To add slmodem to your startup - type : rc-update add slmodem default"
 	elog
@@ -162,4 +148,5 @@
 	elog "If you see the following in dmesg:"
 	elog "    slamr: device 10b9:5457 is grabbed by driver serial"
 	elog "you need to modprobe ungrab-winmodem before slamr"
+	elog "See /etc/modules.d/slmodem for details."
 }