From 882eeb6a44b443ef13a4b3111330cd0b603d3f1b Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Wed, 31 May 2023 18:35:35 -0700 Subject: Flutter bbclass refactor -remove use of bbclass runtime modes -use external automation-workspace repo Scott Murray: - update flutter-auto agl-shell platform channel plugin patch with reworked version from Marius Vlad. Bug-AGL: SPEC-4819 Change-Id: I7510f916ab70d8bab78fdb9ab235092f84c3713a Signed-off-by: Joel Winarske Signed-off-by: Scott Murray --- .../tools/flutter_workspace_config.json | 156 --------------------- 1 file changed, 156 deletions(-) delete mode 100644 meta-agl-flutter/tools/flutter_workspace_config.json (limited to 'meta-agl-flutter/tools/flutter_workspace_config.json') diff --git a/meta-agl-flutter/tools/flutter_workspace_config.json b/meta-agl-flutter/tools/flutter_workspace_config.json deleted file mode 100644 index bb7f23cc..00000000 --- a/meta-agl-flutter/tools/flutter_workspace_config.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "flutter-version": "3.3.1", - "platforms": [ - { - "id": "desktop-auto", - "type": "host", - "arch": "x86_64", - "flutter_runtime": "debug", - "runtime": { - "backend": "egl", - "config": { - "width": 1920, - "height": 1080, - "cursor_theme": "DMZ-White" - }, - "install_dependent_packages": true, - "artifact_source": "github", - "github_owner": "toyota-connected", - "github_repo": "ivi-homescreen", - "github_workflow": "flutter-auto-linux.yml", - "github_artifact": "flutter-auto-${BACKEND}-dbg.amd64.deb.zip" - }, - "overwrite-existing": true, - "custom-device": { - "id": "desktop-auto", - "label": "Toyota flutter-auto", - "sdkNameAndVersion": "flutter-auto x86_64", - "platform": "linux-x64", - "enabled": true, - "ping": ["bash", "-c", "loginctl show-session $(awk '/tty/ {print $1}' <(loginctl)) -p Type"], - "pingSuccessRegex": "Type=wayland", - "postBuild": null, - "install": ["bash", "-c", "mkdir -p /tmp/${appName}/data/flutter_assets && cp -r ${BUNDLE_FOLDER}/* /tmp/${appName} && cp -r ${localPath}/* /tmp/${appName}/data/flutter_assets"], - "uninstall": ["rm", "-rf", "tmp/${appName}"], - "runDebug": ["flutter-auto", "--j=${FLUTTER_WORKSPACE}/.flutter-auto/default_config.json", "--b=/tmp/${appName}"], - "forwardPort": null, - "forwardPortSuccessRegex": null, - "screenshot": null - } - }, - { - "id": "AGL-qemu", - "type": "qemu", - "arch": "x86_64", - "flutter_runtime": "debug", - "runtime": { - "config": { - "window_type": "BG", - "width": 1920, - "height": 1080, - "fullscreen": true - }, - "install_dependent_packages": true, - "relative_path": ".agl/agl-image-flutter-runtime${FLUTTER_RUNTIME}-qemux86-64.wic.vmdk", - "artifact_source": "github", - "github_owner": "meta-flutter", - "github_repo": "meta-flutter", - "github_workflow": "kirkstone-agl-x86_64.yml", - "github_artifact": "agl-image-flutter-runtime${FLUTTER_RUNTIME}-qemux86-64-linux", - "ovmf_path": "/usr/share/ovmf/OVMF.fd", - "cmd": "qemu-system-x86_64", - "args": "-enable-kvm -m 2048 -bios ${OVMF_PATH} -hda ${QEMU_IMAGE} -cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -vga virtio -show-cursor -device virtio-rng-pci -serial mon:stdio -serial null -soundhw hda -device virtio-net-pci,netdev=net0,mac=52:54:00:12:35:02 -netdev user,id=net0,hostfwd=tcp::2222-:22,hostfwd=tcp::1234-:1234" - }, - "overwrite-existing": true, - "custom-device": { - "id": "AGL-qemu", - "label": "AGL x86_64 QEMU Image", - "sdkNameAndVersion": "agl-image-flutter-runtime${FLUTTER_RUNTIME}-qemux86-64.wic.vmdk", - "platform": "linux-x64", - "enabled": true, - "ping": [ - "bash", "-c", "(echo >/dev/tcp/localhost/2222) &>/dev/null && echo \"open 2222\" || echo \"close 2222\"" - ], - "pingSuccessRegex": "open 2222", - "postBuild": [ - "bash", "-c", "mkdir -p ${localPath}/../../.flutter-auto/data/flutter_assets && cp -r ${localPath}/* ${localPath}/../../.flutter-auto/data/flutter_assets && cp -r ${FLUTTER_WORKSPACE}/.agl/default_config.json ${localPath}/../../.flutter-auto/ && ssh -p 2222 -t -oBatchMode=yes root@localhost passwd -d agl-driver" - ], - "uninstall": [ - "bash", "-c", "ssh -p 2222 -t -t -oBatchMode=yes agl-driver@localhost rm -rf \"/tmp/${appName}\"" - ], - "install": [ - "bash", "-c", "ssh -p 2222 -t -t -oBatchMode=yes agl-driver@localhost mkdir -p \"/tmp/${appName}/data/flutter_assets\" && scp -r -P 2222 ${localPath}/../../.flutter-auto/* agl-driver@localhost:/tmp/${appName}" - ], - "runDebug": [ - "ssh", "-t", "-t", "-p", "2222", "-oBatchMode=yes", "agl-driver@localhost", - "flutter-auto", - "--j=/tmp/${appName}/default_config.json", - "--b=/tmp/${appName}", - "--observatory-host=0.0.0.0", - "--observatory-port=1234" - ], - "forwardPort": null, - "forwardPortSuccessRegex": null, - "screenshot": null - } - } - ], - "repos": [ - { - "uri": "https://github.com/flutter/gallery.git", - "branch": "master", - "rev": "9eb785cb997ff56c46e933c1c591f0a6f31454f6", - "pubspec_path": "gallery" - }, - { - "uri": "git@github.com:meta-flutter/tests.git", - "branch": "main" - }, - { - "uri": "https://github.com/meta-flutter/flutter_animated_background.git", - "branch": "meta-flutter", - "pubspec_path": "flutter_animated_background/example" - }, - { - "uri": "https://github.com/mogol/flutter_secure_storage.git", - "branch": "develop", - "rev": "e716593352b80330e05729486eade7c2167d3c71", - "pubspec_path": "flutter_secure_storage/flutter_secure_storage/example" - }, - { - "uri": "https://github.com/felipeerias/flutter_homescreen.git", - "branch": "main", - "pubspec_path": "flutter_homescreen" - }, - { - "uri": "https://github.com/bernardpumped/ped.git", - "branch": "agl", - "pubspec_path": "ped" - }, - { - "uri": "https://gerrit.automotivelinux.org/gerrit/apps/flutter-dashboard.git", - "branch": "master", - "pubspec_path": "flutter-dashboard" - }, - { - "uri": "https://gerrit.automotivelinux.org/gerrit/apps/flutter-hvac.git", - "branch": "master", - "pubspec_path": "flutter-hvac" - }, - { - "uri": "https://gerrit.automotivelinux.org/gerrit/apps/flutter-instrument-cluster.git", - "branch": "master", - "pubspec_path": "flutter-instrument-cluster" - }, - { - "uri": "https://gerrit.automotivelinux.org/gerrit/apps/flutter-mediaplayer.git", - "branch": "master", - "pubspec_path": "flutter-mediaplayer" - }, - { - "uri": "https://gerrit.automotivelinux.org/gerrit/apps/flutter-navigation.git", - "branch": "master", - "pubspec_path": "flutter-navigation" - } - ] -} -- cgit 1.2.3-korg