diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
| commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
| tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/pcmciautils/pcmciautils-013 | |
| parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
| download | openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.bz2 openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.zip | |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/pcmciautils/pcmciautils-013')
| -rw-r--r-- | meta/packages/pcmciautils/pcmciautils-013/makefile_fix.patch | 20 | ||||
| -rw-r--r-- | meta/packages/pcmciautils/pcmciautils-013/version_workaround.patch | 16 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/packages/pcmciautils/pcmciautils-013/makefile_fix.patch b/meta/packages/pcmciautils/pcmciautils-013/makefile_fix.patch new file mode 100644 index 0000000000..a45f9e20e3 --- /dev/null +++ b/meta/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/meta/packages/pcmciautils/pcmciautils-013/version_workaround.patch b/meta/packages/pcmciautils/pcmciautils-013/version_workaround.patch new file mode 100644 index 0000000000..ff34e139b3 --- /dev/null +++ b/meta/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"); + } |