6 files changed, 98 insertions, 28 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 a45f9e20e3..0000000000
--- 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-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-013/version_workaround.patch b/meta/packages/pcmciautils/pcmciautils-014/version_workaround.patch
index ff34e139b3..962aa4e246 100644
--- a/meta/packages/pcmciautils/pcmciautils-013/version_workaround.patch
+++ b/meta/packages/pcmciautils/pcmciautils-014/version_workaround.patch
@@ -10,7 +10,7 @@ Index: pcmciautils-013/src/pccardctl.c
  
  static void print_header(void) {
 -       printf("pcmciautils %s\n", PCMCIAUTILS_VERSION);
-+       printf("pcmciautils 013\n");
++       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");
  }
diff --git a/meta/packages/pcmciautils/pcmciautils_013.bb b/meta/packages/pcmciautils/pcmciautils.inc
index 5f4f4641f0..1df39549dc 100644
--- a/meta/packages/pcmciautils/pcmciautils_013.bb
+++ b/meta/packages/pcmciautils/pcmciautils.inc
@@ -1,15 +1,11 @@
 DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
-DEPENDS = "sysfsutils udev module-init-tools"
+DEPENDS = "sysfsutils"
 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 \
-           file://modalias_update.patch;patch=1"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
 
 S = "${WORKDIR}/pcmciautils-${PV}"
 
@@ -21,7 +17,6 @@ export udevrulesdir = "${sysconfdir}/udev/rules.d"
 export UDEV = "1"
 LD = "${CC}"
 CFLAGS =+ "-I${S}/src"
-CFLAGS =+ '-DPCMCIAUTILS_VERSION=013'
 
 PARALLEL_MAKE = ""
 EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'"
diff --git a/meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch b/meta/packages/pcmciautils/pcmciautils/modalias_update.patch
index 5727442b59..5727442b59 100644
--- a/meta/packages/pcmciautils/pcmciautils-013/modalias_update.patch
+++ b/meta/packages/pcmciautils/pcmciautils/modalias_update.patch
diff --git a/meta/packages/pcmciautils/pcmciautils_014.bb b/meta/packages/pcmciautils/pcmciautils_014.bb
new file mode 100644
index 0000000000..72a78b0780
--- /dev/null
+++ b/meta/packages/pcmciautils/pcmciautils_014.bb
@@ -0,0 +1,7 @@
+require pcmciautils.inc
+
+PR = "r1"
+
+SRC_URI += "file://makefile_fix.patch;patch=1 \
+            file://version_workaround.patch;patch=1 \
+            file://modalias_update.patch;patch=1"