From 6919021006da1d42af9d588afded43ad35df8fcf Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 16 May 2024 19:10:18 -0400 Subject: weston-ini-conf: (re)move Weston remoting support Remove the support for generating configuration for the Weston remoting feature based on the weston-remoting DISTRO_FEATURE from our weston-ini-conf recipe and bbappend. Handling this has been moved from meta-agl-core to meta-agl-demo. As well, the agl-weston-remoting setup feature dependency on agl-demo has been removed as it is no longer required. Bug-AGL: SPEC-5138 Change-Id: I5a5e58dd9097e940d3925bf60ce4e1283d6529b9 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29902 ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../recipes-graphics/wayland/weston-ini-conf.bb | 38 ++++++---------------- .../wayland/weston-ini-conf.bbappend | 2 -- .../wayland/weston-ini-conf/remote-output.cfg.in | 5 --- 3 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in (limited to 'meta-agl-core/recipes-graphics') 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 0611ec5b4..574f89f2b 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -13,7 +13,6 @@ SRC_URI = " \ file://hdmi-a-2-90.cfg \ file://hdmi-a-2-180.cfg \ file://hdmi-a-2-270.cfg \ - file://remote-output.cfg.in \ file://virtual-0.cfg \ file://virtual-90.cfg \ file://virtual-180.cfg \ @@ -36,18 +35,6 @@ WESTON_FRAGMENTS = "core shell grpc-proxy ${WESTON_DISPLAYS}" # On-target weston.ini directory weston_ini_dir = "${sysconfdir}/xdg/weston" -# Options for the user to change in local.conf -# e.g. REMOTING_OUTPUT_MODE = "1080x1488" -REMOTING_OUTPUT_MODE ??= "640x720@30" -REMOTING_OUTPUT_HOST ??= "192.168.10.3" -REMOTING_OUTPUT_PORT ??= "5005" - -do_configure() { - sed -e "s#host=.*#host=${REMOTING_OUTPUT_HOST}#" \ - -e "s#port=.*#port=${REMOTING_OUTPUT_PORT}#" \ - ${WORKDIR}/remote-output.cfg.in > ${WORKDIR}/remote-output.cfg -} - do_compile() { # Put all of our cfg files together for a default portrait # orientation configuration @@ -109,47 +96,42 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini" RPROVIDES:${PN} = "weston-ini" -RCONFLICTS:${PN} = "${PN}-landscape" ALTERNATIVE:${PN} = "weston.ini" ALTERNATIVE_TARGET_${PN} = "${weston_ini_dir}/weston.ini.default" -PACKAGE_BEFORE_PN += "${PN}-landscape" +# landscape +PACKAGE_BEFORE_PN += "${PN}-landscape" FILES:${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape" - RPROVIDES:${PN}-landscape = "weston-ini" -RCONFLICTS:${PN}-landscape = "${PN}" ALTERNATIVE:${PN}-landscape = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape" +ALTERNATIVE_PRIORITY_${PN}-landscape = "20" -PACKAGE_BEFORE_PN += "${PN}-landscape-inverted" +# landscape-inverted +PACKAGE_BEFORE_PN += "${PN}-landscape-inverted" FILES:${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" - RPROVIDES:${PN}-landscape-inverted = "weston-ini" -RCONFLICTS:${PN}-landscape-inverted = "${PN}" ALTERNATIVE:${PN}-landscape-inverted = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" +ALTERNATIVE_PRIORITY_${PN}-landscape-inverted = "25" -# no activation by default +# no-activate, no activation by default PACKAGE_BEFORE_PN += "${PN}-no-activate" - FILES:${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate" - RPROVIDES:${PN}-no-activate = "weston-ini" -RCONFLICTS:${PN}-no-activate = "${PN}" ALTERNATIVE:${PN}-no-activate = "weston.ini" ALTERNATIVE_TARGET_${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate" +ALTERNATIVE_PRIORITY_${PN}-no-activate = "21" -# landscape, no activation by default +# landscape-no-activate, no activation by default PACKAGE_BEFORE_PN += "${PN}-landscape-no-activate" - FILES:${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate" - RPROVIDES:${PN}-landscape-no-activate = "weston-ini" -RCONFLICTS:${PN}-landscape-no-activate = "${PN}" ALTERNATIVE:${PN}-landscape-no-activate = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate" +ALTERNATIVE_PRIORITY_${PN}-landscape-no-activate = "26" # This is a settings-only package, we do not need a development package # (and its fixed dependency to ${PN} being installed) diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend index 746bde339..b6095f2fa 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -2,8 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PACKAGE_ARCH = "${MACHINE_ARCH}" -WESTON_DISPLAYS:append = "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", " remote-output", "", d)}" - # For virtual machines and intel-corei7-64 we want to support both the HDMI-A-1 # and Virtual-1 outputs. This allows us to run virtual images on real hardware # and vice versa. 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 deleted file mode 100644 index 940cbdd0c..000000000 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in +++ /dev/null @@ -1,5 +0,0 @@ -[remote-output] -name=remote-1 -mode=640x720@30 -host=192.168.10.3 -port=5005 -- cgit 1.2.3-korg