aboutsummaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen2/recipes-graphics/images
diff options
context:
space:
mode:
Diffstat (limited to 'meta-rcar-gen2/recipes-graphics/images')
-rw-r--r--meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc4
-rw-r--r--meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc6
-rw-r--r--meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend2
3 files changed, 8 insertions, 4 deletions
diff --git a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc
index 169c5f6..bea1510 100644
--- a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc
+++ b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc
@@ -8,7 +8,7 @@ IMAGE_INSTALL_append_rcar-gen2 = " \
bash \
"
-IMAGE_INSTALL_append_rcar-gen2 = " \
+IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_conditional("USE_MULTIMEDIA", "1", " \
gstreamer1.0-plugins-base-videorate \
gstreamer1.0-plugins-base-videotestsrc \
gstreamer1.0-plugins-base-audiotestsrc \
@@ -21,7 +21,7 @@ IMAGE_INSTALL_append_rcar-gen2 = " \
gstreamer1.0-plugins-bad-fbdevsink \
gstreamer1.0-plugins-bad-faad \
gstreamer1.0-plugins-bad-videoparsersbad \
-"
+ ", "", d)}'
IMAGE_INSTALL_append_rcar-gen2 = '${@base_conditional("USE_GLES", "1", \
"gles-kernel-module gles-user-module", "", d)}'
diff --git a/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc b/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc
index 782752c..8c1342a 100644
--- a/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc
+++ b/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc
@@ -1,8 +1,10 @@
include core-image-renesas-base.inc
IMAGE_INSTALL_append_rcar-gen2 = '${@base_conditional("USE_GLES", "1", \
- " libegl libegl-dev libgbm-dev", "", d)} \
- gstreamer1.0-plugins-bad-waylandsink'
+ " libegl libegl-dev libgbm-dev", "", d)}'
+
+IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_conditional("USE_MULTIMEDIA", "1", \
+ " gstreamer1.0-plugins-bad-waylandsink", "", d)}'
# pkg groups for oss codecs
IMAGE_INSTALL_append_silk = ' ${@base_conditional("USE_MULTIMEDIA", "1", " \
diff --git a/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend b/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend
new file mode 100644
index 0000000..5c4ad5d
--- /dev/null
+++ b/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend
@@ -0,0 +1,2 @@
+# Add R-Car gfx and multimedia packages to the image when enabled
+include core-image-weston.inc