torizon / meta-toradex-torizon

Torizon OS OpenEmbedded Distro Layer
MIT License
5 stars 9 forks source link

Update master branch before branching out to scarthgap #72

Closed rborn-tx closed 1 month ago

rborn-tx commented 1 month ago

Here is the list of commits in kirkstone that were not present in master and their status once this PR is merged:

| COMMIT MESSAGE                                                          | STATUS  |
|-------------------------------------------------------------------------+---------|
| ostree: move files to recipes-extended to match organization in meta-oe | Dropped |
| curl: backport curl 8.4.0                                               | Dropped |
| torizon-conf: add missing sed statement for container env vars          | Dropped |
| kernel-devsrc.bbappend: support arm64 kernel 5.19+ on Kirkstone         | Dropped |
| kernel-devsrc.bbappend: support arm kernel 5.19+ on Kirkstone           | Dropped |
| curl: bump to version 8.6.0                                             | Dropped |
| torizon.inc: adjust CURLVERSION to 8.6.0 (gh-ming/adjust-CURLVERSION)   | Dropped |
| linux: include erofs scc/cfg from linux-toradex-kmeta.inc               | Dropped |
| torizon-minimal: fix minimal image features and packages                | Applied |
| docker-compose: bump to version 2.20.3                                  | Applied |
| fluent-bit: bump to version 2.2.1                                       | Applied |
| greenboot: bump hash and still on version 0.15.4                        | Applied |
| rac: bump hash                                                          | Applied |
| torizon-conf: use 4 spaces instead of tab to comply with codebase style | Applied |
| torizon-conf: sort container env vars                                   | Applied |
| torizon-conf: remove unused CT_TAG_DOCKER_COMPOSE container env var     | Applied |
| torizon-conf: add dotnet 6 and 8 container env vars family              | Applied |
| torizon-conf: revert to using stable tags for containers                | Applied |
| u-boot: apply cfgs to all machines                                      | Applied |
| torizon.bbclass: drop git from HOSTTOOLS                                | Applied |
| qemuarm64: fix some invalid overrides syntax                            | Applied |
| u-boot-distro-boot: qemuarm64: drop redundant bootcmd_args              | Applied |
| image_type_torizon.bbclass: tweak EXTRA_IMAGECMD for ota-ext4           | Applied |
| libubootenv: move in fw_env.config for qemuarm64                        | Applied |
| fluent-bit: Add new default metric for eMMC health information          | Applied |
| container-host-config: introduce PODMAN_DEFAULT_REGISTRIES              | Applied |
| qemuarm64/genericx86-64: fix splash issues                              | Applied |
| image_type_torizon: introduce scale provisioning                        | Applied |
| fluent-bit: Modify fluent bit config to support buffering               | Applied |
| curl: Enable basic auth support when building for native                | Applied |
| ostree-customize-plymouth: fix a invalid condition check                | Applied |
| grub/grub-efi: fs/fat: Don't error when mtime is 0                      | Applied |
| grub-efi: integrate some changes from meta-lmp                          | Applied |
| docker-ce: drop duplicated docker.service file                          | Applied |
| qemuarm64/genericx86-64: support set-hostname                           | Applied |
| network-configuration: drop recipe and its references                   | Applied |
| genericx86-64: support qemu ovmf                                        | Applied |
| docker-compose: introduce pkgconfig docker-plugin                       | Applied |
| docker-compose: drop docker-compose shell wrapper                       | Applied |
| docker-integrity-checker: also support podman                           | Applied |
| podman: update to v4.8.2                                                | Applied |
| podman: support --config option to locate authentication file           | Applied |
| podman: tweak podman.service                                            | Applied |
| podman: allow torizon user run podman as sudoer without passwd          | Applied |
| podman: support podman/docker bash completions                          | Applied |
| netavark: add recipe                                                    | Applied |
| aardvark-dns: add recipe                                                | Applied |
| podman: switch to use netavark as container networking                  | Applied |
| crun: add recipe                                                        | Applied |
| podman: switch to use crun as container runtime                         | Applied |
| meta: move docker environment files to torizon-conf                     | Applied |
| torizon-core-container.inc: introduce an include file                   | Applied |
| genericx86-64: add qemu-system-native to EXTRA_IMAGEDEPENDS             | Applied |
| container-host-config: add transient-store PACKAGECONFIG                | Applied |
| linux:torizoncore.cfg: add configs to support zram                      | Applied |
| systemd: increase SaveIntervalSec to 3600 secs                          | Applied |
| auto-provisioning: add service restart for remote access (RAC)          | Applied |
| docker-compose: bump to version 2.21.0                                  | Applied |
| fluent-bit: bump to version 2.2.3                                       | Applied |
| torizon.inc: remove some PREFERRED_VERSION_* settings                   | Applied |
| plymouth: drop pango and some themes                                    | Applied |
| neofetch: add info func for container engine                            | Applied |
| u-boot-distro-boot:qemuarm64: handle fitimage                           | Applied |
| podman: make sure podman.service serve as a docker service              | Applied |
| docker:docker.service: ensure system clock was set                      | Applied |
| neofetch: set CLEANBROKEN to 1                                          | Applied |
| meta: dont check VARIANT to get container engine                        | Applied |
| rac: fix some compilation problems (gh-ming/fix-rac-build-issues)       | Applied |
| initramfs-framework: add modules to support plymouth on AM62            | Applied |
| rpcbind: fix a systemd dependency issue                                 | Applied |
| recipes-image: introduce ti-img-rogue-driver as dependency              | Applied |
| systemd-conf: re-enable systemd HW Watchdog for Verdin AM62             | Applied |
| systemd-conf: disable Verdin AM62 Watchdog for release                  | Applied |
| systemd-conf: re-enable Verdin AM62 Watchdog                            | Applied |
| torizon-core-common: add Alsa UCM configuration                         | Applied |
| networkmanager: unmanage any uap interface                              | Applied |
| networkmanager: fix missing parenthesis on append task                  | Applied |
| scripts: setup-environment-internal: fix typo                           | Applied |
| multiconfig/k3r5: change TMPDIR for k3r5 build                          | Dropped |
| container-host-config:storage.conf: sync with libpod v4.8.2             | Applied |
| go: bump to version 1.20.13                                             | Dropped |
| go: fix CVE-2023-24531 (gh-ming/backport-a-CVE-fix-for-go)              | Dropped |
| rac: fix a invalid SRCREV_FORMAT (gh-ming/fix-rac-SRCREV-issues)        | Applied |
| rac: bump SRCREV to latest                                              | Applied |
| rac: run cargo in offline mode                                          | New     |
| rac: update hashes                                                      | New     |

