summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-04-19 23:19:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-24 21:50:42 (GMT)
commit6da7fc5ceabaf45e933b56bcc69d25f1f9f73821 (patch)
tree5277e212af144606111c10d349aedbbe3f51acde /meta/recipes-bsp
parent30b44d9e67493dbd5771817dc3a9e6edc4471352 (diff)
downloadpoky-6da7fc5ceabaf45e933b56bcc69d25f1f9f73821.tar.gz
pcmciautils: Upgrade 017 -> 018
version workaround is done in recipe itself by adding PV to CFLAGS (From OE-Core rev: 7899ea60ec0f39a465166eea196a5b554e5cd3f5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch16
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch (renamed from meta/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch)24
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils.inc1
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils_017.bb12
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils_018.bb11
5 files changed, 24 insertions, 40 deletions
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
deleted file mode 100644
index 57efa68..0000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly
2under arm gcc 3.4.x so we work around it.
3
4Index: 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 017\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 }
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
index 82dbfa8..81269c9 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
@@ -1,16 +1,16 @@
1rebase the patch to 017, removing hardcoded path for true 1Hardcoded paths are bad...
2This lets us use the install from OE's native sysroot
3rebase the patch to 018, removing hardcoded path for true
2as well. Removing of -D in install invocation is a little 4as well. Removing of -D in install invocation is a little
3questionable, is it some GNU extention? 5questionable, is it some GNU extention?
4 6
507/14/2010 - qhe, original patch note follows 7-Khem Raj <raj.khem@gmail.com>
6
7Hardcoded paths are bad...
8 8
9diff --git a/Makefile b/Makefile 9Index: pcmciautils-018/Makefile
10index 26f3e4b..31f0cdf 100644 10===================================================================
11--- a/Makefile 11--- pcmciautils-018.orig/Makefile
12+++ b/Makefile 12+++ pcmciautils-018/Makefile
13@@ -69,7 +69,7 @@ sbindir = ${exec_prefix}/sbin 13@@ -76,7 +76,7 @@ sbindir = ${exec_prefix}/sbin
14 mandir = ${prefix}/usr/share/man 14 mandir = ${prefix}/usr/share/man
15 udevdir = ${prefix}/lib/udev 15 udevdir = ${prefix}/lib/udev
16 16
@@ -19,7 +19,7 @@ index 26f3e4b..31f0cdf 100644
19 INSTALL_PROGRAM = ${INSTALL} 19 INSTALL_PROGRAM = ${INSTALL}
20 INSTALL_DATA = ${INSTALL} -m 644 20 INSTALL_DATA = ${INSTALL} -m 644
21 INSTALL_SCRIPT = ${INSTALL_PROGRAM} 21 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
22@@ -171,7 +171,7 @@ endif 22@@ -180,7 +180,7 @@ endif
23 # if DEBUG is enabled, then we do not strip or optimize 23 # if DEBUG is enabled, then we do not strip or optimize
24 ifeq ($(strip $(DEBUG)),true) 24 ifeq ($(strip $(DEBUG)),true)
25 CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE 25 CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE
@@ -28,7 +28,7 @@ index 26f3e4b..31f0cdf 100644
28 else 28 else
29 CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE 29 CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
30 STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment 30 STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
31@@ -264,30 +264,32 @@ clean: 31@@ -273,30 +273,32 @@ clean:
32 32
33 install-hotplug: 33 install-hotplug:
34 $(INSTALL) -d $(DESTDIR)$(hotplugdir) 34 $(INSTALL) -d $(DESTDIR)$(hotplugdir)
@@ -68,7 +68,7 @@ index 26f3e4b..31f0cdf 100644
68 68
69 uninstall-tools: 69 uninstall-tools:
70 - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) 70 - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL)
71@@ -296,22 +298,24 @@ uninstall-tools: 71@@ -305,22 +307,24 @@ uninstall-tools:
72 72
73 install-config: 73 install-config:
74 $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) 74 $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir)
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 260cccb..410fa5d 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -22,6 +22,7 @@ export udevrulesdir = "${sysconfdir}/udev/rules.d"
22export UDEV = "1" 22export UDEV = "1"
23LD = "${CC}" 23LD = "${CC}"
24CFLAGS =+ "-I${S}/src" 24CFLAGS =+ "-I${S}/src"
25CFLAGS =+ -DPCMCIAUTILS_VERSION=\'${PV}\'
25 26
26PARALLEL_MAKE = "" 27PARALLEL_MAKE = ""
27EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'" 28EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
deleted file mode 100644
index ff67f7b..0000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require pcmciautils.inc
2
3PR = "r0"
4
5SRC_URI += "file://makefile_fix.patch \
6 file://version_workaround.patch"
7
8SRC_URI[md5sum] = "5245af28eeba57ec0606a874d44d10f7"
9SRC_URI[sha256sum] = "2045f0e8f837f44aed72ac91c1a8cf3b899caf098a25d04f47982be6386bd4e1"
10
11FILES_${PN}-dbg += "${libdir}/udev/.debug"
12FILES_${PN} += "${libdir}/udev"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
new file mode 100644
index 0000000..202437a
--- /dev/null
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -0,0 +1,11 @@
1require pcmciautils.inc
2
3SRC_URI += "file://makefile_fix.patch"
4
5SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"
6SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5"
7
8PR = "r0"
9
10FILES_${PN}-dbg += "${libdir}/udev/.debug"
11FILES_${PN} += "${libdir}/udev"