diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-01-04 19:15:58 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2024-01-05 16:40:12 +0000 |
| commit | a2f890dae4d3b9d49d2921576b04384cef7641d3 (patch) | |
| tree | 08e13c54268452fea8512bc2ffd5f604adf73ffb /recipes-graphics/wayland/weston-ini-conf_agldemo.inc | |
| parent | 2136f6f3f41844ee13194bc288aac5ff04c3768f (diff) | |
Use flutter-auto activation area support
With the geometry fix in place for flutter-auto's activation
area support, update the Flutter homescreen JSON configuration
files to use it, and drop the custom Flutter weston.ini that
was being used.
Bug-AGL: SPEC-5038
Change-Id: I2e5fe3b8e54f49a36c2286e1a78ffc081b90f6fa
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29582
ci-image-build: Jenkins Job builder account
Reviewed-by: Marius Vlad <marius.vlad@collabora.com>
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Diffstat (limited to 'recipes-graphics/wayland/weston-ini-conf_agldemo.inc')
| -rw-r--r-- | recipes-graphics/wayland/weston-ini-conf_agldemo.inc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc index 003d411ce..6d6a0a8dd 100644 --- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc +++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc @@ -6,18 +6,6 @@ GUEST_VM1_IMAGE ?= "agl-ivi-demo-platform-flutter" GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter" do_compile:append() { - # Put all of our cfg files together for a default portrait - # orientation configuration - rm -f ${WORKDIR}/weston.ini.flutter - for F in ${WESTON_FRAGMENTS}; do - cat ${WORKDIR}/${F}.cfg >> ${WORKDIR}/weston.ini.flutter - if grep -q '\[output\]' ${WORKDIR}/${F}.cfg; then - echo "activation-area=1080x1600+0,160" >> ${WORKDIR}/weston.ini.flutter - fi - echo >> ${WORKDIR}/weston.ini.flutter - done - sed -i -e '$ d' ${WORKDIR}/weston.ini.flutter - # Start with a canned configuration for a KVM host, filling in # the guest VM application ids to pin them to specific outputs. rm -f ${WORKDIR}/weston.ini.kvm @@ -27,18 +15,10 @@ do_compile:append() { } do_install:append() { - install -m 0644 ${WORKDIR}/weston.ini.flutter ${D}${weston_ini_dir}/ install -m 0644 ${WORKDIR}/weston.ini.kvm ${D}${weston_ini_dir}/ } -PACKAGE_BEFORE_PN += "${PN}-flutter ${PN}-kvm" - -FILES:${PN}-flutter = "${weston_ini_dir}/weston.ini.flutter" - -RPROVIDES:${PN}-flutter = "weston-ini" -RCONFLICTS:${PN}-flutter = "${PN}" -ALTERNATIVE:${PN}-flutter = "weston.ini" -ALTERNATIVE_TARGET_${PN}-flutter = "${weston_ini_dir}/weston.ini.flutter" +PACKAGE_BEFORE_PN += "${PN}-kvm" FILES:${PN}-kvm = "${weston_ini_dir}/weston.ini.kvm" |