The commits with status "Applied" that required non-trivial changes to solve conflicts were signed by myself besides the original sign-off.

The following build configurations were tested (build only):

| Machine       | Images                                       |
|---------------+----------------------------------------------|
| verdin-am62   | torizon-core-{docker,podman} torizon-minimal |
| verdin-imx8mm | torizon-core-{docker,podman} torizon-minimal |

At the time of writing build for the verdin-imx8mm were failing due to QA error on package firmware-imx; in order for the build to succeed I disabled the specific QA check by doing:

INSANE_SKIP:${PN} += "installed-vs-shipped"

Hopefully this will be fixed upstream soon.

EdTheBearded commented 1 month ago

Wow, quite a list!

To be fair, I just did a glance over and if it's all building fine then awesome! :grinning:

But about you last 2 commits, on making RAC build. We have an internal ticket that we were discussing the actual fix. Thinking of it, the commit you proposed seems better for us, on a maintenance point of view, but I've asked the Cloud team if there's any downsides to this. So I'm just waiting their answer to approve this!

EdTheBearded commented 1 month ago

@leograba, can we please schedule the branch out ticket as soon as this PR is merged?

leograba commented 1 month ago

@leograba, can we please schedule the branch out ticket as soon as this PR is merged?

@EdTheBearded, sure.

Just a warning: everything was a single ticket originally to do both the update and the branch out. It was split for some reason I don't recall exactly why. Perhaphs @rborn-tx remember the reasoning behind it. My point being, do we really want to branch out as soon as this PR is merged?

EdTheBearded commented 1 month ago

@leograba yes, branching out now we don't miss the work done here, and we start leveraging the automated testing we have. This way we can start our Jenkins matrix on Scarthgap, which will also check for the signed builds, as well as start generating LAVA reports.

EdTheBearded commented 1 month ago

@rborn-tx Seems we're good to go with this merge. I'd like to just ask you if you could change, on rac_git.bb, the comment where we replace --frozen for --offline to explain the actual reason, since this won't be a temporary fix. Maybe something like

Due to the changes we needed to do in RAC Yocto recipe in order to use our toradex/tough registry, tough repository got sort of aliased, so the upstream git URL was in fact referencing our toradex/tough fork. And since this is a hack on top of Cargo, it got somewhat lost while parsing Cargo.lock and thought that the repository there needed to change to the upstream one to reflect the state of things.

rborn-tx commented 1 month ago

@EdTheBearded

I'd like to just ask you if you could change, on rac_git.bb, the comment where we replace --frozen for --offline to explain the actual reason, since this won't be a temporary fix.

Done

EdTheBearded commented 1 month ago

Awesome, thanks @rborn-tx!