summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch56
-rw-r--r--meta/packages/pcmciautils/pcmciautils_013.bb7
2 files changed, 60 insertions, 3 deletions
diff --git a/meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch b/meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch
new file mode 100644
index 0000000000..5727442b59
--- /dev/null
+++ b/meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch
@@ -0,0 +1,56 @@
1From: Miklos Vajna <vmiklos@frugalware.org>
2Date: Fri, 3 Nov 2006 16:33:38 +0000 (-0500)
3Subject: [PATCH] fix for udev-094
4X-Git-Url: http://git.kernel.org/?p=linux%2Fpcmcia%2Fpcmciautils.git;a=commitdiff_plain;h=3a5217492c1f95711b30f4e27c51563dff6ceb3e
5
6[PATCH] fix for udev-094
7
8from udev's release notes:
9
10"udev 094
11========
12The built-in MODALIAS key and substitution is removed.
13(...)
14udev 080
15========
16(...)
17MODALIAS and $modalias is not needed and will be removed from one of
18the next udev versions, replace it in all rules with ENV{MODALIAS} or
19the sysfs "modalias" value."
20
21here is a patch to fix this issue
22
23Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
24Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
25---
26
27diff --git a/udev/rules-base b/udev/rules-base
28index c6d14de..6ed3a27 100644
29--- a/udev/rules-base
30+++ b/udev/rules-base
31@@ -3,12 +3,12 @@
32 # are so broken that we need to read out random bytes of it
33 # instead of the manufactor, card or product ID. Then the
34 # matching is done in userspace.
35-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
36+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
37 RUN+="/sbin/pcmcia-check-broken-cis"
38
39 # However, the "weak" matching by func_id is only allowed _after_ modprobe
40 # returns, so that "strong" matches have a higher priority.
41-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
42+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
43 RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
44
45 # PCMCIA sockets:
46diff --git a/udev/rules-modprobe b/udev/rules-modprobe
47index ea1f44a..a13b2ad 100644
48--- a/udev/rules-modprobe
49+++ b/udev/rules-modprobe
50@@ -1,3 +1,3 @@
51-# modprobe $modalias loads all possibly appropriate modules
52-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
53- RUN+="/sbin/modprobe $modalias"
54+# modprobe $env{MODALIAS} loads all possibly appropriate modules
55+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
56+ RUN+="/sbin/modprobe $env{MODALIAS}"
diff --git a/meta/packages/pcmciautils/pcmciautils_013.bb b/meta/packages/pcmciautils/pcmciautils_013.bb
index 8f10bb45da..5f4f4641f0 100644
--- a/meta/packages/pcmciautils/pcmciautils_013.bb
+++ b/meta/packages/pcmciautils/pcmciautils_013.bb
@@ -4,13 +4,14 @@ RDEPENDS = "udev module-init-tools"
4HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" 4HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
5SECTION = "kernel/userland" 5SECTION = "kernel/userland"
6PRIORITY = "optional" 6PRIORITY = "optional"
7PR = "r1"
7 8
8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \ 9SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \
9 file://makefile_fix.patch;patch=1 \ 10 file://makefile_fix.patch;patch=1 \
10 file://version_workaround.patch;patch=1" 11 file://version_workaround.patch;patch=1 \
11S = "${WORKDIR}/pcmciautils-${PV}" 12 file://modalias_update.patch;patch=1"
12 13
13PR = "r0" 14S = "${WORKDIR}/pcmciautils-${PV}"
14 15
15export HOSTCC = "${BUILD_CC}" 16export HOSTCC = "${BUILD_CC}"
16export etcdir = "${sysconfdir}" 17export etcdir = "${sysconfdir}"