summaryrefslogtreecommitdiff
path: root/packages/pcmciautils/pcmciautils-013
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-05-09 21:23:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-09 21:23:55 +0000
commite40b22d0624ef5fcba85ccd1c2d067f6f13449ab (patch)
tree72f82f1145c669a605bed8630cc93e8cc7eeaddb /packages/pcmciautils/pcmciautils-013
parent83143fcd0fe903b86d8c803934529de4f7ae826d (diff)
Add pcmciautils 013 including patches to remove hardcoded paths and a workaround for the toolchain bug that causes pccardctl to segfault
Diffstat (limited to 'packages/pcmciautils/pcmciautils-013')
-rw-r--r--packages/pcmciautils/pcmciautils-013/.mtn2git_empty0
-rw-r--r--packages/pcmciautils/pcmciautils-013/makefile_fix.patch20
-rw-r--r--packages/pcmciautils/pcmciautils-013/version_workaround.patch16
3 files changed, 36 insertions, 0 deletions
diff --git a/packages/pcmciautils/pcmciautils-013/.mtn2git_empty b/packages/pcmciautils/pcmciautils-013/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-013/.mtn2git_empty
diff --git a/packages/pcmciautils/pcmciautils-013/makefile_fix.patch b/packages/pcmciautils/pcmciautils-013/makefile_fix.patch
new file mode 100644
index 0000000000..a45f9e20e3
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-013/makefile_fix.patch
@@ -0,0 +1,20 @@
+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/packages/pcmciautils/pcmciautils-013/version_workaround.patch b/packages/pcmciautils/pcmciautils-013/version_workaround.patch
new file mode 100644
index 0000000000..ff34e139b3
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-013/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 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");
+ }