pcmciautils: upgraded to 014, synced with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1998 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 0 insertions, 92 deletions

diff --git a/meta/packages/pcmciautils/pcmciautils-013/makefile_fix.patch b/meta/packages/pcmciautils/pcmciautils-013/makefile_fix.patch
deleted file mode 100644
index a45f9e20e..000000000
--- a/meta/packages/pcmciautils/pcmciautils-013/makefile_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Hardcoded paths are bad...
-
-Index: pcmciautils-013/Makefile
-===================================================================
---- pcmciautils-013.orig/Makefile	2006-03-26 11:56:41.000000000 +0100
-+++ pcmciautils-013/Makefile	2006-05-09 22:10:16.000000000 +0100
-@@ -69,11 +69,11 @@
- mandir =	${prefix}/usr/share/man
- srcdir = .
- 
--INSTALL = /usr/bin/install -c
-+INSTALL = install -c
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_DATA  = ${INSTALL} -m 644
- INSTALL_SCRIPT = ${INSTALL_PROGRAM}
--SYMLINK = /usr/bin/ln -sf
-+SYMLINK = ln -sf
- 
- # place to put our hotplug scripts nodes
- hotplugdir =	${etcdir}/hotplug
diff --git a/meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch b/meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch
deleted file mode 100644
index 5727442b5..000000000
--- a/meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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}"
diff --git a/meta/packages/pcmciautils/pcmciautils-013/version_workaround.patch b/meta/packages/pcmciautils/pcmciautils-013/version_workaround.patch
deleted file mode 100644
index ff34e139b..000000000
--- a/meta/packages/pcmciautils/pcmciautils-013/version_workaround.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly 
-under arm gcc 3.4.x so we work around it.
-
-Index: pcmciautils-013/src/pccardctl.c
-===================================================================
---- pcmciautils-013.orig/src/pccardctl.c	2006-03-26 11:56:41.000000000 +0100
-+++ pcmciautils-013/src/pccardctl.c	2006-05-09 22:11:09.000000000 +0100
-@@ -350,7 +350,7 @@
- }
- 
- static void print_header(void) {
--	printf("pcmciautils %s\n", PCMCIAUTILS_VERSION);
-+	printf("pcmciautils 013\n");
- 	printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n");
- 	printf("Report errors and bugs to <linux-pcmcia@lists.infradead.org>, please.\n");
- }