From 30063de420b4f6c993dd3f2021ab84f622d69320 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 25 May 2020 15:01:08 -0400 Subject: Cluster demo support updates Changes include: - Add agl-weston-remoting feature that sets "weston-remoting" distro feature. The intent is to replace agl-gstrecorder in meta-agl-devel with something more generic. - Add weston remoting initialization timing patch to weston bbappend in meta-agl-profile-graphical, conditional on "weston-remoting" distro feature. - The 0004-unconditionally-include-mman.h.patch weston patch is no longer required after the SMACK labeling changes, remove it as cleanup. - Enable the weston "remoting" PACKAGECONFIG in weston bbappend, also conditional on "weston-remoting". A redefinition of the "remoting" PACKAGECONFIG option is required to fix a recipe bug that will have a fix sent upstream. - Rename virtualoutput.cfg weston.ini fragment to remote-output.cfg to better reflect its current contents. Bug-AGL: SPEC-3395 Signed-off-by: Scott Murray Change-Id: I9c0579670d81296492b3b8bed93aafb3f7ffc15c Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24567 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../recipes-graphics/wayland/weston-ini-conf.bbappend | 12 ++++++------ .../wayland/weston-ini-conf/remote-output.cfg | 5 +++++ .../wayland/weston-ini-conf/virtualoutput.cfg | 5 ----- 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg delete mode 100644 meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg (limited to 'meta-agl-bsp/recipes-graphics/wayland') diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend index 00cd35b3a..f954514cf 100644 --- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -2,11 +2,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PACKAGE_ARCH = "${MACHINE_ARCH}" -SRC_URI += "${@bb.utils.contains("DISTRO_FEATURES", "gst-record", "file://virtualoutput.cfg", "",d)}" +SRC_URI += "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", "file://remote-output.cfg", "",d)}" -do_configure_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'gst-record', 'true', 'false', d)}; then - echo virtual=1 >> ${WORKDIR}/core.cfg - fi -} +#do_configure_append() { +# if ${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', 'true', 'false', d)}; then +# echo virtual=1 >> ${WORKDIR}/core.cfg +# fi +#} diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg new file mode 100644 index 000000000..f69a2e096 --- /dev/null +++ b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg @@ -0,0 +1,5 @@ +[remote-output] +name=remote-1 +mode=640x720@30 +host=192.168.20.99 +port=5005 diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg deleted file mode 100644 index f69a2e096..000000000 --- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[remote-output] -name=remote-1 -mode=640x720@30 -host=192.168.20.99 -port=5005 -- cgit 1.2.3-korg