Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 302413 - net-dialup/slmodem-2.9.11_pre20090222-r1: migrate /etc/modprobe.d/slmodem to /etc/modprobe.d/slmodem.conf
Summary: net-dialup/slmodem-2.9.11_pre20090222-r1: migrate /etc/modprobe.d/slmodem to ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Gentoo Linux bug wranglers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 274942
  Show dependency tree
 
Reported: 2010-01-27 08:42 UTC by Martin Mokrejš
Modified: 2010-02-18 21:26 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Mokrejš 2010-01-27 08:42:03 UTC
This is tracked in bug #274942.

My machine has in that file for ac97 compatible modem from ICH3-M:

$ cat /etc/modprobe.d/slmodem
blacklist slusb
blacklist slamr
# blacklist snd-intel8x0m
# slmodem 2.9.x kernel modules configuration file

alias char-major-242 slamr
alias char-major-243 slusb
$
Comment 1 Peter Volkov (RETIRED) gentoo-dev 2010-01-27 13:03:16 UTC
Thanks for report. This was fixed some time ago:

*slmodem-2.9.11_pre20090222-r1 (20 Jun 2009)

  20 Jun 2009; Alin Năstac ...
  -slmodem-2.9.11_pre20090222.ebuild, +slmodem-2.9.11_pre20090222-r1.ebuild:
  Add .conf suffix to the installed modprobe.d file (#212257).

See https://bugs.gentoo.org/show_bug.cgi?id=212257#c17 for reference.
Comment 2 Martin Mokrejš 2010-01-27 14:00:02 UTC
Hmm, you are right. Here is the previous ebuild compared to the current one:

# diff -u -w /usr/local/portage/net-dialup/slmodem-/slmodem-2.9.11_pre20090222.ebuild /usr/portage/net-dialup/slmodem/slmodem-2.9.11_pre20090222-r1.ebuild
--- /usr/local/portage/net-dialup/slmodem-/slmodem-2.9.11_pre20090222.ebuild    2009-05-22 21:21:40.000000000 +0200
+++ /usr/portage/net-dialup/slmodem/slmodem-2.9.11_pre20090222-r1.ebuild        2009-06-20 22:48:10.000000000 +0200
@@ -1,10 +1,12 @@
 # Copyright 1999-2009 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_pre20080817.ebuild,v 1.2 2009/03/13 20:09:20 mrness Exp $
+# $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 $
+
+EAPI="2"
 
 inherit eutils linux-mod multilib
 
-UNGRAB_PV="2.9.11-20080126"
+UNGRAB_PV="20080126"
 
 DESCRIPTION="Driver for Smart Link modem"
 HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
@@ -53,10 +55,8 @@
        BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}"
 }
 
-src_unpack() {
-       unpack ${A}
+src_prepare() {
        cd "${WORKDIR}"
-       mv ungrab-winmodem-20080126 ungrab-winmodem-${UNGRAB_PV}
        sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}:" \
                ungrab-winmodem-${UNGRAB_PV}/Makefile
        convert_to_m ungrab-winmodem-${UNGRAB_PV}/Makefile
@@ -113,7 +113,7 @@
 
        # Add module aliases
        insinto /etc/modprobe.d/
-       newins "${FILESDIR}/slmodem-modprobe" ${PN}
+       newins "${FILESDIR}/slmodem-modprobe" ${PN}.conf
 
        # Add configuration for udev
        dodir /etc/udev/rules.d/
@@ -143,7 +143,6 @@
                make DESTDIR="${ROOT}" install-devices
        fi
 
-       ewarn "To avoid problems, slusb/slamr have been blacklisted in /etc/modprobe.d/${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


It seems I did re-emerge slmodem in the meantime but the config file was left in place, instead of being _renamed_. Is that what is expected to happen during the transition?


# diff -u -w /etc/modprobe.d/slmodem /etc/modprobe.d/slmodem.conf
--- /etc/modprobe.d/slmodem     2008-05-26 12:22:58.000000000 +0200
+++ /etc/modprobe.d/slmodem.conf        2009-08-06 13:03:05.000000000 +0200
@@ -1,6 +1,3 @@
-blacklist slusb
-blacklist slamr
-# blacklist snd-intel8x0m
 # slmodem 2.9.x kernel modules configuration file
 
 alias char-major-242 slamr
#
Comment 3 Martin Mokrejš 2010-01-27 14:11:18 UTC
I managed to re-emerge against 2.6.31.12 kernel:
1) the old config lacking ".conf" in its name is still in place
2) I would prefer to get a warning that I should merge the file on my own with 
   the slmodem.conf file just installed
3) The einfo() message does not talk about alsa.conf ;-)


>>> Installing (1 of 1) net-dialup/slmodem-2.9.11_pre20090222-r1
 * Removing net-dialup/slmodem-2.9.11_pre20090222-r1 from moduledb.
 * Updating module dependencies for 2.6.31.12 ...                                                                                                                                                                               [ ok ]
 * Adding module to moduledb.
 * Reloading udev rules... ...                                                                                                                                                                                                  [ ok ]
 * You must edit /etc/conf.d/slmodem for your configuration
 * To add slmodem to your startup - type : rc-update add slmodem default
 * 
 * I hope you have already added alsa to your startup: 
 * otherwise type: rc-update add alsasound boot
 * 
 * If you need to use snd-intel8x0m from the kernel
 * compile it as a module and edit /etc/modules.d/alsa
 * to: "alias snd-card-(number) snd-intel8x0m"
 * 
 * You need to be in the uucp AND dialout group to make calls as a user.
 * 
 * If you see the following in dmesg:
 *     slamr: device 10b9:5457 is grabbed by driver serial
 * you need to modprobe ungrab-winmodem before slamr
Comment 4 Peter Volkov (RETIRED) gentoo-dev 2010-01-27 16:01:38 UTC
I guess old file is common problem for all packages, so we better discuss the in tracker first to find out best solution.
Comment 5 Peter Volkov (RETIRED) gentoo-dev 2010-01-28 19:48:46 UTC
Martin, btw, could you try patch https://bugs.gentoo.org/show_bug.cgi?id=274942#c10 and report if it works for you in that bug? Thanks.
Comment 6 Martin Mokrejš 2010-02-18 21:26:42 UTC
I did re-emerge sys-apps/module-init-tools-3.11.1 and confirm the patches work (the old file got renamed to ._cfg0000_slmodem.conf and is now recognized by etc-update). The only annoyance is that practically you drop ("-" lines) my old settings and present me the defaults at first ("+" lines):

Showing differences between /etc/modprobe.d/slmodem.conf and /etc/modprobe.d/._cfg0000_slmodem.conf
--- /etc/modprobe.d/slmodem.conf        2008-05-26 12:22:58.000000000 +0200
+++ /etc/modprobe.d/._cfg0000_slmodem.conf      2010-02-18 22:07:41.000000000 +0100
@@ -1,6 +1,3 @@
-blacklist slusb
-blacklist slamr
-# blacklist snd-intel8x0m
 # slmodem 2.9.x kernel modules configuration file
 
 alias char-major-242 slamr

Could you add -R to the patch command? ;-) No, that would not work. What I mean is that the default filename would be exchanged with the ._cfg*, hmm, that is ugly, so probably leave this as it is. Just wanted to let you know.