[oe-commits] org.oe.dev btsco: unify

[Laibsch commit]

btsco: unify

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: f9c74af4fdbb5a7f4683a09277fb938c3a2dd987
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f9c74af4fdbb5a7f4683a09277fb938c3a2dd987
Files:
1
packages/btsco/btsco-module.inc
packages/btsco/btsco.inc
packages/btsco/btsco-module_0.41.bb
packages/btsco/btsco-module_0.42.bb
packages/btsco/btsco_0.41.bb
packages/btsco/btsco_0.42.bb
Diffs:

#
# mt diff -ra0a2b80866edb542ad580e318d4f18be4ae39121 -rf9c74af4fdbb5a7f4683a09277fb938c3a2dd987
#
# 
# 
# add_file "packages/btsco/btsco-module.inc"
#  content [5084219ee43be4917fa350879bba2e2b77c3543a]
# 
# add_file "packages/btsco/btsco.inc"
#  content [dec49b81e1c95c74bdac42f8c505bbcf013af9a2]
# 
# patch "packages/btsco/btsco-module_0.41.bb"
#  from [376fd7708d90f5937fc8567c485afabc72e70253]
#    to [6ee201beb64070c546ff858069e35453648d7418]
# 
# patch "packages/btsco/btsco-module_0.42.bb"
#  from [a3d777a30f9f01eb4fede6264dbf602dff1f9f2c]
#    to [c33dbb72b94519508bfa9476a1c7a9908b147f9d]
# 
# patch "packages/btsco/btsco_0.41.bb"
#  from [4e835ed12f7970d25f0c064a3ebef745de9f393a]
#    to [43707ec73623899853a583d3f147f7a16d09f00d]
# 
# patch "packages/btsco/btsco_0.42.bb"
#  from [b6a271c49a8b46939a33ed844ab23828aa051b58]
#    to [f4fd90a18925f0c238929142cbfbe9219021ec5f]
# 
============================================================
--- packages/btsco/btsco-module.inc	5084219ee43be4917fa350879bba2e2b77c3543a
+++ packages/btsco/btsco-module.inc	5084219ee43be4917fa350879bba2e2b77c3543a
@@ -0,0 +1,19 @@
+DESCRIPTION = "Bluetooth-alsa headset module"
+SECTION = "kernel/modules"
+HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib bluez-libs"
+
+inherit module
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz \
+	   file://makefile.patch;patch=1"
+
+S = "${WORKDIR}/btsco-${PV}/kernel"
+
+MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
+
+do_install() {
+	install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+	install -m 0644 ${S}/snd-bt-sco${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
+}
============================================================
--- packages/btsco/btsco.inc	dec49b81e1c95c74bdac42f8c505bbcf013af9a2
+++ packages/btsco/btsco.inc	dec49b81e1c95c74bdac42f8c505bbcf013af9a2
@@ -0,0 +1,12 @@
+DESCRIPTION = "Bluetooth-alsa headset tool"
+HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib bluez-libs"
+
+inherit autotools pkgconfig
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+CFLAGS += " -I${STAGING_INCDIR} "
============================================================
--- packages/btsco/btsco-module_0.41.bb	376fd7708d90f5937fc8567c485afabc72e70253
+++ packages/btsco/btsco-module_0.41.bb	6ee201beb64070c546ff858069e35453648d7418
@@ -1,20 +1,3 @@
-DESCRIPTION = "Bluetooth-alsa headset module"
-SECTION = "kernel/modules"
-HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib bluez-libs"
-PR = "r1"
+require btsco-module.inc
 
+PR = "r1"
-inherit module
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-0.41.tar.gz \
-	   file://makefile.patch;patch=1"
-
-S = "${WORKDIR}/btsco-${PV}/kernel"
-
-MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
-
-do_install() {
-	install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-	install -m 0644 ${S}/snd-bt-sco${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
-}
============================================================
--- packages/btsco/btsco-module_0.42.bb	a3d777a30f9f01eb4fede6264dbf602dff1f9f2c
+++ packages/btsco/btsco-module_0.42.bb	c33dbb72b94519508bfa9476a1c7a9908b147f9d
@@ -1,20 +1 @@
-DESCRIPTION = "Bluetooth-alsa headset module"
-SECTION = "kernel/modules"
-HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib bluez-libs"
-PR = "r0"
-
-inherit module
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz \
-	   file://makefile.patch;patch=1"
-
-S = "${WORKDIR}/btsco-${PV}/kernel"
-
-MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
-
-do_install() {
-	install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-	install -m 0644 ${S}/snd-bt-sco${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
-}
+require btsco-module.inc
============================================================
--- packages/btsco/btsco_0.41.bb	4e835ed12f7970d25f0c064a3ebef745de9f393a
+++ packages/btsco/btsco_0.41.bb	43707ec73623899853a583d3f147f7a16d09f00d
@@ -1,11 +1,3 @@
-DESCRIPTION = "Bluetooth-alsa headset tool"
-HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib bluez-libs"
-PR = "r2"
+require btsco.inc
 
+PR = "r2"
-inherit autotools pkgconfig
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-0.41.tar.gz"
-
-S = "${WORKDIR}/${PN}-${PV}"
============================================================
--- packages/btsco/btsco_0.42.bb	b6a271c49a8b46939a33ed844ab23828aa051b58
+++ packages/btsco/btsco_0.42.bb	f4fd90a18925f0c238929142cbfbe9219021ec5f
@@ -1,17 +1,5 @@
-DESCRIPTION = "Bluetooth-alsa headset tool"
-HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib bluez-libs"
-PR = "r0"
+require btsco.inc
 
-inherit autotools pkgconfig
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz"
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-CFLAGS += " -I${STAGING_INCDIR} "
-
 #there are some bogus macros putting -I/usr/include into C(PP)FLAGS, lets fix that
 do_configure() {
 	libtoolize --force