mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

pcmciautils: added patch (from git) to not use MODALIAS in rules as it is deprecated since udev 080

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1997 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2007-06-26 08:15:10 +00:00
parent 38062aa45c
commit 80c6eb0761
2 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch Normal file
View File

@@ -0,0 +1,56 @@
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 3 Nov 2006 16:33:38 +0000 (-0500)
Subject: [PATCH] fix for udev-094
X-Git-Url: http://git.kernel.org/?p=linux%2Fpcmcia%2Fpcmciautils.git;a=commitdiff_plain;h=3a5217492c1f95711b30f4e27c51563dff6ceb3e
[PATCH] fix for udev-094
from udev's release notes:
"udev 094
========
The built-in MODALIAS key and substitution is removed.
(...)
udev 080
========
(...)
MODALIAS and $modalias is not needed and will be removed from one of
the next udev versions, replace it in all rules with ENV{MODALIAS} or
the sysfs "modalias" value."
here is a patch to fix this issue
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
diff --git a/udev/rules-base b/udev/rules-base
index c6d14de..6ed3a27 100644
--- a/udev/rules-base
+++ b/udev/rules-base
@@ -3,12 +3,12 @@
# 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:
diff --git a/udev/rules-modprobe b/udev/rules-modprobe
index ea1f44a..a13b2ad 100644
--- a/udev/rules-modprobe
+++ b/udev/rules-modprobe
@@ -1,3 +1,3 @@
-# modprobe $modalias loads all possibly appropriate modules
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
- RUN+="/sbin/modprobe $modalias"
+# modprobe $env{MODALIAS} loads all possibly appropriate modules
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
+ RUN+="/sbin/modprobe $env{MODALIAS}"

7
meta/packages/pcmciautils/pcmciautils_013.bb
View File

@@ -4,13 +4,14 @@ RDEPENDS = "udev module-init-tools"
HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
SECTION = "kernel/userland"
PRIORITY = "optional"
PR = "r1"
SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \
file://makefile_fix.patch;patch=1 \
file://version_workaround.patch;patch=1"
S = "${WORKDIR}/pcmciautils-${PV}"
file://version_workaround.patch;patch=1 \
file://modalias_update.patch;patch=1"
PR = "r0"
S = "${WORKDIR}/pcmciautils-${PV}"
export HOSTCC = "${BUILD_CC}"
export etcdir = "${sysconfdir}"