diff --git a/weston/README.md b/weston/README.md index 5600d24..5bcae55 100644 --- a/weston/README.md +++ b/weston/README.md @@ -1,18 +1,16 @@ # Weston Desktop Environment # -![Torizon Version](https://img.shields.io/badge/Torizon_OS-6.8.1-blue?logo=torizon) +![Torizon Version](https://img.shields.io/badge/Torizon_OS-7.1.0-blue?logo=torizon)   -![Torizon Container](https://img.shields.io/badge//torizon/weston-3-blue?logo=docker) +![Torizon Container](https://img.shields.io/badge//torizon/weston-4.4.0-blue?logo=docker)   -![Torizon Container](https://img.shields.io/badge//torizon/weston--vivante-3-blue?logo=docker) +![Torizon Container](https://img.shields.io/badge//torizon/weston--vivante-4.4.0-blue?logo=docker)   -![Torizon Container](https://img.shields.io/badge//torizon/weston--am62-3-blue?logo=docker) +![Torizon Container](https://img.shields.io/badge//torizon/weston--am62-4.4.0-blue?logo=docker) This app starts a standalone instance of Weston from where you can launch other applications like the weston-terminal Terminal Emulator. -![Screenshot](https://docs1.toradex.com/116545-demogalleryweston.png?v=1) - -A blank dark-blue screen. +![Screenshot](https://docs1.toradex.com/116545-demogalleryweston.png?v=3) ## About @@ -50,4 +48,4 @@ To run this demo, you need:s ## More Resources - [Weston on Torizon OS](https://developer.toradex.com/torizon/6/application-development/provided-containers/working-with-weston-on-torizoncore); -- [Torizon Containers Github](https://github.com/torizon/torizon-containers/tree/oldstable/debian-docker-images/imx/weston); \ No newline at end of file +- [Torizon Containers Github](https://github.com/torizon/torizon-containers/tree/oldstable/debian-docker-images/imx/weston); diff --git a/weston/app.json b/weston/app.json index 3039128..79acde6 100644 --- a/weston/app.json +++ b/weston/app.json @@ -3,64 +3,64 @@ [ { "name": "weston-apalis-imx6", - "filename": "docker-compose-apalis-imx6.yml", - "version": "3", + "filename": "docker-compose-upstream.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" }, { "name": "weston-apalis-imx8", - "filename": "docker-compose-apalis-imx8.yml", - "version": "3", + "filename": "docker-compose-imx8.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" }, { "name": "weston-colibri-imx6", - "filename": "docker-compose-colibri-imx6.yml", - "version": "3", + "filename": "docker-compose-upstream.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" }, { "name": "weston-colibri-imx6ull", - "filename": "docker-compose-colibri-imx6ull.yml", - "version": "3", + "filename": "docker-compose-upstream.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" }, { "name": "weston-colibri-imx7", - "filename": "docker-compose-colibri-imx7.yml", - "version": "3", + "filename": "docker-compose-colibri-upstream.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" }, { "name": "weston-colibri-imx8x", - "filename": "docker-compose-colibri-imx8x.yml", - "version": "3", + "filename": "docker-compose-imx8.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" }, { "name": "weston-verdin-am62", - "filename": "docker-compose-verdin-am62.yml", - "version": "3", + "filename": "docker-compose-am62.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" }, { "name": "weston-verdin-imx8mm", - "filename": "docker-compose-verdin-imx8mm.yml", - "version": "3", + "filename": "docker-compose-imx8.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" }, { "name": "weston-verdin-imx8mp", - "filename": "docker-compose-verdin-imx8mp.yml", - "version": "3", + "filename": "docker-compose-imx8.yml", + "version": "torizon-7", "icon": "icon.png", "description": "README.md" } diff --git a/weston/docker-compose-verdin-am62.yml b/weston/docker-compose-am62.yml similarity index 56% rename from weston/docker-compose-verdin-am62.yml rename to weston/docker-compose-am62.yml index 4155a83..4b774e6 100644 --- a/weston/docker-compose-verdin-am62.yml +++ b/weston/docker-compose-am62.yml @@ -3,12 +3,18 @@ services: cap_add: - CAP_SYS_TTY_CONFIG command: - - --tty=/dev/tty7 + - '/usr/bin/entry.sh --tty=/dev/tty7 --developer & sleep 5 && weston-simple-shm + | weston-simple-egl | weston-simple-damage | weston-flower + + ' device_cgroup_rules: - c 4:* rmw - c 13:* rmw - c 226:* rmw - image: torizon/weston-am62@sha256:ded14c38171722dd327ed8cea44310ad793e9e263451729701a99540fae27880 + entrypoint: + - /bin/sh + - -c + image: torizon/weston-am62@sha256:ea98ff1dd384de90aae52fbf11c6b1ec3ef727f5514c9a1e72912903c2ebe9fa network_mode: host platform: linux/arm64 volumes: diff --git a/weston/docker-compose-colibri-imx6.yml b/weston/docker-compose-colibri-imx6.yml deleted file mode 100644 index 0ae8a9a..0000000 --- a/weston/docker-compose-colibri-imx6.yml +++ /dev/null @@ -1,24 +0,0 @@ -services: - weston: - cap_add: - - CAP_SYS_TTY_CONFIG - command: - - --tty=/dev/tty7 - device_cgroup_rules: - - c 4:* rmw - - c 13:* rmw - - c 226:* rmw - image: torizon/weston@sha256:857f83d0f5b63fe2e7d6e0f07f6264f936c58588b1ab77391b0ed5c5965b2da5 - network_mode: host - platform: linux/arm/v7 - volumes: - - source: /tmp - target: /tmp - type: bind - - source: /dev - target: /dev - type: bind - - source: /run/udev - target: /run/udev - type: bind -version: '3' diff --git a/weston/docker-compose-colibri-imx6ull.yml b/weston/docker-compose-colibri-imx6ull.yml deleted file mode 100644 index ab3e4f5..0000000 --- a/weston/docker-compose-colibri-imx6ull.yml +++ /dev/null @@ -1,27 +0,0 @@ -services: - weston: - cap_add: - - CAP_SYS_TTY_CONFIG - command: - - --tty=/dev/tty7 - - -- - - --use-pixman - device_cgroup_rules: - - c 4:* rmw - - c 13:* rmw - - c 226:* rmw - image: torizon/weston@sha256:857f83d0f5b63fe2e7d6e0f07f6264f936c58588b1ab77391b0ed5c5965b2da5 - ipc: host - network_mode: host - platform: linux/arm/v7 - volumes: - - source: /tmp - target: /tmp - type: bind - - source: /dev - target: /dev - type: bind - - source: /run/udev - target: /run/udev - type: bind -version: '3' diff --git a/weston/docker-compose-colibri-imx8x.yml b/weston/docker-compose-imx8.yml similarity index 58% rename from weston/docker-compose-colibri-imx8x.yml rename to weston/docker-compose-imx8.yml index 4540c2e..63de7b6 100644 --- a/weston/docker-compose-colibri-imx8x.yml +++ b/weston/docker-compose-imx8.yml @@ -3,15 +3,22 @@ services: cap_add: - CAP_SYS_TTY_CONFIG command: - - --tty=/dev/tty7 + - '/usr/bin/entry.sh --tty=/dev/tty7 --developer & sleep 5 && weston-simple-shm + | weston-simple-egl | weston-simple-damage | weston-flower + + ' device_cgroup_rules: - c 4:* rmw - c 13:* rmw - c 226:* rmw - c 199:* rmw + - c 253:* rmw + entrypoint: + - /bin/sh + - -c environment: - ACCEPT_FSL_EULA=1 - image: torizon/weston-vivante@sha256:20b09290a5238b2b61d5f6965e2407347867100f488ce77cfd19f485d82501e6 + image: torizon/weston-imx8@sha256:43062b97a1fcd7db991c0ea1c9f90442fe61c384232e09c61970eb58f69e19e1 network_mode: host platform: linux/arm64 volumes: diff --git a/weston/docker-compose-apalis-imx6.yml b/weston/docker-compose-upstream.yml similarity index 57% rename from weston/docker-compose-apalis-imx6.yml rename to weston/docker-compose-upstream.yml index 0ae8a9a..46201cd 100644 --- a/weston/docker-compose-apalis-imx6.yml +++ b/weston/docker-compose-upstream.yml @@ -3,12 +3,18 @@ services: cap_add: - CAP_SYS_TTY_CONFIG command: - - --tty=/dev/tty7 + - '/usr/bin/entry.sh --tty=/dev/tty7 --developer & sleep 5 && weston-simple-shm + | weston-simple-egl | weston-simple-damage | weston-flower + + ' device_cgroup_rules: - c 4:* rmw - c 13:* rmw - c 226:* rmw - image: torizon/weston@sha256:857f83d0f5b63fe2e7d6e0f07f6264f936c58588b1ab77391b0ed5c5965b2da5 + entrypoint: + - /bin/sh + - -c + image: torizon/weston@sha256:2edb0354e0c26db992d095db71ff8b1d4ff3879f1bc0e19d534062f48ce05684 network_mode: host platform: linux/arm/v7 volumes: diff --git a/weston/docker-compose-verdin-imx8mp.yml b/weston/docker-compose-verdin-imx8mp.yml deleted file mode 100644 index 4540c2e..0000000 --- a/weston/docker-compose-verdin-imx8mp.yml +++ /dev/null @@ -1,27 +0,0 @@ -services: - weston: - cap_add: - - CAP_SYS_TTY_CONFIG - command: - - --tty=/dev/tty7 - device_cgroup_rules: - - c 4:* rmw - - c 13:* rmw - - c 226:* rmw - - c 199:* rmw - environment: - - ACCEPT_FSL_EULA=1 - image: torizon/weston-vivante@sha256:20b09290a5238b2b61d5f6965e2407347867100f488ce77cfd19f485d82501e6 - network_mode: host - platform: linux/arm64 - volumes: - - source: /tmp - target: /tmp - type: bind - - source: /dev - target: /dev - type: bind - - source: /run/udev - target: /run/udev - type: bind -version: '3' diff --git a/weston/docker-compose-verdin-imx8mm.yml b/weston/tests/docker-compose-am62.test.yml similarity index 55% rename from weston/docker-compose-verdin-imx8mm.yml rename to weston/tests/docker-compose-am62.test.yml index 4540c2e..accd3af 100644 --- a/weston/docker-compose-verdin-imx8mm.yml +++ b/weston/tests/docker-compose-am62.test.yml @@ -3,15 +3,18 @@ services: cap_add: - CAP_SYS_TTY_CONFIG command: - - --tty=/dev/tty7 + - '/usr/bin/entry.sh --tty=/dev/tty7 --developer ${WESTON_DEBUG} & sleep 5 && + weston-simple-shm | weston-simple-egl | weston-simple-damage | weston-flower + + ' device_cgroup_rules: - c 4:* rmw - c 13:* rmw - c 226:* rmw - - c 199:* rmw - environment: - - ACCEPT_FSL_EULA=1 - image: torizon/weston-vivante@sha256:20b09290a5238b2b61d5f6965e2407347867100f488ce77cfd19f485d82501e6 + entrypoint: + - /bin/sh + - -c + image: torizon/weston-am62@sha256:ea98ff1dd384de90aae52fbf11c6b1ec3ef727f5514c9a1e72912903c2ebe9fa network_mode: host platform: linux/arm64 volumes: diff --git a/weston/docker-compose-apalis-imx8.yml b/weston/tests/docker-compose-imx8.test.yml similarity index 57% rename from weston/docker-compose-apalis-imx8.yml rename to weston/tests/docker-compose-imx8.test.yml index 4540c2e..5d50c83 100644 --- a/weston/docker-compose-apalis-imx8.yml +++ b/weston/tests/docker-compose-imx8.test.yml @@ -3,15 +3,22 @@ services: cap_add: - CAP_SYS_TTY_CONFIG command: - - --tty=/dev/tty7 + - '/usr/bin/entry.sh --tty=/dev/tty7 --developer ${WESTON_DEBUG} & sleep 5 && weston-simple-shm + | weston-simple-egl | weston-simple-damage | weston-flower + + ' device_cgroup_rules: - c 4:* rmw - c 13:* rmw - c 226:* rmw - c 199:* rmw + - c 253:* rmw + entrypoint: + - /bin/sh + - -c environment: - ACCEPT_FSL_EULA=1 - image: torizon/weston-vivante@sha256:20b09290a5238b2b61d5f6965e2407347867100f488ce77cfd19f485d82501e6 + image: torizon/weston-imx8@sha256:43062b97a1fcd7db991c0ea1c9f90442fe61c384232e09c61970eb58f69e19e1 network_mode: host platform: linux/arm64 volumes: diff --git a/weston/docker-compose-colibri-imx7.yml b/weston/tests/docker-compose-upstream.test.yml similarity index 56% rename from weston/docker-compose-colibri-imx7.yml rename to weston/tests/docker-compose-upstream.test.yml index ab3e4f5..3b1bc6e 100644 --- a/weston/docker-compose-colibri-imx7.yml +++ b/weston/tests/docker-compose-upstream.test.yml @@ -3,15 +3,18 @@ services: cap_add: - CAP_SYS_TTY_CONFIG command: - - --tty=/dev/tty7 - - -- - - --use-pixman + - '/usr/bin/entry.sh --tty=/dev/tty7 --developer ${WESTON_DEBUG} & sleep 5 && weston-simple-shm + | weston-simple-egl | weston-simple-damage | weston-flower + + ' device_cgroup_rules: - c 4:* rmw - c 13:* rmw - c 226:* rmw - image: torizon/weston@sha256:857f83d0f5b63fe2e7d6e0f07f6264f936c58588b1ab77391b0ed5c5965b2da5 - ipc: host + entrypoint: + - /bin/sh + - -c + image: torizon/weston@sha256:2edb0354e0c26db992d095db71ff8b1d4ff3879f1bc0e19d534062f48ce05684 network_mode: host platform: linux/arm/v7 volumes: