pcmciautils: upgraded to 014, synced with OE

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

2 files changed, 104 insertions, 0 deletions

diff --git a/meta/packages/pcmciautils/pcmciautils-014/makefile_fix.patch b/meta/packages/pcmciautils/pcmciautils-014/makefile_fix.patch
new file mode 100644
index 0000000000..f5bb64b9bd
--- /dev/null
+++ b/meta/packages/pcmciautils/pcmciautils-014/makefile_fix.patch
@@ -0,0 +1,88 @@
+Hardcoded paths are bad...
+
+Index: pcmciautils-014/Makefile
+===================================================================
+--- pcmciautils-014.orig/Makefile       2006-06-01 11:07:52.000000000 +0200
++++ pcmciautils-014/Makefile    2006-10-29 13:50:25.000000000 +0100
+@@ -69,7 +69,7 @@
+ 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}
+--- pcmciautils-014/Makefile~   2007-05-25 19:40:39.000000000 +0200
++++ pcmciautils-014/Makefile    2007-05-25 19:40:39.000000000 +0200
+@@ -258,28 +258,29 @@
+ 
+ install-hotplug:
+        $(INSTALL) -d $(DESTDIR)$(hotplugdir)
+-       $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent
+-       $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc
++       $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent
++       $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc
+ 
+ uninstall-hotplug:
+        - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc
+ 
+ install-socket-hotplug:
+-       $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
+-       $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
++       $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
++       $(INSTALL_PROGRAM)  hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
+ 
+ uninstall-socket-hotplug:
+        - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
+ install-socket-tools:
+-       $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP)
++       $(INSTALL) -d $(DESTDIR)$(sbindir)
++       $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP)
+ 
+ uninstall-socket-tools:
+        - rm -f $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP)
+ 
+ install-tools:
+        $(INSTALL) -d $(DESTDIR)$(sbindir)
+-       $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
+-       $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS)
++       $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
++       $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS)
+        $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA)
+ 
+ uninstall-tools:
+@@ -289,18 +290,20 @@
+ 
+ install-config:
+        $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir)
+-       $(INSTALL_DATA)  -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
++       $(INSTALL_DATA)  config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
+ 
+ uninstall-config:
+ #      - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts
+ 
+ install-udev:
+-       $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
++       $(INSTALL) -d  $(DESTDIR)$(udevrulesdir)
++       $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
+ 
+ uninstall-udev:
+        - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
+ 
+ install-man:
++       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+        $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
+        $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8
+ 
+--- pcmciautils-014/Makefile~   2007-05-25 19:43:01.000000000 +0200
++++ pcmciautils-014/Makefile    2007-05-25 19:43:01.000000000 +0200
+@@ -304,7 +304,7 @@
+ 
+ install-man:
+        $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+-       $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
++       $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
+        $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8
+ 
+ uninstall-man:
diff --git a/meta/packages/pcmciautils/pcmciautils-014/version_workaround.patch b/meta/packages/pcmciautils/pcmciautils-014/version_workaround.patch
new file mode 100644
index 0000000000..962aa4e246
--- /dev/null
+++ b/meta/packages/pcmciautils/pcmciautils-014/version_workaround.patch
@@ -0,0 +1,16 @@
+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 014\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");
+ }