pcmciautils: simplify recipes

4 files changed, 36 insertions, 87 deletions

diff --git a/packages/pcmciautils/pcmciautils.inc b/packages/pcmciautils/pcmciautils.inc
new file mode 100644
index 0000000000..e448f2da56
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
+DEPENDS = "sysfsutils"
+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"
+
+S = "${WORKDIR}/pcmciautils-${PV}"
+
+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"
+
+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"
diff --git a/packages/pcmciautils/pcmciautils_010.bb b/packages/pcmciautils/pcmciautils_010.bb
index 5b4c58beb2..bcebb5f624 100644
--- a/packages/pcmciautils/pcmciautils_010.bb
+++ b/packages/pcmciautils/pcmciautils_010.bb
@@ -1,31 +1,5 @@
-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"
-S = "${WORKDIR}/pcmciautils-${PV}"
+require pcmciautils.inc
 
 PR = "r3"
 
-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=010'
-
-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"
diff --git a/packages/pcmciautils/pcmciautils_013.bb b/packages/pcmciautils/pcmciautils_013.bb
index 8f10bb45da..17abe5dc9b 100644
--- a/packages/pcmciautils/pcmciautils_013.bb
+++ b/packages/pcmciautils/pcmciautils_013.bb
@@ -1,33 +1,6 @@
-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}"
+require pcmciautils.inc
 
 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"
+SRC_URI += "file://makefile_fix.patch;patch=1 \
+            file://version_workaround.patch;patch=1"
diff --git a/packages/pcmciautils/pcmciautils_014.bb b/packages/pcmciautils/pcmciautils_014.bb
index 8f10bb45da..17abe5dc9b 100644
--- a/packages/pcmciautils/pcmciautils_014.bb
+++ b/packages/pcmciautils/pcmciautils_014.bb
@@ -1,33 +1,6 @@
-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}"
+require pcmciautils.inc
 
 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"
+SRC_URI += "file://makefile_fix.patch;patch=1 \
+            file://version_workaround.patch;patch=1"