From 1e0aba7a5d676ff11a6e2eda1f412172b842dc0e Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 25 Jun 2024 15:37:58 -0400 Subject: Remove meta-agl-flutter Remove the meta-agl-flutter layer and its configuration template, as it is being moved to meta-agl. Bug-AGL: SPEC-5184 Change-Id: I59e9f8616a21d2e3b97da47baef1892c904d0002 Signed-off-by: Scott Murray --- meta-agl-flutter/tools/.gitignore | 151 --------------------- meta-agl-flutter/tools/configs/_globals.json | 5 - meta-agl-flutter/tools/configs/_repos.json | 11 -- .../tools/configs/agl-qemu-master.json | 114 ---------------- .../tools/configs/agl-qemu-octopus.json | 114 ---------------- meta-agl-flutter/tools/configs/desktop-auto.json | 92 ------------- meta-agl-flutter/tools/flutter_workspace.py | 1 - 7 files changed, 488 deletions(-) delete mode 100644 meta-agl-flutter/tools/.gitignore delete mode 100644 meta-agl-flutter/tools/configs/_globals.json delete mode 100644 meta-agl-flutter/tools/configs/_repos.json delete mode 100644 meta-agl-flutter/tools/configs/agl-qemu-master.json delete mode 100644 meta-agl-flutter/tools/configs/agl-qemu-octopus.json delete mode 100644 meta-agl-flutter/tools/configs/desktop-auto.json delete mode 120000 meta-agl-flutter/tools/flutter_workspace.py (limited to 'meta-agl-flutter/tools') diff --git a/meta-agl-flutter/tools/.gitignore b/meta-agl-flutter/tools/.gitignore deleted file mode 100644 index abda9b65..00000000 --- a/meta-agl-flutter/tools/.gitignore +++ /dev/null @@ -1,151 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -pip-wheel-metadata/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -.python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# IDEA -.idea - -# Flutter Workspace generated -.agl -.config -.flutter-auto -.pub_cache -.tmp -.vscode -setup_env.sh -flutter -app -flutter_*.log -qemu_run.scpt - -dart-revision.json -engine-revision.json - -*.scpt - diff --git a/meta-agl-flutter/tools/configs/_globals.json b/meta-agl-flutter/tools/configs/_globals.json deleted file mode 100644 index 4caf9e8a..00000000 --- a/meta-agl-flutter/tools/configs/_globals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "flutter-version": "3.19.3", - "github_token": "", - "cookie_file": "" -} \ No newline at end of file diff --git a/meta-agl-flutter/tools/configs/_repos.json b/meta-agl-flutter/tools/configs/_repos.json deleted file mode 100644 index 7002d416..00000000 --- a/meta-agl-flutter/tools/configs/_repos.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "uri": "https://github.com/toyota-connected/ivi-homescreen.git", - "rev": "ee49745485a88f23c32b8e3a62da40d4102c4623", - "branch": "agl" - }, - { - "uri": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "branch": "main" - } -] diff --git a/meta-agl-flutter/tools/configs/agl-qemu-master.json b/meta-agl-flutter/tools/configs/agl-qemu-master.json deleted file mode 100644 index eba953f7..00000000 --- a/meta-agl-flutter/tools/configs/agl-qemu-master.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "id": "agl-qemu-master", - "load": true, - "supported_archs": [ - "x86_64", - "arm64" - ], - "supported_host_types": [ - "darwin", - "ubuntu", - "fedora" - ], - "flutter_runtime": "debug", - "type": "qemu", - "env": { - "RELEASE_NAME": "master", - "RELEASE_VERSION": "latest", - "FLUTTER_DEBUG_PORT": "1234", - "FLUTTER_OBSERVATORY_HOST": "0.0.0.0", - "CONTAINER_SSH_PORT": "2222", - "DEVICE_HOSTNAME": "localhost", - "FLUTTER_AUTO_EXE": "flutter-auto --j=/tmp/${appName}/default_config.json --b=/tmp/${appName}", - "PING_CMD": "(echo >/dev/tcp/localhost/${CONTAINER_SSH_PORT}) &>/dev/null && echo open || echo closed", - "DELETE_USER_PWD": "ssh -p ${CONTAINER_SSH_PORT} -t -oBatchMode=yes root@${DEVICE_HOSTNAME} passwd -d agl-driver", - "CREATE_BUNDLE_FOLDER": "ssh -p ${CONTAINER_SSH_PORT} -o BatchMode=yes agl-driver@${DEVICE_HOSTNAME} mkdir -p /tmp/${appName}/data", - "COPY_PLATFORM_ID_TO_DEVICE": "scp -P ${CONTAINER_SSH_PORT} -r ${PLATFORM_ID_DIR}/default_config.json agl-driver@${DEVICE_HOSTNAME}:/tmp/${appName}/", - "COPY_ASSETS_TO_DEVICE": "scp -P ${CONTAINER_SSH_PORT} -r ${localPath}/* agl-driver@${DEVICE_HOSTNAME}:/tmp/${appName}/data/flutter_assets", - "DELETE_APP_FOLDER": "ssh -p ${CONTAINER_SSH_PORT} -o BatchMode=yes agl-driver@${DEVICE_HOSTNAME} rm -rf /tmp/${appName}" - }, - "runtime": { - "config": { - "view": [ - { - "window_type": "BG", - "width": 1920, - "height": 1080 - } - ] - }, - "pre-requisites": { - "arm64": { - "darwin": { - "cmds": [ - "bash -c \"arch -arm64 brew install xz\"", - "bash -c \"arch -arm64 brew install qemu\"" - ] - } - } - }, - "artifacts": { - "http": { - "url": "https://download.automotivelinux.org/AGL/snapshots/${RELEASE_NAME}/${RELEASE_VERSION}", - "artifacts": { - "x86_64": [ - { - "endpoint": "/qemux86-64/deploy/images/qemux86-64/agl-ivi-demo-platform-flutter-qemux86-64.wic.vmdk.xz" - } - ], - "arm64": [ - { - "endpoint": "/qemuarm64/deploy/images/qemuarm64/agl-demo-platform-crosssdk-qemuarm64.ext4.xz" - }, - { - "endpoint": "/qemuarm64/deploy/images/qemuarm64/Image-qemuarm64.bin" - } - ] - } - } - }, - "qemu": { - "cmd": "qemu-system-${FORMAL_MACHINE_ARCH}", - "x86_64": { - "image": "agl-ivi-demo-platform-flutter-qemux86-64.wic.vmdk", - "args": "-m 2048 ${QEMU_EXTRA} -hda ${QEMU_IMAGE} -cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -vga virtio -device virtio-rng-pci -serial mon:stdio -serial null -device intel-hda -device hda-duplex -device virtio-net-pci,netdev=net0,mac=${RANDOM_MAC} -netdev user,id=net0,hostfwd=tcp::${CONTAINER_SSH_PORT}-:22,hostfwd=tcp::${FLUTTER_DEBUG_PORT}-:${FLUTTER_DEBUG_PORT}" - }, - "arm64": { - "kernel": "Image-qemuarm64.bin", - "image": "agl-demo-platform-crosssdk-qemuarm64.ext4", - "args": "-accel hvf -cpu host -M virt ${QEMU_EXTRA} -m 4096 -device virtio-gpu-pci -nographic -display cocoa,show-cursor=on -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 -device qemu-xhci -device usb-tablet -device usb-mouse -device usb-kbd -device virtio-net-pci,netdev=vnet -netdev user,id=vnet,hostfwd=tcp::${CONTAINER_SSH_PORT}-:22,hostfwd=tcp::${FLUTTER_DEBUG_PORT}-:${FLUTTER_DEBUG_PORT} -kernel ${QEMU_KERNEL} -drive file=${QEMU_IMAGE},format=raw,if=virtio -append root=/dev/vda" - }, - "extra": { - "darwin": "-smp cpus=8,sockets=1,cores=8,threads=1", - "ubuntu": "-bios OVMF.fd", - "fedora": "-bios /usr/share/edk2/ovmf/OVMF_CODE.fd" - } - }, - "post_cmds": [ - { - "cwd": "${PLATFORM_ID_DIR}", - "cmds": [ - "bash -c \"rm ${QEMU_IMAGE}|true\"", - "unxz --keep ${QEMU_IMAGE}.xz" - ] - } - ] - }, - "overwrite-existing": true, - "custom-device": { - "id": "agl-qemu-${RELEASE_NAME}", - "label": "AGL ${RELEASE_NAME}-${RELEASE_VERSION} QEMU Image", - "sdkNameAndVersion": "qemu-${RELEASE_NAME} ${RELEASE_VERSION}", - "platform": "linux-x64", - "enabled": true, - "ping": "bash -c \"${PING_CMD}\"", - "pingSuccessRegex": "open", - "postBuild": "bash -c \"${DELETE_USER_PWD}\"", - "install": "bash -c \"${CREATE_BUNDLE_FOLDER} && ${COPY_PLATFORM_ID_TO_DEVICE} && ${COPY_ASSETS_TO_DEVICE}\"", - "uninstall": "bash -c \"${DELETE_APP_FOLDER}\"", - "runDebug": "bash -c \"ssh -t -t -o BatchMode=yes agl-driver@${DEVICE_HOSTNAME} ${FLUTTER_AUTO_EXE}\"", - "forwardPort": null, - "forwardPortSuccessRegex": null, - "screenshot": null - } -} \ No newline at end of file diff --git a/meta-agl-flutter/tools/configs/agl-qemu-octopus.json b/meta-agl-flutter/tools/configs/agl-qemu-octopus.json deleted file mode 100644 index dba5a882..00000000 --- a/meta-agl-flutter/tools/configs/agl-qemu-octopus.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "id": "agl-qemu-octopus", - "load": true, - "supported_archs": [ - "x86_64", - "arm64" - ], - "supported_host_types": [ - "darwin", - "ubuntu", - "fedora" - ], - "flutter_runtime": "debug", - "type": "qemu", - "env": { - "RELEASE_NAME": "octopus", - "RELEASE_VERSION": "latest", - "FLUTTER_DEBUG_PORT": "1234", - "FLUTTER_OBSERVATORY_HOST": "0.0.0.0", - "CONTAINER_SSH_PORT": "2222", - "DEVICE_HOSTNAME": "localhost", - "FLUTTER_AUTO_EXE": "flutter-auto --j=/tmp/${appName}/default_config.json --b=/tmp/${appName}", - "PING_CMD": "(echo >/dev/tcp/localhost/${CONTAINER_SSH_PORT}) &>/dev/null && echo open || echo closed", - "DELETE_USER_PWD": "ssh -p ${CONTAINER_SSH_PORT} -t -oBatchMode=yes root@${DEVICE_HOSTNAME} passwd -d agl-driver", - "CREATE_BUNDLE_FOLDER": "ssh -p ${CONTAINER_SSH_PORT} -o BatchMode=yes agl-driver@${DEVICE_HOSTNAME} mkdir -p /tmp/${appName}/data", - "COPY_PLATFORM_ID_TO_DEVICE": "scp -P ${CONTAINER_SSH_PORT} -r ${PLATFORM_ID_DIR}/default_config.json agl-driver@${DEVICE_HOSTNAME}:/tmp/${appName}/", - "COPY_ASSETS_TO_DEVICE": "scp -P ${CONTAINER_SSH_PORT} -r ${localPath}/* agl-driver@${DEVICE_HOSTNAME}:/tmp/${appName}/data/flutter_assets", - "DELETE_APP_FOLDER": "ssh -p ${CONTAINER_SSH_PORT} -o BatchMode=yes agl-driver@${DEVICE_HOSTNAME} rm -rf /tmp/${appName}" - }, - "runtime": { - "config": { - "view": [ - { - "window_type": "BG", - "width": 1920, - "height": 1080 - } - ] - }, - "pre-requisites": { - "arm64": { - "darwin": { - "cmds": [ - "bash -c \"arch -arm64 brew install xz\"", - "bash -c \"arch -arm64 brew install qemu\"" - ] - } - } - }, - "artifacts": { - "http": { - "url": "https://download.automotivelinux.org/AGL/release/${RELEASE_NAME}/${RELEASE_VERSION}", - "artifacts": { - "x86_64": [ - { - "endpoint": "/qemux86-64/deploy/images/qemux86-64/agl-ivi-demo-platform-flutter-qemux86-64.wic.vmdk.xz" - } - ], - "arm64": [ - { - "endpoint": "/qemuarm64/deploy/images/qemuarm64/agl-demo-platform-crosssdk-qemuarm64.ext4.xz" - }, - { - "endpoint": "/qemuarm64/deploy/images/qemuarm64/Image-qemuarm64.bin" - } - ] - } - } - }, - "qemu": { - "cmd": "qemu-system-${FORMAL_MACHINE_ARCH}", - "x86_64": { - "image": "agl-ivi-demo-platform-flutter-qemux86-64.wic.vmdk", - "args": "-m 2048 ${QEMU_EXTRA} -hda ${QEMU_IMAGE} -cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -vga virtio -device virtio-rng-pci -serial mon:stdio -serial null -device intel-hda -device hda-duplex -device virtio-net-pci,netdev=net0,mac=${RANDOM_MAC} -netdev user,id=net0,hostfwd=tcp::${CONTAINER_SSH_PORT}-:22,hostfwd=tcp::${FLUTTER_DEBUG_PORT}-:${FLUTTER_DEBUG_PORT}" - }, - "arm64": { - "kernel": "Image-qemuarm64.bin", - "image": "agl-demo-platform-crosssdk-qemuarm64.ext4", - "args": "-accel hvf -cpu host -M virt ${QEMU_EXTRA} -m 4096 -device virtio-gpu-pci -nographic -display cocoa,show-cursor=on -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 -device qemu-xhci -device usb-tablet -device usb-mouse -device usb-kbd -device virtio-net-pci,netdev=vnet -netdev user,id=vnet,hostfwd=tcp::${CONTAINER_SSH_PORT}-:22,hostfwd=tcp::${FLUTTER_DEBUG_PORT}-:${FLUTTER_DEBUG_PORT} -kernel ${QEMU_KERNEL} -drive file=${QEMU_IMAGE},format=raw,if=virtio -append root=/dev/vda" - }, - "extra": { - "darwin": "-smp cpus=8,sockets=1,cores=8,threads=1", - "ubuntu": "-bios OVMF.fd", - "fedora": "-bios /usr/share/edk2/ovmf/OVMF_CODE.fd" - } - }, - "post_cmds": [ - { - "cwd": "${PLATFORM_ID_DIR}", - "cmds": [ - "bash -c \"rm ${QEMU_IMAGE}|true\"", - "unxz --keep ${QEMU_IMAGE}.xz" - ] - } - ] - }, - "overwrite-existing": true, - "custom-device": { - "id": "agl-qemu-${RELEASE_NAME}", - "label": "AGL ${RELEASE_NAME}-${RELEASE_VERSION} QEMU Image", - "sdkNameAndVersion": "qemu-${RELEASE_NAME} ${RELEASE_VERSION}", - "platform": "linux-x64", - "enabled": true, - "ping": "bash -c \"${PING_CMD}\"", - "pingSuccessRegex": "open", - "postBuild": "bash -c \"${DELETE_USER_PWD}\"", - "install": "bash -c \"${CREATE_BUNDLE_FOLDER} && ${COPY_PLATFORM_ID_TO_DEVICE} && ${COPY_ASSETS_TO_DEVICE}\"", - "uninstall": "bash -c \"${DELETE_APP_FOLDER}\"", - "runDebug": "bash -c \"ssh -t -t -o BatchMode=yes agl-driver@${DEVICE_HOSTNAME} ${FLUTTER_AUTO_EXE}\"", - "forwardPort": null, - "forwardPortSuccessRegex": null, - "screenshot": null - } -} \ No newline at end of file diff --git a/meta-agl-flutter/tools/configs/desktop-auto.json b/meta-agl-flutter/tools/configs/desktop-auto.json deleted file mode 100644 index cb3b9e68..00000000 --- a/meta-agl-flutter/tools/configs/desktop-auto.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "id": "desktop-auto", - "load": true, - "supported_archs": [ - "x86_64" - ], - "supported_host_types": [ - "ubuntu", - "fedora" - ], - "flutter_runtime": "debug", - "type": "host", - "env": { - "HOMESCREEN_SRC_DIR": "${FLUTTER_WORKSPACE}/app/ivi-homescreen", - "HOMESCREEN_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/ivi-homescreen/build", - "HOMESCREEN_CMAKE_ARGS": "-DCMAKE_BUILD_TYPE=Debug -DENABLE_DLT=OFF", - "HOMESCREEN_EXE": "${HOMESCREEN_BUILD_DIR}/shell/homescreen --j=${PLATFORM_ID_DIR_RELATIVE}/default_config.json --b=${PLATFORM_ID_DIR_RELATIVE}", - "PING_CMD": "loginctl show-session $(awk '/tty/ {print $1}' <(loginctl)) -p Type", - "CREATE_BUNDLE_FOLDER": "mkdir -p ${PLATFORM_ID_DIR_RELATIVE}/data", - "COPY_PLATFORM_ID_TO_BUNDLE_FOLDER": "cp -r ${PLATFORM_ID_DIR}/default_config.json ${PLATFORM_ID_DIR_RELATIVE}/", - "COPY_BUNDLE_FOLDER_TO_PLATOFRM_ID": "cp -r ${BUNDLE_FOLDER}/* ${PLATFORM_ID_DIR_RELATIVE}/", - "CREATE_ASSET_SYMLINK": "ln -rsf build/flutter_assets ${PLATFORM_ID_DIR_RELATIVE}/data/flutter_assets", - "STAGE_BUNDLE_FOLDER": "${CREATE_BUNDLE_FOLDER} && ${COPY_PLATFORM_ID_TO_BUNDLE_FOLDER} && ${COPY_BUNDLE_FOLDER_TO_PLATOFRM_ID} && ${CREATE_ASSET_SYMLINK}" - }, - "runtime": { - "config": { - "view": [ - { - "width": 1920, - "height": 1080, - "cursor_theme": "DMZ-White", - "fullscreen": false - } - ] - }, - "pre-requisites": { - "x86_64": { - "ubuntu": { - "cmds": [ - "sudo snap install cmake --classic", - "sudo add-apt-repository -y ppa:kisak/kisak-mesa", - "sudo apt update -y", - "sudo apt install lsb-release wget software-properties-common gnupg apt-file", - "sudo apt-file update", - "sudo apt install -y libwayland-dev wayland-protocols mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev mesa-utils libxkbcommon-dev ninja-build", - "sudo apt install -y build-essential libvulkan-dev vulkan-tools vulkan-validationlayers vulkan-utils libtool", - "sudo apt autoremove -y", - "sudo apt clean -y", - "cmake --version", - "apt-file search cmake" - ] - }, - "fedora": { - "cmds": [ - "sudo dnf -y update", - "sudo dnf -y upgrade", - "sudo dnf -y install wayland-devel wayland-protocols-devel libxkbcommon-devel cmake ninja-build mesa-dri-drivers mesa-filesystem mesa-libEGL-devel mesa-libGL-devel mesa-libGLU-devel mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-vulkan-drivers vulkan-tools libunwind-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel gstreamer1-plugins-bad-free-extras gstreamer1-plugins-base-tools gstreamer1-plugins-good gstreamer1-plugins-good-extras gstreamer1-plugins-ugly-free libtool", - "sudo dnf -y autoremove", - "cmake --version", - "dnf provides cmake" - ] - } - } - }, - "post_cmds": [ - { - "cwd": "${HOMESCREEN_BUILD_DIR}", - "cmds": [ - "cmake ${HOMESCREEN_SRC_DIR} ${HOMESCREEN_CMAKE_ARGS}", - "make homescreen -j" - ] - } - ] - }, - "overwrite-existing": true, - "custom-device": { - "id": "desktop-auto", - "label": "Toyota Homescreen for AGL", - "sdkNameAndVersion": "flutter-auto x86_64", - "platform": "linux-x64", - "enabled": true, - "ping": "bash -c \"${PING_CMD}\"", - "pingSuccessRegex": "Type=wayland", - "postBuild": "bash -c \"rm -rf ${PLATFORM_ID_DIR_RELATIVE}\"", - "install": "bash -c \"${STAGE_BUNDLE_FOLDER}\"", - "uninstall": "bash -c \"rm -rf ${PLATFORM_ID_DIR_RELATIVE}\"", - "runDebug": "bash -c \"${HOMESCREEN_EXE}\"", - "forwardPort": null, - "forwardPortSuccessRegex": null, - "screenshot": null - } -} \ No newline at end of file diff --git a/meta-agl-flutter/tools/flutter_workspace.py b/meta-agl-flutter/tools/flutter_workspace.py deleted file mode 120000 index faacf59e..00000000 --- a/meta-agl-flutter/tools/flutter_workspace.py +++ /dev/null @@ -1 +0,0 @@ -external/workspace-automation/flutter_workspace.py \ No newline at end of file -- cgit 1.2.3-korg