diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-06-26 08:42:16 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-06-26 08:42:16 +0000 |
commit | 3abd842df0b0fce1960ff8db216f7076b07af7eb (patch) | |
tree | 3658290d6cd7623b7b59da4ae51ee3cbceb98ddf /meta/packages/pcmciautils/pcmciautils-014 | |
parent | 80c6eb07610e8eed91afaa5ded84596e12b10fc4 (diff) | |
download | poky-3abd842df0b0fce1960ff8db216f7076b07af7eb.tar.gz |
pcmciautils: upgraded to 014, synced with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1998 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/pcmciautils/pcmciautils-014')
-rw-r--r-- | meta/packages/pcmciautils/pcmciautils-014/makefile_fix.patch | 88 | ||||
-rw-r--r-- | meta/packages/pcmciautils/pcmciautils-014/version_workaround.patch | 16 |
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 @@ | |||
1 | Hardcoded paths are bad... | ||
2 | |||
3 | Index: pcmciautils-014/Makefile | ||
4 | =================================================================== | ||
5 | --- pcmciautils-014.orig/Makefile 2006-06-01 11:07:52.000000000 +0200 | ||
6 | +++ pcmciautils-014/Makefile 2006-10-29 13:50:25.000000000 +0100 | ||
7 | @@ -69,7 +69,7 @@ | ||
8 | mandir = ${prefix}/usr/share/man | ||
9 | srcdir = . | ||
10 | |||
11 | -INSTALL = /usr/bin/install -c | ||
12 | +INSTALL = install -c | ||
13 | INSTALL_PROGRAM = ${INSTALL} | ||
14 | INSTALL_DATA = ${INSTALL} -m 644 | ||
15 | INSTALL_SCRIPT = ${INSTALL_PROGRAM} | ||
16 | --- pcmciautils-014/Makefile~ 2007-05-25 19:40:39.000000000 +0200 | ||
17 | +++ pcmciautils-014/Makefile 2007-05-25 19:40:39.000000000 +0200 | ||
18 | @@ -258,28 +258,29 @@ | ||
19 | |||
20 | install-hotplug: | ||
21 | $(INSTALL) -d $(DESTDIR)$(hotplugdir) | ||
22 | - $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent | ||
23 | - $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc | ||
24 | + $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent | ||
25 | + $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc | ||
26 | |||
27 | uninstall-hotplug: | ||
28 | - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc | ||
29 | |||
30 | install-socket-hotplug: | ||
31 | - $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent | ||
32 | - $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc | ||
33 | + $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent | ||
34 | + $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc | ||
35 | |||
36 | uninstall-socket-hotplug: | ||
37 | - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc | ||
38 | install-socket-tools: | ||
39 | - $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) | ||
40 | + $(INSTALL) -d $(DESTDIR)$(sbindir) | ||
41 | + $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) | ||
42 | |||
43 | uninstall-socket-tools: | ||
44 | - rm -f $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) | ||
45 | |||
46 | install-tools: | ||
47 | $(INSTALL) -d $(DESTDIR)$(sbindir) | ||
48 | - $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) | ||
49 | - $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS) | ||
50 | + $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) | ||
51 | + $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS) | ||
52 | $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA) | ||
53 | |||
54 | uninstall-tools: | ||
55 | @@ -289,18 +290,20 @@ | ||
56 | |||
57 | install-config: | ||
58 | $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) | ||
59 | - $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts | ||
60 | + $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts | ||
61 | |||
62 | uninstall-config: | ||
63 | # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts | ||
64 | |||
65 | install-udev: | ||
66 | - $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules | ||
67 | + $(INSTALL) -d $(DESTDIR)$(udevrulesdir) | ||
68 | + $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules | ||
69 | |||
70 | uninstall-udev: | ||
71 | - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules | ||
72 | |||
73 | install-man: | ||
74 | + $(INSTALL) -d $(DESTDIR)$(mandir)/man8 | ||
75 | $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 | ||
76 | $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 | ||
77 | |||
78 | --- pcmciautils-014/Makefile~ 2007-05-25 19:43:01.000000000 +0200 | ||
79 | +++ pcmciautils-014/Makefile 2007-05-25 19:43:01.000000000 +0200 | ||
80 | @@ -304,7 +304,7 @@ | ||
81 | |||
82 | install-man: | ||
83 | $(INSTALL) -d $(DESTDIR)$(mandir)/man8 | ||
84 | - $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 | ||
85 | + $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 | ||
86 | $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 | ||
87 | |||
88 | 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 @@ | |||
1 | PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly | ||
2 | under arm gcc 3.4.x so we work around it. | ||
3 | |||
4 | Index: pcmciautils-013/src/pccardctl.c | ||
5 | =================================================================== | ||
6 | --- pcmciautils-013.orig/src/pccardctl.c 2006-03-26 11:56:41.000000000 +0100 | ||
7 | +++ pcmciautils-013/src/pccardctl.c 2006-05-09 22:11:09.000000000 +0100 | ||
8 | @@ -350,7 +350,7 @@ | ||
9 | } | ||
10 | |||
11 | static void print_header(void) { | ||
12 | - printf("pcmciautils %s\n", PCMCIAUTILS_VERSION); | ||
13 | + printf("pcmciautils 014\n"); | ||
14 | printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n"); | ||
15 | printf("Report errors and bugs to <linux-pcmcia@lists.infradead.org>, please.\n"); | ||
16 | } | ||