summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2015-03-31 19:18:32 +0200
committerMax Krummenacher <max.oss.09@gmail.com>2015-08-07 16:19:20 +0200
commitf556cf2f755578a1d0b789b08880c5d362e87d8d (patch)
treef415620ebb881b0e6a09abea9506dfccc627c473
parentf2c76a71521b53b10547ae0bf8ac712baae912e5 (diff)
gpu-viv-bin: package has been renamed and split
gpu-viv-bin-mx6q -> imx-gpu-viv with a bunch of subpackages.
-rw-r--r--recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bbappend5
-rw-r--r--recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend14
-rw-r--r--recipes/images/angstrom-lxde-image.bb2
-rw-r--r--recipes/images/angstrom-qt-x11-image.bb5
4 files changed, 10 insertions, 16 deletions
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bbappend b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bbappend
new file mode 100644
index 0000000..c2248dc
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bbappend
@@ -0,0 +1,5 @@
+# don't include the rather large examples and apitrace tool
+SOC_TOOLS_GPU_remove_mx6 = " \
+ fsl-gpu-sdk \
+ imx-gpu-viv-tools-apitrace \
+"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend
deleted file mode 100644
index 690f420..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-# meta package to pull in the libries, but not the (huge) samples
-PACKAGES =+ "gpu-viv-bin-mx6q-libraries "
-FILES_gpu-viv-bin-mx6q-libraries = ""
-ALLOW_EMPTY_gpu-viv-bin-mx6q-libraries = "1"
-RDEPENDS_gpu-viv-bin-mx6q-libraries = " \
- libclc-mx6 \
- libegl-mx6 \
- libgles-mx6 \
- libgles2-mx6 \
- libglslc-mx6 \
- libopencl-mx6 \
- libopenvg-mx6 \
- libvdk-mx6 \
-" \ No newline at end of file
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb
index 09fd026..b71c6af 100644
--- a/recipes/images/angstrom-lxde-image.bb
+++ b/recipes/images/angstrom-lxde-image.bb
@@ -102,7 +102,6 @@ GSTREAMER_append_mx6 = " \
gst-plugins-base-xvimagesink \
gst-plugins-gl \
gst-fsl-plugin \
- gpu-viv-bin-mx6q-libraries \
"
GSTREAMER_colibri-vf = ""
@@ -116,6 +115,7 @@ IMAGE_INSTALL_append_apalis-imx6 = " \
gpioconfig \
"
IMAGE_INSTALL_append_mx6 = " \
+ packagegroup-fsl-tools-gpu \
gnome-disk-utility \
mime-support \
"
diff --git a/recipes/images/angstrom-qt-x11-image.bb b/recipes/images/angstrom-qt-x11-image.bb
index f561535..73845c4 100644
--- a/recipes/images/angstrom-qt-x11-image.bb
+++ b/recipes/images/angstrom-qt-x11-image.bb
@@ -93,7 +93,6 @@ GSTREAMER_append_mx6 = " \
gst-plugins-base-xvimagesink \
gst-plugins-gl \
gst-fsl-plugin \
- gpu-viv-bin-mx6q-libraries \
"
GSTREAMER_colibri-vf = ""
@@ -134,6 +133,10 @@ IMAGE_INSTALL_QT4 = " \
icu \
"
+IMAGE_INSTALL_append_mx6 = " \
+ packagegroup-fsl-tools-gpu \
+"
+
IMAGE_INSTALL += " \
${IMAGE_INSTALL_QT4} \
\