[oe-commits] org.oe.dev pcmciautils: add 014

[hrw commit]

pcmciautils: add 014

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e2bb27b2ad1bd9fc4cc5d4759f46564c57c7872d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e2bb27b2ad1bd9fc4cc5d4759f46564c57c7872d
Files:
1
packages/pcmciautils/pcmciautils-014
packages/pcmciautils/pcmciautils-014/makefile_fix.patch
packages/pcmciautils/pcmciautils-014/version_workaround.patch
packages/pcmciautils/pcmciautils_014.bb
Diffs:

#
# mt diff -racf428036dce8ef016092d5ebddb6e389c7f1f12 -re2bb27b2ad1bd9fc4cc5d4759f46564c57c7872d
#
# 
# 
# add_dir "packages/pcmciautils/pcmciautils-014"
# 
# add_file "packages/pcmciautils/pcmciautils-014/makefile_fix.patch"
#  content [de0f3b5c2679018d4a3ee5f1011329414fc88698]
# 
# add_file "packages/pcmciautils/pcmciautils-014/version_workaround.patch"
#  content [454958da63ce882fc53a01ed3d35855bb7af0af2]
# 
# add_file "packages/pcmciautils/pcmciautils_014.bb"
#  content [7272af6f39e4e9793b10c3b269594c5774adbf67]
# 
============================================================
--- packages/pcmciautils/pcmciautils-014/makefile_fix.patch	de0f3b5c2679018d4a3ee5f1011329414fc88698
+++ packages/pcmciautils/pcmciautils-014/makefile_fix.patch	de0f3b5c2679018d4a3ee5f1011329414fc88698
@@ -0,0 +1,15 @@
+Hardcoded paths are bad...
+
+Index: pcmciautils-014/Makefile
+===================================================================
+--- pcmciautils-014.orig/Makefile	2006-06-01 11:07:52.000000000 +0200
++++ pcmciautils-014/Makefile	2006-10-29 13:50:25.000000000 +0100
+@@ -69,7 +69,7 @@
+ 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}
============================================================
--- packages/pcmciautils/pcmciautils-014/version_workaround.patch	454958da63ce882fc53a01ed3d35855bb7af0af2
+++ packages/pcmciautils/pcmciautils-014/version_workaround.patch	454958da63ce882fc53a01ed3d35855bb7af0af2
@@ -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 014\n");
+ 	printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n");
+ 	printf("Report errors and bugs to <linux-pcmcia at lists.infradead.org>, please.\n");
+ }
============================================================
--- packages/pcmciautils/pcmciautils_014.bb	7272af6f39e4e9793b10c3b269594c5774adbf67
+++ packages/pcmciautils/pcmciautils_014.bb	7272af6f39e4e9793b10c3b269594c5774adbf67
@@ -0,0 +1,33 @@
+DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
+DEPENDS = "sysfsutils udev module-init-tools"
+RDEPENDS = "udev module-init-tools"
+HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \
+           file://makefile_fix.patch;patch=1 \
+	   file://version_workaround.patch;patch=1"
+S = "${WORKDIR}/pcmciautils-${PV}"
+
+PR = "r0"
+
+export HOSTCC = "${BUILD_CC}"
+export etcdir = "${sysconfdir}"
+export sbindir = "${base_sbindir}"
+export pcmciaconfdir = "${sysconfdir}/pcmcia"
+export udevrulesdir = "${sysconfdir}/udev/rules.d"
+export UDEV = 1
+LD = "${CC}"
+CFLAGS =+ "-I${S}/src"
+CFLAGS =+ '-DPCMCIAUTILS_VERSION=013'
+
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
+
+CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
+RCONFLICTS_${PN} += "pcmcia-cs"