Patchwork [RFC] bluez4: split gstreamer plugin into a seperate recipe

login
register
mail settings
Submitter Koen Kooi
Date Sept. 20, 2011, 11:08 a.m.
Message ID <1316516896-6884-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/11739/
State New, archived
Headers show

Comments

Koen Kooi - Sept. 20, 2011, 11:08 a.m.
This eliminates a good chunk of buildtime when building console-only image.

The bluez4 and this recipe share a .inc file since the source is the same.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-connectivity/bluez/bluez4.inc         |   37 +++++++++++++++
 meta/recipes-connectivity/bluez/bluez4_4.96.bb     |   49 +++-----------------
 .../bluez/gst-plugin-bluetooth_4.96.bb             |   28 +++++++++++
 3 files changed, 72 insertions(+), 42 deletions(-)
 create mode 100644 meta/recipes-connectivity/bluez/bluez4.inc
 create mode 100644 meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb
Paul Eggleton - Sept. 20, 2011, 12:40 p.m.
On Tuesday 20 September 2011 12:08:16 Koen Kooi wrote:
> This eliminates a good chunk of buildtime when building console-only image.
> 
> The bluez4 and this recipe share a .inc file since the source is the same.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-connectivity/bluez/bluez4.inc         |   37 +++++++++++++++
>  meta/recipes-connectivity/bluez/bluez4_4.96.bb     |   49
> +++----------------- .../bluez/gst-plugin-bluetooth_4.96.bb             | 
>  28 +++++++++++ 3 files changed, 72 insertions(+), 42 deletions(-)
>  create mode 100644 meta/recipes-connectivity/bluez/bluez4.inc
>  create mode 100644
> meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb
> 
> diff --git a/meta/recipes-connectivity/bluez/bluez4.inc
> b/meta/recipes-connectivity/bluez/bluez4.inc new file mode 100644
> index 0000000..cc9810e
> --- /dev/null
> +++ b/meta/recipes-connectivity/bluez/bluez4.inc
> @@ -0,0 +1,37 @@
> +SUMMARY = "Linux Bluetooth Stack Userland V4"
> +DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These
> include a system configurations, daemons, tools and system libraries."
> +HOMEPAGE = "http://www.bluez.org"
> +SECTION = "libs"
> +LICENSE = "GPLv2+ & LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> +                   
> file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ +               
>    
> file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f9
> 26e \ +                   
> file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb1
> 91" +DEPENDS = "udev alsa-lib libusb dbus-glib"
> +RDEPENDS_${PN}-dev = "bluez-hcidump"
> +
> +ASNEEDED = ""
> +
> +SRC_URI = "\
> +  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
> +"
> +S = "${WORKDIR}/bluez-${PV}"
> +
> +inherit autotools
> +
> +EXTRA_OECONF = "\
> +  --disable-gstreamer \
> +  --enable-alsa \
> +  --enable-usb \
> +  --enable-tools \
> +  --enable-bccmd \
> +  --enable-hid2hci \
> +  --enable-dfutool \
> +  --enable-hidd \
> +  --enable-pand \
> +  --enable-dund \
> +  --disable-cups \
> +  --enable-test \
> +  --enable-configfiles \
> +"
> +
> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
> b/meta/recipes-connectivity/bluez/bluez4_4.96.bb index 994cec7..505e8f7
> 100644
> --- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
> +++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
> @@ -1,47 +1,12 @@
> -SUMMARY = "Linux Bluetooth Stack Userland V4"
> -DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These
> include a system configurations, daemons, tools and system libraries."
> -HOMEPAGE = "http://www.bluez.org"
> -SECTION = "libs"
> -LICENSE = "GPLv2+ & LGPLv2.1+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> -                   
> file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ -               
>    
> file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f9
> 26e \ -                   
> file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb1
> 91" -DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib"
> -RDEPENDS_${PN}-dev = "bluez-hcidump"
> -
> -ASNEEDED = ""
> +require bluez4.inc
> 
> -PR = "r0"
> +PR = "r1"
> 
> -SRC_URI = "\
> -  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
> -  file://bluetooth.conf \
> -"
> +SRC_URI += "file://bluetooth.conf"
> 
>  SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
>  SRC_URI[sha256sum] =
> "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
> 
> -S = "${WORKDIR}/bluez-${PV}"
> -
> -inherit autotools
> -
> -EXTRA_OECONF = "\
> -  --enable-gstreamer \
> -  --enable-alsa \
> -  --enable-usb \
> -  --enable-tools \
> -  --enable-bccmd \
> -  --enable-hid2hci \
> -  --enable-dfutool \
> -  --enable-hidd \
> -  --enable-pand \
> -  --enable-dund \
> -  --disable-cups \
> -  --enable-test \
> -  --enable-configfiles \
> -"
> -
>  do_install_append() {
>  	install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
>  	install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
> @@ -50,19 +15,19 @@ do_install_append() {
>  	install -m 0644 ${WORKDIR}/bluetooth.conf
> ${D}/${sysconfdir}/dbus-1/system.d/ }
> 
> -PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
> +RDEPENDS_${PN}-dev = "bluez-hcidump"
> +
> +PACKAGES =+ "libasound-module-bluez"
> 
> -FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
>  FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so
> ${datadir}/alsa" FILES_${PN} += "${libdir}/bluetooth/plugins/*.so
> ${base_libdir}/udev/ ${base_libdir}/systemd/" FILES_${PN}-dev += "\
>    ${libdir}/bluetooth/plugins/*.la \
>    ${libdir}/alsa-lib/*.la \
> -  ${libdir}/gstreamer-0.10/*.la \
>  "
> 
>  FILES_${PN}-dbg += "\
>    ${libdir}/bluetooth/plugins/.debug \
>    ${libdir}/*/.debug \
>    ${base_libdir}/udev/.debug \
> -"
> +
> diff --git a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb
> b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb new file
> mode 100644
> index 0000000..a137b12
> --- /dev/null
> +++ b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb
> @@ -0,0 +1,28 @@
> +require bluez4.inc
> +require recipes-multimedia/gstreamer/gst-plugins-package.inc
> +
> +DEPENDS = "bluez4 gst-plugins-base"
> +
> +EXTRA_OECONF = "\
> +  --enable-gstreamer \
> +"
> +
> +# clean unwanted files
> +do_install_append() {
> +	rm -rf ${D}${bindir}
> +	rm -rf ${D}${sbindir}
> +	rm -f  ${D}${libdir}/lib*
> +	rm -rf ${D}${sysconfdir}
> +	rm -rf ${D}${base_libdir}
> +}
> +
> +FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so"
> +FILES_${PN}-dev += "\
> +  ${libdir}/gstreamer-0.10/*.la \
> +"
> +
> +FILES_${PN}-dbg += "\
> +  ${libdir}/*/.debug \
> +"
> +
> +

Looks good to me!

Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Cheers,
Paul
Koen Kooi - Sept. 21, 2011, 9:59 a.m.
Op 20 sep. 2011, om 14:40 heeft Paul Eggleton het volgende geschreven:

> On Tuesday 20 September 2011 12:08:16 Koen Kooi wrote:
>> This eliminates a good chunk of buildtime when building console-only image.
>> 
>> The bluez4 and this recipe share a .inc file since the source is the same.
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> 

[..]

> Looks good to me!
> 
> Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Do I need to resend it without the 'RFC' prefix or can it go in as is?
Saul Wold - Sept. 26, 2011, 9:51 p.m.
On 09/21/2011 02:59 AM, Koen Kooi wrote:
>
> Op 20 sep. 2011, om 14:40 heeft Paul Eggleton het volgende geschreven:
>
>> On Tuesday 20 September 2011 12:08:16 Koen Kooi wrote:
>>> This eliminates a good chunk of buildtime when building console-only image.
>>>
>>> The bluez4 and this recipe share a .inc file since the source is the same.
>>>
>>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>>
>
> [..]
>
>> Looks good to me!
>>
>> Acked-by: Paul Eggleton<paul.eggleton@linux.intel.com>
>
> Do I need to resend it without the 'RFC' prefix or can it go in as is?
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
new file mode 100644
index 0000000..cc9810e
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -0,0 +1,37 @@ 
+SUMMARY = "Linux Bluetooth Stack Userland V4"
+DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These include a system configurations, daemons, tools and system libraries."
+HOMEPAGE = "http://www.bluez.org"
+SECTION = "libs"
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
+                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
+                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
+                    file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
+DEPENDS = "udev alsa-lib libusb dbus-glib"
+RDEPENDS_${PN}-dev = "bluez-hcidump"
+
+ASNEEDED = ""
+
+SRC_URI = "\
+  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
+"
+S = "${WORKDIR}/bluez-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+  --disable-gstreamer \
+  --enable-alsa \
+  --enable-usb \
+  --enable-tools \
+  --enable-bccmd \
+  --enable-hid2hci \
+  --enable-dfutool \
+  --enable-hidd \
+  --enable-pand \
+  --enable-dund \
+  --disable-cups \
+  --enable-test \
+  --enable-configfiles \
+"
+
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index 994cec7..505e8f7 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -1,47 +1,12 @@ 
-SUMMARY = "Linux Bluetooth Stack Userland V4"
-DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These include a system configurations, daemons, tools and system libraries."
-HOMEPAGE = "http://www.bluez.org"
-SECTION = "libs"
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
-                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
-                    file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
-DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib"
-RDEPENDS_${PN}-dev = "bluez-hcidump"
-
-ASNEEDED = ""
+require bluez4.inc
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "\
-  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://bluetooth.conf \
-"
+SRC_URI += "file://bluetooth.conf"
 
 SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
 SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
 
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "\
-  --enable-gstreamer \
-  --enable-alsa \
-  --enable-usb \
-  --enable-tools \
-  --enable-bccmd \
-  --enable-hid2hci \
-  --enable-dfutool \
-  --enable-hidd \
-  --enable-pand \
-  --enable-dund \
-  --disable-cups \
-  --enable-test \
-  --enable-configfiles \
-"
-
 do_install_append() {
 	install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
 	install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
@@ -50,19 +15,19 @@  do_install_append() {
 	install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
 }
 
-PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
+RDEPENDS_${PN}-dev = "bluez-hcidump"
+
+PACKAGES =+ "libasound-module-bluez"
 
-FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
 FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
 FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
   ${libdir}/alsa-lib/*.la \
-  ${libdir}/gstreamer-0.10/*.la \
 "
 
 FILES_${PN}-dbg += "\
   ${libdir}/bluetooth/plugins/.debug \
   ${libdir}/*/.debug \
   ${base_libdir}/udev/.debug \
-"
+
diff --git a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb
new file mode 100644
index 0000000..a137b12
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb
@@ -0,0 +1,28 @@ 
+require bluez4.inc
+require recipes-multimedia/gstreamer/gst-plugins-package.inc
+
+DEPENDS = "bluez4 gst-plugins-base"
+
+EXTRA_OECONF = "\
+  --enable-gstreamer \
+"
+
+# clean unwanted files
+do_install_append() {
+	rm -rf ${D}${bindir}
+	rm -rf ${D}${sbindir}
+	rm -f  ${D}${libdir}/lib*
+	rm -rf ${D}${sysconfdir}
+	rm -rf ${D}${base_libdir}
+}
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so"
+FILES_${PN}-dev += "\
+  ${libdir}/gstreamer-0.10/*.la \
+"
+
+FILES_${PN}-dbg += "\
+  ${libdir}/*/.debug \
+"
+
+