rpms/pcmciautils
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- changed MODALIAS to ENV{MODALIAS} in the rules file

Browse Source
This commit is contained in:
Harald Hoyer 2006-06-19 07:08:15 +00:00
parent 36f51064d5
commit 70a19637b8
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pcmciautils-014-newrules.patch Normal file
View File

@ -0,0 +1,25 @@
--- pcmciautils-014/udev/60-pcmcia.rules.newrules 2006-06-19 09:03:01.000000000 +0200
+++ pcmciautils-014/udev/60-pcmcia.rules 2006-06-19 09:04:08.000000000 +0200
@@ -1,19 +1,19 @@
# PCMCIA devices:
#
# modprobe $modalias loads all possibly appropriate modules
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
RUN+="/sbin/modprobe $modalias"
# Very few CIS firmware entries (which we use for matching)
# are so broken that we need to read out random bytes of it
# instead of the manufactor, card or product ID. Then the
# matching is done in userspace.
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
RUN+="/sbin/pcmcia-check-broken-cis"
# However, the "weak" matching by func_id is only allowed _after_ modprobe
# returns, so that "strong" matches have a higher priority.
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
# PCMCIA sockets:

7
pcmciautils.spec
View File

@ -2,7 +2,7 @@ Name: pcmciautils
Summary: PCMCIA utilities and initialization programs
License: GPL
Version: 014
Release: 2
Release: 3
Group: System Environment/Base
ExclusiveArch: i386 x86_64 ia64 ppc ppc64
Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
@ -13,6 +13,7 @@ BuildRequires: sysfsutils-devel >= 1.3.0
Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
BuildRequires: byacc, flex
Patch1: pcmciautils-fedora.patch
Patch2: pcmciautils-014-newrules.patch
%description
The pcmciautils package contains utilities for initializing and
@ -22,6 +23,7 @@ debugging PCMCIA and Cardbus sockets.
%setup -q
# Fix build peculiarities
%patch1 -p1
%patch1 -p2
%build
make
@ -41,6 +43,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
%{_mandir}/man*/*
%changelog
* Mon Jun 19 2006 Harald Hoyer <harald@redhat.com> - 014-3
- changed MODALIAS to ENV{MODALIAS} in the rules file
* Wed Jun 7 2006 Harald Hoyer <harald@redhat.com> - 014-2
- better buildrequires