diff options
4 files changed, 5 insertions, 24 deletions
diff --git a/recipes-demo/flutter-homescreen/files/flutter-homescreen.json b/recipes-demo/flutter-homescreen/files/flutter-homescreen.json index 63babcfab..83aa09a8e 100644 --- a/recipes-demo/flutter-homescreen/files/flutter-homescreen.json +++ b/recipes-demo/flutter-homescreen/files/flutter-homescreen.json @@ -3,7 +3,8 @@ "window_type" : "BG", "width" : 1920, "height": 1080, - "fullscreen": true + "fullscreen": true, + "window_activation_area" : { "x" : 0, "y" : 160, "width" : 1080, "height" : 1600 } } ] } diff --git a/recipes-demo/flutter-ics-homescreen/files/flutter-ics-homescreen.json b/recipes-demo/flutter-ics-homescreen/files/flutter-ics-homescreen.json index 56ab1d35a..2817e5fed 100644 --- a/recipes-demo/flutter-ics-homescreen/files/flutter-ics-homescreen.json +++ b/recipes-demo/flutter-ics-homescreen/files/flutter-ics-homescreen.json @@ -3,7 +3,8 @@ "window_type" : "BG", "width" : 1080, "height": 1920, - "fullscreen": true + "fullscreen": true, + "window_activation_area" : { "x" : 0, "y" : 56, "width" : 1080, "height" : 1712 } } ] } 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" diff --git a/recipes-platform/images/agl-ivi-demo-base-flutter.bb b/recipes-platform/images/agl-ivi-demo-base-flutter.bb index 70fd2c51d..ce2ea6bb2 100644 --- a/recipes-platform/images/agl-ivi-demo-base-flutter.bb +++ b/recipes-platform/images/agl-ivi-demo-base-flutter.bb @@ -4,6 +4,5 @@ DESCRIPTION = "AGL Flutter demo base image" IMAGE_INSTALL += " \ packagegroup-agl-demo-platform-flutter \ - weston-ini-conf-flutter \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \ " |