Patchwork [meta-fsl-demos,3/7] packagegroup-fsl: create gpu packagegroups

login
register
mail settings
Submitter Rogerio Nunes
Date Feb. 26, 2014, 5:03 a.m.
Message ID <1393390999-12160-4-git-send-email-ronunes@gmail.com>
Download mbox | patch
Permalink /patch/67439/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Rogerio Nunes - Feb. 26, 2014, 5:03 a.m.
From: Rogerio Nunes <rogerio.nunes@freescale.com>

Two gpu packagegroups created:
    *packagegroup-fsl-tools-gpu.bb - for fsl gpu packages. Those
        previously included in packagegroup-fsl-tools-testapps.bb
        were moved to this new recipe, that alse includes the imx6
        2d gpu package and the fsl gpu sdk.

    *packagegroup-fsl-tools-gpu-external.bb - for additional demos and
        tools that come from external projects.

This patch also includes both new packagegroups into
fsl-image-gui and fsl-image-test.

Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
---
 recipes-fsl/images/fsl-image-gui.bb                |  2 ++
 recipes-fsl/images/fsl-image-test.bb               |  2 ++
 .../packagegroup-fsl-tools-gpu-external.bb         | 18 +++++++++++++++
 .../packagegroups/packagegroup-fsl-tools-gpu.bb    | 26 ++++++++++++++++++++++
 .../packagegroup-fsl-tools-testapps.bb             | 10 ---------
 5 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
 create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
Daiane Angolini - Feb. 26, 2014, 3:58 p.m.
On Wed, Feb 26, 2014 at 2:03 AM,  <ronunes@gmail.com> wrote:
> From: Rogerio Nunes <rogerio.nunes@freescale.com>
>
> Two gpu packagegroups created:
>     *packagegroup-fsl-tools-gpu.bb - for fsl gpu packages. Those
>         previously included in packagegroup-fsl-tools-testapps.bb
>         were moved to this new recipe, that alse includes the imx6
>         2d gpu package and the fsl gpu sdk.
>
>     *packagegroup-fsl-tools-gpu-external.bb - for additional demos and
>         tools that come from external projects.
>
> This patch also includes both new packagegroups into
> fsl-image-gui and fsl-image-test.

\o/

yes! I like big commit logs

#RN

>
> Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
> ---
>  recipes-fsl/images/fsl-image-gui.bb                |  2 ++
>  recipes-fsl/images/fsl-image-test.bb               |  2 ++
>  .../packagegroup-fsl-tools-gpu-external.bb         | 18 +++++++++++++++
>  .../packagegroups/packagegroup-fsl-tools-gpu.bb    | 26 ++++++++++++++++++++++
>  .../packagegroup-fsl-tools-testapps.bb             | 10 ---------
>  5 files changed, 48 insertions(+), 10 deletions(-)
>  create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
>  create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
>
> diff --git a/recipes-fsl/images/fsl-image-gui.bb b/recipes-fsl/images/fsl-image-gui.bb
> index 84eac8a..5441272 100644
> --- a/recipes-fsl/images/fsl-image-gui.bb
> +++ b/recipes-fsl/images/fsl-image-gui.bb
> @@ -23,6 +23,8 @@ IMAGE_INSTALL += " \
>      cpufrequtils \
>      nano \
>      packagegroup-fsl-gstreamer \
> +    packagegroup-fsl-tools-gpu \
> +    packagegroup-fsl-tools-gpu-external \
>      packagegroup-fsl-tools-testapps \
>      packagegroup-fsl-tools-benchmark \
>      packagegroup-qt-in-use-demos \
> diff --git a/recipes-fsl/images/fsl-image-test.bb b/recipes-fsl/images/fsl-image-test.bb
> index cd300c9..2570ac9 100644
> --- a/recipes-fsl/images/fsl-image-test.bb
> +++ b/recipes-fsl/images/fsl-image-test.bb
> @@ -14,6 +14,8 @@ EXTRA_IMAGE_FEATURES += " \
>
>  IMAGE_INSTALL += " \
>      packagegroup-fsl-gstreamer \
> +    packagegroup-fsl-tools-gpu \
> +    packagegroup-fsl-tools-gpu-external \
>      packagegroup-fsl-tools-testapps \
>      packagegroup-fsl-tools-benchmark \
>  "
> diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
> new file mode 100644
> index 0000000..a30d5e0
> --- /dev/null
> +++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
> @@ -0,0 +1,18 @@
> +# Copyright (C) 2014 Freescale Semiconductor
> +# Released under the MIT license (see COPYING.MIT for the terms)
> +
> +DESCRIPTION = "Freescale package group - tools/gpu/external"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
> +                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +
> +inherit packagegroup
> +
> +X11_TOOLS = " \
> +    mesa-demos \
> +    glmark2 \
> +"
> +
> +RDEPENDS_${PN} = " \
> +    ${@base_contains("DISTRO_FEATURES", "x11", "${X11_TOOLS}", "", d)} \
> +"

cool

> diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
> new file mode 100644
> index 0000000..a28293c
> --- /dev/null
> +++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
> @@ -0,0 +1,26 @@
> +# Copyright (C) 2012-2014 Freescale Semiconductor
> +# Released under the MIT license (see COPYING.MIT for the terms)
> +
> +DESCRIPTION = "Freescale package group - tools/gpu"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
> +                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +
> +inherit packagegroup
> +
> +SOC_TOOLS_GPU = ""
> +SOC_TOOLS_GPU_mx5 = " \
> +    ${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)} \
> +"
> +
> +SOC_TOOLS_GPU_mx6 = " \
> +    gpu-viv-bin-mx6q \
> +    gpu-viv-g2d \
> +    fsl-gpu-sdk \
> +"
> +
> +RDEPENDS_${PN} = " \
> +    ${SOC_TOOLS_GPU} \
> +"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
> index 845e6d4..6a7d92d 100644
> --- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
> +++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
> @@ -8,19 +8,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
>
>  inherit packagegroup
>
> -SOC_TOOLS_TESTAPPS = ""
> -SOC_TOOLS_TESTAPPS_mx5 = " \
> -    ${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)} \
> -"
> -
> -SOC_TOOLS_TESTAPPS_mx6 = " \
> -    gpu-viv-bin-mx6q \
> -"
> -
>  MACHINE_GSTREAMER_PLUGIN ?= ""
>
>  RDEPENDS_${PN} = " \
> -    ${SOC_TOOLS_TESTAPPS} \
>      ${@base_contains("MACHINE_GSTREAMER_PLUGIN", "gst-fsl-plugin", "gst-fsl-plugin-gplay", "", d)} \
>      alsa-utils \
>      alsa-tools \
> --
> 1.8.3.2


beautifull!

Thanks

reviewed-by,
Daiane
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

Patch

diff --git a/recipes-fsl/images/fsl-image-gui.bb b/recipes-fsl/images/fsl-image-gui.bb
index 84eac8a..5441272 100644
--- a/recipes-fsl/images/fsl-image-gui.bb
+++ b/recipes-fsl/images/fsl-image-gui.bb
@@ -23,6 +23,8 @@  IMAGE_INSTALL += " \
     cpufrequtils \
     nano \
     packagegroup-fsl-gstreamer \
+    packagegroup-fsl-tools-gpu \
+    packagegroup-fsl-tools-gpu-external \
     packagegroup-fsl-tools-testapps \
     packagegroup-fsl-tools-benchmark \
     packagegroup-qt-in-use-demos \
diff --git a/recipes-fsl/images/fsl-image-test.bb b/recipes-fsl/images/fsl-image-test.bb
index cd300c9..2570ac9 100644
--- a/recipes-fsl/images/fsl-image-test.bb
+++ b/recipes-fsl/images/fsl-image-test.bb
@@ -14,6 +14,8 @@  EXTRA_IMAGE_FEATURES += " \
 
 IMAGE_INSTALL += " \
     packagegroup-fsl-gstreamer \
+    packagegroup-fsl-tools-gpu \
+    packagegroup-fsl-tools-gpu-external \
     packagegroup-fsl-tools-testapps \
     packagegroup-fsl-tools-benchmark \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
new file mode 100644
index 0000000..a30d5e0
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
@@ -0,0 +1,18 @@ 
+# Copyright (C) 2014 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Freescale package group - tools/gpu/external"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+X11_TOOLS = " \
+    mesa-demos \
+    glmark2 \
+"
+
+RDEPENDS_${PN} = " \
+    ${@base_contains("DISTRO_FEATURES", "x11", "${X11_TOOLS}", "", d)} \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
new file mode 100644
index 0000000..a28293c
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -0,0 +1,26 @@ 
+# Copyright (C) 2012-2014 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Freescale package group - tools/gpu"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+SOC_TOOLS_GPU = ""
+SOC_TOOLS_GPU_mx5 = " \
+    ${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)} \
+"
+
+SOC_TOOLS_GPU_mx6 = " \
+    gpu-viv-bin-mx6q \
+    gpu-viv-g2d \
+    fsl-gpu-sdk \
+"
+
+RDEPENDS_${PN} = " \
+    ${SOC_TOOLS_GPU} \
+"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
index 845e6d4..6a7d92d 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
@@ -8,19 +8,9 @@  LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit packagegroup
 
-SOC_TOOLS_TESTAPPS = ""
-SOC_TOOLS_TESTAPPS_mx5 = " \
-    ${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)} \
-"
-
-SOC_TOOLS_TESTAPPS_mx6 = " \
-    gpu-viv-bin-mx6q \
-"
-
 MACHINE_GSTREAMER_PLUGIN ?= ""
 
 RDEPENDS_${PN} = " \
-    ${SOC_TOOLS_TESTAPPS} \
     ${@base_contains("MACHINE_GSTREAMER_PLUGIN", "gst-fsl-plugin", "gst-fsl-plugin-gplay", "", d)} \
     alsa-utils \
     alsa-tools \