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

Switch meta-virt to the scarthgap branch #1444

Open
wants to merge 13 commits into
base: main
Choose a base branch
from

Conversation

quaresmajose
Copy link
Member

@quaresmajose quaresmajose commented Apr 16, 2024

Switch to https://git.yoctoproject.org/meta-virtualization/log/?h=scarthgap in preparation for the scarthgap release.

We will be still on kirkstone for the overall layers but to reduce the friction and to start do more testings with scarthgap material we will start with the meta-virtualization that works well with the golang present on the meta-lts-mixin layer and this layer is more isolated than the others in terms of dependencies

@quaresmajose quaresmajose requested a review from a team April 16, 2024 09:39
@quaresmajose quaresmajose changed the title [RFC] switch meta-virt to the scarthgap branch Switch meta-virt to the scarthgap branch Apr 22, 2024
@quaresmajose quaresmajose marked this pull request as ready for review April 22, 2024 09:47
@quaresmajose quaresmajose removed the request for review from a team April 22, 2024 09:47
@ricardosalveti
Copy link
Member

On the commits that are dropping the recipes, please explain why and how that matches with the ones from meta-virt.

@angolini
Copy link
Contributor

Maybe you could add more information in the PR description regarding what is the overall plan, why are you going to scarthgap but have a commit adding kirkstone compatibility.

I mean, describe the overall plan, what is the main goal.

@quaresmajose
Copy link
Member Author

Maybe you could add more information in the PR description regarding what is the overall plan, why are you going to scarthgap but have a commit adding kirkstone compatibility.

I mean, describe the overall plan, what is the main goal.

add a description on the PR

@quaresmajose quaresmajose force-pushed the meta-virt-master branch 2 times, most recently from 090a020 to fec8246 Compare May 21, 2024 09:03
@quaresmajose
Copy link
Member Author

On the commits that are dropping the recipes, please explain why and how that matches with the ones from meta-virt.

done

@quaresmajose
Copy link
Member Author

This was tested and validated the scarthgap but I need to re-write the commits to align with the versions available on the current meta-virt scarthgap branch.

@quaresmajose quaresmajose marked this pull request as draft July 26, 2024 14:53
@quaresmajose quaresmajose marked this pull request as ready for review July 26, 2024 15:24
@quaresmajose quaresmajose requested a review from a team July 26, 2024 15:24
dropped upstream [1]

The python variant of docker-compose is no longer updated. We have the
golang version, so we drop this recipe to avoid use of an obselete and
potentially non-secure application.

[1] https://git.yoctoproject.org/meta-virtualization/commit/?id=7bd56074fece944ef9279d87106eb16452ec6338

Signed-off-by: Jose Quaresma <[email protected]>
| cat ../layers/meta-virtualization/scripts/scripts/README-oe-go-mod-autogen.txt
| ../layers/meta-virtualization/scripts/oe-go-mod-autogen.py --repo https://github.com/docker/compose --rev v2.21.0
| mv modules.txt ../layers/meta-lmp/meta-lmp-base/recipes-containers/docker-compose/files
| mv relocation.inc src_uri.inc ../layers/meta-lmp/meta-lmp-base/recipes-containers/docker-compose
| # manualy update PV and SRCREV

Signed-off-by: Jose Quaresma <[email protected]>
- Switch to meta-virt[scarthgap] 1.2.0-rc.2: from 1.1.12
- We will be still on kirkstone for the overall layers but to reduce the
friction and to start do more testings with scarthgap material we will
start with the meta-virtualization that works well with the golang present
on the meta-lts-mixin layer and this layer is more isolated than the others
in terms of dependencies.

Signed-off-by: Jose Quaresma <[email protected]>
- Switch to meta-virt[scarthgap] v2.0.0-beta.0: from v1.7.13
- We will be still on kirkstone for the overall layers but to reduce the
friction and to start do more testings with scarthgap material we will
start with the meta-virtualization that works well with the golang present
on the meta-lts-mixin layer and this layer is more isolated than the others
in terms of dependencies.

- The recipe was also renamed in e7a13cbbc3 from containerd-opencontainers to just containerd.
https://git.yoctoproject.org/meta-virtualization/commit/?h=scarthgap&id=e7a13cbbc39fd61d8192f5d4427111f666c9ab8b

Signed-off-by: Jose Quaresma <[email protected]>
- Switch to meta-virt[scarthgap] v2.28.1: from v2.21.0
- We will be still on kirkstone for the overall layers but to reduce the
friction and to start do more testings with scarthgap material we will
start with the meta-virtualization that works well with the golang present
on the meta-lts-mixin layer and this layer is more isolated than the others
in terms of dependencies.

Signed-off-by: Jose Quaresma <[email protected]>
- Switch to meta-virt[scarthgap] 27.0.3: from 25.0.2-ce+git-fce6e0c
- We will be still on kirkstone for the overall layers but to reduce the
friction and to start do more testings with scarthgap material we will
start with the meta-virtualization that works well with the golang present
on the meta-lts-mixin layer and this layer is more isolated than the others
in terms of dependencies.

- docker-ce was also droped in favor of docker-moby
https://git.yoctoproject.org/meta-virtualization/commit/recipes-containers/docker?h=scarthgap&id=7ed351dbdc079aaa92b1c03007c91892126b7811

Signed-off-by: Jose Quaresma <[email protected]>
The meta-virt scarthgap branch has droped the docker-ce and only keeps
docker-moby so we need to adapt for what we have in our kirkstone branch.

Signed-off-by: Jose Quaresma <[email protected]>
The meta-virt scarthgap branch has droped the docker-ce and only keeps
docker-moby so we need to adapt for what we have in our kirkstone branch.

So curretly only one version exist and the PREFERRED_PROVIDER is not more need.

Signed-off-by: Jose Quaresma <[email protected]>
This is needed to use the meta-virt (scarthgap) with oe-core kirkstone

Signed-off-by: Jose Quaresma <[email protected]>
The meta-virt scarthgap branch have some incompatible bbappends
that dont exist on the kirkstone branch.

Signed-off-by: Jose Quaresma <[email protected]>
The meta-virt scarthgap branch has droped the docker-ce and only keeps
docker-moby so we need to adapt for what we have in our kirkstone branch.

The docker-moby_%.bbappend is a copy from meta-tegra [1] rev 34a4c316

[1] external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend

Signed-off-by: Jose Quaresma <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants