summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
2136f6f)
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
"window_type" : "BG",
"width" : 1920,
"height": 1080,
"window_type" : "BG",
"width" : 1920,
"height": 1080,
+ "fullscreen": true,
+ "window_activation_area" : { "x" : 0, "y" : 160, "width" : 1080, "height" : 1600 }
"window_type" : "BG",
"width" : 1080,
"height": 1920,
"window_type" : "BG",
"width" : 1080,
"height": 1920,
+ "fullscreen": true,
+ "window_activation_area" : { "x" : 0, "y" : 56, "width" : 1080, "height" : 1712 }
GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter"
do_compile:append() {
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
# 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
- install -m 0644 ${WORKDIR}/weston.ini.flutter ${D}${weston_ini_dir}/
install -m 0644 ${WORKDIR}/weston.ini.kvm ${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"
FILES:${PN}-kvm = "${weston_ini_dir}/weston.ini.kvm"
IMAGE_INSTALL += " \
packagegroup-agl-demo-platform-flutter \
IMAGE_INSTALL += " \
packagegroup-agl-demo-platform-flutter \
- weston-ini-conf-flutter \
${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \
"
${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \
"