[oe-commits] org.oe.dev pcmciautils: simplify recipes

[hrw commit]

pcmciautils: simplify recipes

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: f1562a562e48e66c606901b6d7ead9f497223bc0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f1562a562e48e66c606901b6d7ead9f497223bc0
Files:
1
packages/pcmciautils/pcmciautils.inc
packages/pcmciautils/pcmciautils_010.bb
packages/pcmciautils/pcmciautils_013.bb
packages/pcmciautils/pcmciautils_014.bb
Diffs:

#
# mt diff -r824441f3a8e403dd32a1171069630d10f7b8d4d1 -rf1562a562e48e66c606901b6d7ead9f497223bc0
#
# 
# 
# add_file "packages/pcmciautils/pcmciautils.inc"
#  content [b8acc6eb2136b6d0c2d16db0736eb7a3f2aff60f]
# 
# patch "packages/pcmciautils/pcmciautils_010.bb"
#  from [b3afd0faea89a7410538c396bba16d2e98934547]
#    to [32fa653ca42aea444a2a3989b6f34f95be16d252]
# 
# patch "packages/pcmciautils/pcmciautils_013.bb"
#  from [b1571d88a81863f95a918903b47793fbd5470970]
#    to [a4fe429355a025947dae4e87515f73a7c0a28d0f]
# 
# patch "packages/pcmciautils/pcmciautils_014.bb"
#  from [b1571d88a81863f95a918903b47793fbd5470970]
#    to [a4fe429355a025947dae4e87515f73a7c0a28d0f]
# 
============================================================
--- packages/pcmciautils/pcmciautils.inc	b8acc6eb2136b6d0c2d16db0736eb7a3f2aff60f
+++ packages/pcmciautils/pcmciautils.inc	b8acc6eb2136b6d0c2d16db0736eb7a3f2aff60f
@@ -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"
============================================================
--- packages/pcmciautils/pcmciautils_010.bb	b3afd0faea89a7410538c396bba16d2e98934547
+++ packages/pcmciautils/pcmciautils_010.bb	32fa653ca42aea444a2a3989b6f34f95be16d252
@@ -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"
+require pcmciautils.inc
 
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
-S = "${WORKDIR}/pcmciautils-${PV}"
-
 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"
============================================================
--- packages/pcmciautils/pcmciautils_013.bb	b1571d88a81863f95a918903b47793fbd5470970
+++ packages/pcmciautils/pcmciautils_013.bb	a4fe429355a025947dae4e87515f73a7c0a28d0f
@@ -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"
+require pcmciautils.inc
 
-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"
 
+SRC_URI += "file://makefile_fix.patch;patch=1 \
+            file://version_workaround.patch;patch=1"
-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"
============================================================
--- packages/pcmciautils/pcmciautils_014.bb	b1571d88a81863f95a918903b47793fbd5470970
+++ packages/pcmciautils/pcmciautils_014.bb	a4fe429355a025947dae4e87515f73a7c0a28d0f
@@ -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"
+require pcmciautils.inc
 
-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"
 
+SRC_URI += "file://makefile_fix.patch;patch=1 \
+            file://version_workaround.patch;patch=1"
-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"