diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-04-19 16:19:29 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-04-22 22:04:00 -0700 |
commit | 7899ea60ec0f39a465166eea196a5b554e5cd3f5 (patch) | |
tree | 2841537b1fb592eaa3a08cfe989bd5f9187e983a | |
parent | 06d75b1e554791daf7e7cfeebc78d7f240969c97 (diff) | |
download | openembedded-core-7899ea60ec0f39a465166eea196a5b554e5cd3f5.tar.gz openembedded-core-7899ea60ec0f39a465166eea196a5b554e5cd3f5.tar.bz2 openembedded-core-7899ea60ec0f39a465166eea196a5b554e5cd3f5.tar.xz openembedded-core-7899ea60ec0f39a465166eea196a5b554e5cd3f5.zip |
pcmciautils: Upgrade 017 -> 018
version workaround is done in recipe itself
by adding PV to CFLAGS
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch | 16 | ||||
-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.inc | 1 | ||||
-rw-r--r-- | meta/recipes-bsp/pcmciautils/pcmciautils_017.bb | 12 | ||||
-rw-r--r-- | meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 11 |
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 57efa68d3..000000000 --- a/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 017\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/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch index 82dbfa869..81269c9a0 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 @@ -rebase the patch to 017, removing hardcoded path for true +Hardcoded paths are bad... +This lets us use the install from OE's native sysroot +rebase the patch to 018, removing hardcoded path for true as well. Removing of -D in install invocation is a little questionable, is it some GNU extention? -07/14/2010 - qhe, original patch note follows - -Hardcoded paths are bad... +-Khem Raj <raj.khem@gmail.com> -diff --git a/Makefile b/Makefile -index 26f3e4b..31f0cdf 100644 ---- a/Makefile -+++ b/Makefile -@@ -69,7 +69,7 @@ sbindir = ${exec_prefix}/sbin +Index: pcmciautils-018/Makefile +=================================================================== +--- pcmciautils-018.orig/Makefile ++++ pcmciautils-018/Makefile +@@ -76,7 +76,7 @@ sbindir = ${exec_prefix}/sbin mandir = ${prefix}/usr/share/man udevdir = ${prefix}/lib/udev @@ -19,7 +19,7 @@ index 26f3e4b..31f0cdf 100644 INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -@@ -171,7 +171,7 @@ endif +@@ -180,7 +180,7 @@ endif # if DEBUG is enabled, then we do not strip or optimize ifeq ($(strip $(DEBUG)),true) CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE @@ -28,7 +28,7 @@ index 26f3e4b..31f0cdf 100644 else CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment -@@ -264,30 +264,32 @@ clean: +@@ -273,30 +273,32 @@ clean: install-hotplug: $(INSTALL) -d $(DESTDIR)$(hotplugdir) @@ -68,7 +68,7 @@ index 26f3e4b..31f0cdf 100644 uninstall-tools: - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) -@@ -296,22 +298,24 @@ uninstall-tools: +@@ -305,22 +307,24 @@ uninstall-tools: install-config: $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc index 260cccb60..410fa5d20 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" export UDEV = "1" LD = "${CC}" CFLAGS =+ "-I${S}/src" +CFLAGS =+ -DPCMCIAUTILS_VERSION=\'${PV}\' PARALLEL_MAKE = "" EXTRA_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 ff67f7b6b..000000000 --- a/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb +++ /dev/null @@ -1,12 +0,0 @@ -require pcmciautils.inc - -PR = "r0" - -SRC_URI += "file://makefile_fix.patch \ - file://version_workaround.patch" - -SRC_URI[md5sum] = "5245af28eeba57ec0606a874d44d10f7" -SRC_URI[sha256sum] = "2045f0e8f837f44aed72ac91c1a8cf3b899caf098a25d04f47982be6386bd4e1" - -FILES_${PN}-dbg += "${libdir}/udev/.debug" -FILES_${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 000000000..202437a61 --- /dev/null +++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb @@ -0,0 +1,11 @@ +require pcmciautils.inc + +SRC_URI += "file://makefile_fix.patch" + +SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4" +SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5" + +PR = "r0" + +FILES_${PN}-dbg += "${libdir}/udev/.debug" +FILES_${PN} += "${libdir}/udev" |