Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Podman flavour with support for toolbox #25

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
bb713b9
toradex-kernel-cache: bump SRCREV to latest
EdTheBearded Jan 15, 2024
1f87d04
ostree-customize-plymouth: fix a invalid condition check
MingliuYan Jan 4, 2024
725e397
grub/grub-efi: fs/fat: Don't error when mtime is 0
MingliuYan Jan 4, 2024
2d3ea01
grub-efi: integrate some changes from meta-lmp
MingliuYan Jan 4, 2024
f4d7987
docker-ce: drop duplicated docker.service file
MingliuYan Jan 6, 2024
765f32d
qemuarm64/genericx86-64: support set-hostname
MingliuYan Dec 18, 2023
1741725
network-configuration: drop recipe and its references
MingliuYan Jan 10, 2024
7ff2bb0
genericx86-64: support qemu ovmf
MingliuYan Jan 10, 2024
417a948
docker-compose: introduce pkgconfig docker-plugin
MingliuYan Dec 19, 2023
c2c3e10
docker-compose: drop docker-compose shell wrapper
MingliuYan Dec 19, 2023
3f7649a
docker-integrity-checker: also support podman
MingliuYan Dec 19, 2023
6c37de9
podman: update to v4.8.2
MingliuYan Dec 19, 2023
58a38a3
podman: support --config option to locate authentication file
MingliuYan Jan 5, 2024
0c6a2dd
podman: tweak podman.service
MingliuYan Jan 5, 2024
b7f4b30
podman: allow torizon user run podman as sudoer without passwd
MingliuYan Jan 5, 2024
afbabad
podman: support podman/docker bash completions
MingliuYan Jan 7, 2024
8a41a86
netavark: add recipe
MingliuYan Jan 10, 2024
593e18a
aardvark-dns: add recipe
MingliuYan Jan 10, 2024
c5a601c
podman: switch to use netavark as container networking
MingliuYan Jan 10, 2024
f319396
crun: add recipe
MingliuYan Jan 10, 2024
2fcc53c
podman: switch to use crun as container runtime
MingliuYan Jan 11, 2024
babeb5d
meta: move docker environment files to torizon-conf
MingliuYan Jan 10, 2024
d2a6d44
torizon-core-container.inc: introduce an include file
MingliuYan Dec 19, 2023
56a3799
genericx86-64: add qemu-system-native to EXTRA_IMAGEDEPENDS
MingliuYan Jan 21, 2024
06cae1d
container-host-config: add transient-store PACKAGECONFIG
MingliuYan Jan 25, 2024
c21c684
container-host-config: add transient-store PACKAGECONFIG (#1)
jsrc27 Jan 29, 2024
f58a041
linux:torizoncore.cfg: add configs to support zram
MingliuYan Jan 31, 2024
b6fcb4c
systemd: increase SaveIntervalSec to 3600 secs
MingliuYan Jan 31, 2024
b2a2f97
kernel-devsrc.bbappend: support arm64 kernel 5.19+ on Kirkstone
lucas-akira Feb 1, 2024
86354b5
container-host-config:storage.conf: sync with libpod v4.8.2
MingliuYan Feb 1, 2024
1fbfdb0
auto-provisioning: add service restart for remote access (RAC)
EdTheBearded Feb 1, 2024
012b9eb
Merge pull request #3 from MingliuYan/add-zram-support-to-qemuarm64-g…
jsrc27 Feb 1, 2024
0a58269
Merge pull request #4 from MingliuYan/systemd-increase-SaveIntervalSe…
jsrc27 Feb 1, 2024
d1f50f4
Merge pull request #5 from MingliuYan/sync-storage-conf-with-libpod-4…
jsrc27 Feb 1, 2024
e60ba5d
Merge pull request #7 from EdTheBearded/auto-provision-rac
jsrc27 Feb 1, 2024
5af2bf4
kernel-devsrc.bbappend: support arm kernel 5.19+ on Kirkstone
lucas-akira Feb 1, 2024
002fc19
Merge pull request #6 from lucas-akira/arm64-kernel-5.19-support
jsrc27 Feb 1, 2024
537cbfd
toradex-kernel-cache: bump SRCREV to latest
EdTheBearded Feb 1, 2024
362b571
aktualizr-torizon: bump SRCREV to latest
EdTheBearded Feb 1, 2024
73d5c90
Merge pull request #8 from EdTheBearded/tor-3330
jsrc27 Feb 1, 2024
05d26fb
raspberrypi4-64: Add machine conf
microhobby Jun 20, 2022
9af26de
labs: Use lmp-device-tree as virtual/dtb provider
microhobby Jun 20, 2022
a038df9
raspberrypi4-64: Fix IMAGE_BOOT_FILES_rpi
microhobby Jun 21, 2022
39d858d
bblayers: Fix meta-lmp-bsp location
microhobby Jun 21, 2022
0bd56c7
raspberrypi4-64: Use meta-lmp but maintain compatibility
microhobby Jun 24, 2022
f1d490b
raspberrypi4-64: Fix WKS_FILE_sota_rpi
microhobby Jun 24, 2022
a443203
raspberrypi4-64: Fix IMAGE_FSTYPES_REMOVE
microhobby Jun 24, 2022
2c75cf1
raspberrypi4-64: set u-boot-fio as PREFERRED_PROVIDER_virtual/bootloader
microhobby Jun 24, 2022
056d92f
raspberrypi4-64: Use LINUX_VERSION_rpi 4.19
microhobby Jun 24, 2022
3282f2c
raspberrypi4-64: Add ENABLE_UART = 1
microhobby Jun 24, 2022
4199369
raspberrypi4-64: Add vc4 overlays
microhobby Jun 24, 2022
c3538ea
raspberrypi4-64: Append bootarg_root to OSTREE_KERNEL_ARGS
microhobby Jun 24, 2022
1135b8a
raspberrypi4-64: Cleanup
microhobby Jun 24, 2022
8efd62a
recipes-kernel: linux-lmp: Add fragment to enable rpi DRM
microhobby Jun 27, 2022
ee2fed2
plymouth: Change torizonlogo
microhobby Jun 27, 2022
b702347
resize-helper: Resize root filesystem to fit available space
microhobby Jun 28, 2022
2d92fb4
raspberrypi4-64: Change the LINUX_VERSION_EXTENSION
microhobby Jun 28, 2022
a553f23
base-files: motd: Add a motd warning about labs
microhobby Jun 28, 2022
4e8b860
raspberrypi3-64: Add Raspberry Pi 3B 64bit support
microhobby Jun 29, 2022
ab9e03f
labs: raspberrypi3: raspberrypi4: Add serial number to hostname
microhobby Jul 11, 2022
f861c94
recipes-kernel: linux-lmp-dev: fragment: Add MIPI DSI support
microhobby Jul 16, 2022
32014e9
recipes-bsp: uboot: rpi: Add tdxargs support
microhobby Jul 17, 2022
2cba6c8
recipes-core: plymouth: Change powered by to just by
microhobby Jul 20, 2022
912a2b1
labs: rpi: Use new override sintax
microhobby Jul 22, 2022
8b024f5
labs: rpi: resize-helper: Update recipe
microhobby Jul 22, 2022
5c121df
labs: rpi: Fix old override sintax
microhobby Jul 22, 2022
7d7b311
labs: rpi: Fix old override sintax 2
microhobby Jul 22, 2022
ad90d6e
labs: rpi: Fix wireguard builtin and linux-firmware-nxp89xx
microhobby Jul 23, 2022
6f7f895
labs: rpi: Bump Torizon major version
microhobby Jul 23, 2022
1c6c052
labs: rpi: Fix remove uart0-rpi4.dtbo
microhobby Jul 23, 2022
4eedc80
labs: linux-lmp-dev: Add BACKLIGHT_CLASS_DEVICES
microhobby Jul 25, 2022
dada612
labs: raspberrypi4-64: Add support for raspberrypi drm touchscreen
microhobby Jul 25, 2022
67e42ae
labs: x86: Add support for Torizon x86 using meta-intel BSP
microhobby Aug 14, 2022
d2425bd
labs: x86: Remove grub menu during the boot
microhobby Aug 14, 2022
e9d84ed
labs: x86: kernel: linux-intel: Add configs for DRM
microhobby Aug 14, 2022
b86ee32
labs: x86: kernel: linux-intel: Add configs from check-config for docker
microhobby Aug 14, 2022
bb4b51f
labs: x86: kernel: linux-intel: Add support for i915 drm
microhobby Aug 14, 2022
07917d5
labs: x86: kernel: linux-intel: Add support for amdgpu drm
microhobby Aug 14, 2022
5d58de7
labs: x86: kernel: linux-intel: Add support for vmware drm
microhobby Aug 14, 2022
0d0e0d1
labs: x86: kernel: linux-intel: Add support for Virtual box drm
microhobby Aug 14, 2022
94a611f
labs: x86: kernel: linux-intel: Add support for cirrus drm
microhobby Aug 14, 2022
fba4ba6
labs: raspberrypi4: Fix fbcon map
microhobby Aug 22, 2022
e62edcc
labs: rv: Add initial risc-v tests
microhobby Sep 8, 2022
73b3044
labs: rv: Add the bsp layers
microhobby Sep 8, 2022
3bb45b9
labs: nezha: Add nezha sota wks
microhobby Sep 16, 2022
d67fe66
labs: nezha: docker: Add specific riscv64 changes to build GO
microhobby Sep 16, 2022
60963c9
labs: nezha: fluent-bit: Fix longjmp issue
microhobby Sep 16, 2022
77a18f5
labs: nezha: Update conf for nezha-allwinner-d1
microhobby Sep 16, 2022
ef1abc7
labs: classes: Override the toradex-fitimage.bbclass
microhobby Sep 20, 2022
3c61220
labs: raspberrypi: Does not use the fw_env.config from Toradex
microhobby Oct 28, 2022
5df912d
labs: raspberrypi: Fix fw_env.config does not present on rootfs
microhobby Oct 31, 2022
35a4913
labs: torizon: Bump to 6.1
microhobby Jan 20, 2023
4ca9e7c
labs: machine: Add UBOOT_BINARY_OTA_IGNORE=1
microhobby Jan 21, 2023
5a6f308
local.conf: add common.inc to exclude meta-lmp for imx machines
microhobby Feb 7, 2023
963196d
labs: Fix boot.scr copy for Torizon
microhobby Feb 13, 2023
bb7411e
labs: scripts: setup-environment-internal: remove welcome message
microhobby Feb 13, 2023
884ba72
labs: recipes-kernel: linux: Use custom kernel for labs
microhobby Feb 13, 2023
ca35e62
labs: recipes-kernel: linux: add common.inc for custom kernel fragments
microhobby Feb 13, 2023
fc03663
labs: verdin-imx8mm: remove SN65DSI86 DRM driver
microhobby Feb 17, 2023
c1754ce
labs: image_type_torizon: do not copy boot.scr for rpi
microhobby Feb 17, 2023
50a50a8
labs: distro: torizon: remove TDX_MAJOR and TDX_MINOR
microhobby Mar 17, 2023
25caf31
labs: local.conf: add TDX_DEBUG to enable TorizonCore debug features
microhobby Mar 17, 2023
6df1aaa
labs: u-boot: Add kgdb arguments to kernel cmdline
microhobby Mar 17, 2023
9f8966e
labs: linux: Fix some kernel configs for kgdb
microhobby Mar 17, 2023
26328ce
labs: raspberrypi4-64: Detach the debug configs from prod
microhobby Mar 17, 2023
19f6833
labs: procps: enable break to debug by kernel.sysrq
microhobby Mar 17, 2023
1284d24
labs: verdin-imx8mm: add machine include
microhobby Mar 17, 2023
58c57e5
labs: torizon: Remove the need of the linux-lmp
microhobby Mar 22, 2023
d3c8312
labs: raspberrypi4-64: Rework to not depend on linux-lmp
microhobby Mar 22, 2023
8a981f4
labs: recipes-kernel: bbfatal when no machine config fragment is found
microhobby Mar 22, 2023
b0c53dd
labs: riscv: remove ltrace and valgrind from torizon-core-dev
microhobby Mar 27, 2023
ffdb332
labs: riscv: go: Fix use of the go cross compiler panic
microhobby Mar 27, 2023
94a2725
labs: riscv: lswh: Add riscv64 to COMPATIBLE_HOST
microhobby Mar 27, 2023
379c546
labs: docker-ce: Remove 0004-libnetwork-use-GO-instead-of-go.patch
microhobby Mar 27, 2023
57a18d9
labs: nezha-allwinner-d1: Update support removing meta-lmp
microhobby Mar 27, 2023
6a2c487
labs: intel-corei7-64: Remove meta-lmp
microhobby Mar 27, 2023
1c05073
labs: Fix garage-push for ostree Torizon Platform
microhobby Mar 27, 2023
ea53395
labs: recipes-kernel: rpi: Use v5.15.92 from microhobby
microhobby Apr 3, 2023
4865ebc
labs: u-boot: raspberrypi4-64: Fix use ttyAMA0 as kgdboc
microhobby Apr 3, 2023
141ee90
labs: raspberrypi4-64: Use preferred version for linux-raspberrypi
microhobby Apr 3, 2023
3f23512
labs: raspberrypi3-64: Add support for 64-bit Raspberry Pi 3
microhobby May 7, 2023
7d1a571
raspberrypi: Fix fw_env.config not been deployed
microhobby May 12, 2023
e1c7b91
labs: beaglebone-yocto: Add support for Beaglebone Black
microhobby May 30, 2023
8a03d47
labs: Fix boot sequence and rollback for Rpi3 and Rpi4 (#1)
EstebanSannin Jun 18, 2023
710cb22
common: Fix README and LICENSE
microhobby Jun 19, 2023
c6399c9
common: Replace all meta-toradex-torizon to meta-common-torizon
microhobby Jun 21, 2023
b5411d9
common: torizon: Add SRC and SRCREV to the forked tdx-info
microhobby Jun 22, 2023
ed9b325
common: torizon: u-boot: Add the uboot,version to the device tree
microhobby Jun 22, 2023
8d72a63
common: torizon: plymouth: Change the logo to the new one
microhobby Jun 24, 2023
ce80c55
commontorizon: tdx-info: Bump to add variant to sofware summary
microhobby Jun 24, 2023
fd8b9c4
commontorizon: Add torizon-core-common-docker and -dev
microhobby Jun 24, 2023
4808ccd
torizon-common: sanity: remove warning about TDX_DEBUG
microhobby Jun 27, 2023
6660066
torizon-common: Add beagleplay initial support
microhobby Jun 27, 2023
253fda7
Consolidate common rpi metadata.
drewmoseley Jun 24, 2023
3c49b0d
Add support for raspberrypi0-2w-64
drewmoseley Jun 24, 2023
2cf7858
commontorizon: bump tdx-info to have json output
microhobby Jul 6, 2023
33d0037
commontorizon: Remove custom github url for Toradex kernel and bsp
microhobby Jul 6, 2023
639cbe2
commontorizon: Add support to verdin-imx8mp
microhobby Jul 6, 2023
a1d6016
commontorizon: Add telemetry recipe
microhobby Jul 13, 2023
9ae5fcb
commontorizon: Back to the Torizon splash screen
microhobby Jul 13, 2023
0eee4b7
commontorizon: tdx-info: Bump to get x86_64 support
microhobby Jul 13, 2023
b3cf680
commontorizon: motd: Remove the mention to Toradex Labs
microhobby Jul 13, 2023
3355a3f
commontorizon: telemetry: Fix null region and wrong date
microhobby Jul 13, 2023
774d638
commontorizon: nezha: Temporary remove RAC
microhobby Jul 15, 2023
c722f73
commontorizon: telemetry: Increase sleep time between retries
microhobby Jul 15, 2023
f1fd63f
commontorizon: apalis-imx8: Fix splash screen on HDMI
microhobby Jul 17, 2023
8e46d1e
commontorizon: Fix raspberrypi reboot issue
microhobby Jul 19, 2023
b339e1e
commontorizon: beagleplay: Fix OSTREE_DEPLOY_DEVICETREE
microhobby Jul 19, 2023
3edc0e8
docker-compose: wait until Plymouth finishes
leonheldattoradex Jul 24, 2023
1f5a909
commontorizon: intel-corei7-64: Add docker-binfmt service
microhobby Jul 27, 2023
0314453
commontorizon: kernel: beagleplay: Disable watchdog
microhobby Jul 28, 2023
ee8cf1a
commontorizon: qemuarm64: Add DRM support
microhobby Aug 1, 2023
b09fb63
rpi: Refactor common settings into an include file.
drewmoseley Aug 18, 2023
367672d
rpi4: Remove unnecessary PREFERRED_VERSION_linux-raspberrypi setting.
drewmoseley Aug 18, 2023
1470e77
Add support for Raspberrypi 0 Wifi
drewmoseley Aug 19, 2023
3d5cba0
provision-device: Add device provisioning script to Torizon image.
drewmoseley Aug 31, 2023
bf63f41
common: qemuarm64: add resize-helper to base image
microhobby Oct 3, 2023
dff95ec
Revert "labs: riscv: go: Fix use of the go cross compiler panic"
microhobby Oct 3, 2023
efcee25
common: Allow only development images for common Torizon OS
microhobby Oct 4, 2023
cf24b49
commontorizon: qemux86_64: Add support for qemux86-64 machine
microhobby Oct 5, 2023
9d9f649
Remove missing variable
drewmoseley Oct 6, 2023
e786905
commontorizon: Convert sanity check to an event handler.
drewmoseley Oct 6, 2023
911db6f
common: torizon: Fix i915 hwmon for linux-intel 5.10
microhobby Oct 15, 2023
ac4d6b1
common: torizon: All the machines use ostree-uboot-env
microhobby Oct 17, 2023
98bd6fe
beagleplay: Update virtual/bootloader to u-boot-ti-staging
microhobby Oct 18, 2023
fbc1a6a
beagleplay: ostree: beagleplay is TI but does not use the Toradex BSP
microhobby Oct 18, 2023
8f3e13b
Revert "beagleplay: Update virtual/bootloader to u-boot-ti-staging"
Oct 27, 2023
9818c40
testapps: Remove connman utilities.
drewmoseley Nov 10, 2023
c3fbd48
u-boot-ostree-scr-fit: Remove bbappend for missing recipe.
drewmoseley Nov 7, 2023
8adc64c
linux-yocto: Remove unavailable config option DEBUG_INFO_NONE.
drewmoseley Nov 7, 2023
5367b79
images: update include
leonheldattoradex Dec 15, 2023
eaf3dcc
common: intel-corei7-64: Add igc driver
microhobby Dec 22, 2023
966d2d0
common: plymouth: update splash screen for Torizon OS
microhobby Jan 11, 2024
b668d27
common: classes: image_type_torizon: Not depend on BSP versioning
microhobby Jan 12, 2024
ec9b741
common: classes: image_type_torizon: Fix platform package name
microhobby Jan 12, 2024
170dce6
ostree: extend grub generator script to allow custom logic
EdTheBearded Jan 15, 2024
676a876
grub-efi: add regexp module to grub
EdTheBearded Jan 15, 2024
c26f0fd
grub-ota-fallback: create recipe to add fallback logic to Grub after OTA
EdTheBearded Jan 15, 2024
e926d62
aktualizr-default-sec: remove u-boot-fw-utils from x86 QEMU image
EdTheBearded Jan 19, 2024
df262c3
config: x86: enable support for USB GSM or CDMA modem
EdTheBearded Jan 22, 2024
60b9c18
Fix the names
EstebanSannin Jan 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions COPYING.MIT → LICENSE
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
The MIT License (MIT)

Copyright (c) Common Horizon Community and Contributors

All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
25 changes: 0 additions & 25 deletions README

This file was deleted.

46 changes: 46 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Common Torizon OS

![Common Torizon cover image](https://github.com/commontorizon/Documentation/blob/main/assets/img/commonTorizonCore800.png?raw=true)

Common Torizon OS is an embedded Linux distribution for the [Torizon Cloud](https://app.torizon.io/). It
features, among other essential services, a container runtime and components
for secure remote over-the-air (OTA) updates.

This layer provides the necessary metadata to build the Common Torizon OS Linux
distribution.

> ⚠️ **DISCLAIMER:** this is a derivative work from Torizon OS open source project. Torizon™ is a registered trademark of Toradex Group AG. This derivative work have not been reviewed or approved by Toradex. Common Torizon community does not talk on behalf of Toradex.
>
>⚠️ **This software is provided experimentally as-is.**

## Building

General documentation for the community can be found here: <https://github.com/commontorizon/Documentation>

## Feature Support

Our goal is to have Common Torizon OS in feature parity with Torizon OS. The table below shows the current status of each key feature:

| Feature | Toradex SoM | Rpi3 | Rpi4 | Nezha D1 | x86-64 | Beagle Bone Black |
| ---------------------------- | ----------- | ---- | ---- | -------- | ------ | ----------------- |
| OTA Update OS Image | ✅ | | ✅ | | | |
| OTA Update Container App | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
| OTA Update Bootloader | ✅ | | | | | |
| Device Monitoring | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
| LTS Hardware & BSP | ✅ | | | | | |
| Free Technical Support | ✅ | | | | | |
| Prebuilt Torizon OS Image | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
| QA Approved Releases | ✅ | | | | | |
| Provisioning with TEZI* | ✅ | | | | | |
| Image Customizing with TCB** | ✅ | | | | | |
| VS Code extension 2 support | ✅ | ✅ | ✅ | ⚠️*** | ⚠️*** | ✅ |

> ⚠️* **TEZI**: Toradex Easy Installer
⚠️** **TCB**: TorizonCore Builder
⚠️*** **VS Code Extension**: are not all the templates that support RISC-V and x86-64 architectures

## License

All metadata is [MIT licensed](./LICENSE) unless otherwise stated. Source code and
binaries included in tree for individual recipes is under the LICENSE
stated in each recipe unless otherwise stated.
23 changes: 20 additions & 3 deletions classes/image_type_torizon.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ EXTRA_IMAGECMD:ota-ext4:qemuarm64 = "-O ^64bit,^metadata_csum -L otaroot -i 4096

IMAGE_CMD:ota:prepend() {
if [ "${OSTREE_BOOTLOADER}" = "u-boot" ]; then
cp -a ${DEPLOY_DIR_IMAGE}/boot.scr-${MACHINE} ${OTA_SYSROOT}/boot.scr
cp -a ${DEPLOY_DIR_IMAGE}/boot.scr-${MACHINE} ${OTA_SYSROOT}/boot.scr
fi
}
do_image_ota[depends] += "${@'u-boot-default-script:do_deploy' if d.getVar('OSTREE_BOOTLOADER') == 'u-boot' else ''}"
Expand All @@ -39,7 +39,8 @@ def get_tdx_ostree_purpose(purpose):
TDX_OSTREE_PURPOSE ?= "${@get_tdx_ostree_purpose(d.getVar('TDX_PURPOSE'))}"

# Use new branch naming
OSTREE_BRANCHNAME = "${TDX_MAJOR}/${MACHINE}/${DISTRO}/${IMAGE_BASENAME}/${TDX_OSTREE_PURPOSE}"
OSTREE_BRANCHNAME = "${TDX_RELEASE}-${MACHINE}"
GARAGE_TARGET_VERSION = "${TDX_RELEASE}"

# Force ostree summary to be updated
OSTREE_UPDATE_SUMMARY = "1"
Expand Down Expand Up @@ -182,6 +183,22 @@ ROOTFS_POSTPROCESS_COMMAND += "tweak_os_release_variant;"
tweak_os_release_variant () {
if [ -n "${IMAGE_VARIANT}" ]; then
sed -i -e "s/^VARIANT=.*$/VARIANT=\"${IMAGE_VARIANT}\"/g" ${IMAGE_ROOTFS}${sysconfdir}/os-release

if [ "${IMAGE_VARIANT}" = "Docker" ]; then
# We build docker-compose as a standalone binary in docker-compose recipe,
# which is installed as ${bindir}/docker-compose, but we'd also like to
# allow it to be run as a docker plugin 'docker compose', create the link
# to support that.
install -d ${IMAGE_ROOTFS}${nonarch_libdir}/docker/cli-plugins
ln -sf ${bindir}/docker-compose ${IMAGE_ROOTFS}${nonarch_libdir}/docker/cli-plugins/docker-compose
fi

if [ "${IMAGE_VARIANT}" = "Podman" ]; then
# Allow torizon user to execute podman without password
echo >> ${IMAGE_ROOTFS}${sysconfdir}/sudoers.d/50-torizon
echo "# torizon user can execute podman without password" >> ${IMAGE_ROOTFS}${sysconfdir}/sudoers.d/50-torizon
echo "torizon ALL=(ALL) NOPASSWD:/usr/bin/podman" >> ${IMAGE_ROOTFS}${sysconfdir}/sudoers.d/50-torizon
fi
else
bbwarn "IMAGE_VARIANT is missing, would be better to define it for a TorizonCore image recipe."
fi
Expand Down Expand Up @@ -494,7 +511,7 @@ get_torizon_prov_data2() {
# but may have different permissions; make sure they are correct.
chmod 0750 "${destdir}/import/repo" || true
chmod 0750 "${destdir}/import/director" || true

if [ "${TORIZON_SOTA_PROV_MODE}" = "online" ]; then
tmp="${destdir}/tmp/provision.json"
dst="${destdir}/auto-provisioning.json"
Expand Down
Loading