From 327a0d5a3b550fe418080bbee934d210b8783b3b Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 16 Jan 2023 17:04:08 -0500 Subject: weston-ini-conf: make remote output configuration dynamic Rework things to also update the remote output configuration fragment based on the value of TRANSMITTER_OUTPUT_HOST. This helps when using different IP addresses for e.g. the KVM demo configuration. Bug-AGL: SPEC-4618 Change-Id: I198ff3e6a30b3968b4749998354a39325c088933 Signed-off-by: Scott Murray (cherry picked from commit 39def8ebd98c98e67304517ab118f9bde4cdf8e7) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28415 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb | 6 +++++- .../recipes-graphics/wayland/weston-ini-conf/remote-output.cfg | 5 ----- .../recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in | 5 +++++ 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg create mode 100644 meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in (limited to 'meta-agl-core/recipes-graphics/wayland') diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb index 50e51348a..ae5eb5565 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -9,7 +9,7 @@ SRC_URI = " \ file://hdmi-a-1-90.cfg \ file://hdmi-a-1-180.cfg \ file://hdmi-a-1-270.cfg \ - file://remote-output.cfg \ + file://remote-output.cfg.in \ file://transmitter-output.cfg.in \ file://virtual-0.cfg \ file://virtual-90.cfg \ @@ -43,6 +43,9 @@ do_configure() { -e "s#host=.*#host=${TRANSMITTER_OUTPUT_HOST}#" \ -e "s#port=.*#port=${TRANSMITTER_OUTPUT_PORT}#" \ ${WORKDIR}/transmitter-output.cfg.in > ${WORKDIR}/transmitter-output.cfg + sed -e "s#host=.*#host=${TRANSMITTER_OUTPUT_HOST}#" \ + -e "s#port=.*#port=${TRANSMITTER_OUTPUT_PORT}#" \ + ${WORKDIR}/remote-output.cfg.in > ${WORKDIR}/remote-output.cfg } do_compile() { @@ -62,6 +65,7 @@ do_compile() { # and a corresponding landscape-inverted that is 180 degrees # rotated. rm -f ${WORKDIR}/weston.ini.landscape + rm -f ${WORKDIR}/weston.ini.landscape-inverted for F in ${WESTON_FRAGMENTS}; do INVF=$F if echo $F | grep '^hdmi-a-1-\(90\|270\)$'; then diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg deleted file mode 100644 index 940cbdd0c..000000000 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[remote-output] -name=remote-1 -mode=640x720@30 -host=192.168.10.3 -port=5005 diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in new file mode 100644 index 000000000..940cbdd0c --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in @@ -0,0 +1,5 @@ +[remote-output] +name=remote-1 +mode=640x720@30 +host=192.168.10.3 +port=5005 -- cgit 1.2.3-korg