From b4cd3148e509f566b1a28a02a5f1032ad48aad8c Mon Sep 17 00:00:00 2001 From: Harunobu Kurokawa Date: Tue, 27 Jun 2017 10:25:10 +0900 Subject: Add gst-record argument to weston option v2: When gst-record is included DISTRO_FEATURES, "--gst-record" is set. Bug-AGL: SPEC-559 Change-Id: Ia172135f355a98bb10234743cdd1a7b1319723e7 Signed-off-by: Harunobu Kurokawa Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9823 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl/classes/agl-graphical.bbclass | 2 +- meta-agl/recipes-graphics/wayland/weston-init.bbappend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-agl') diff --git a/meta-agl/classes/agl-graphical.bbclass b/meta-agl/classes/agl-graphical.bbclass index e99a441b7..0004d9c1a 100644 --- a/meta-agl/classes/agl-graphical.bbclass +++ b/meta-agl/classes/agl-graphical.bbclass @@ -1,7 +1,7 @@ WESTONTTY ??= "1" WESTONUSER ??= "display" WESTONGROUP ??= "display" -WESTONARGS ?= "--idle-time=0 --tty=${WESTONTTY}" +WESTONARGS ?= "--idle-time=0 --tty=${WESTONTTY} ${@bb.utils.contains("DISTRO_FEATURES", "gst-record", "--gst-record", "",d)}" WESTONLAUNCHARGS ??= "--tty /dev/tty${WESTONTTY} --user ${WESTONUSER}" DISPLAY_XDG_RUNTIME_DIR ??= "/run/platform/${WESTONUSER}" diff --git a/meta-agl/recipes-graphics/wayland/weston-init.bbappend b/meta-agl/recipes-graphics/wayland/weston-init.bbappend index 4975b8e68..552cd8480 100644 --- a/meta-agl/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-agl/recipes-graphics/wayland/weston-init.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit agl-graphical -WESTONSTART ??= "/usr/bin/weston --idle-time=4294967 --tty=${WESTONTTY}" +WESTONSTART ??= "/usr/bin/weston ${WESTONARGS}" WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/weston.log", "",d)}" SRC_URI += " \ -- cgit 1.2.3-korg