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.

Sign up for GitHub

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

Jump to bottom

Switch meta-virt to the scarthgap branch #1444

Closed
wants to merge 13 commits into from
Closed

Switch meta-virt to the scarthgap branch #1444

wants to merge 13 commits into from

Commits on Aug 22, 2024

  1. base: python3-docker-compose: drop python variant 

    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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    c73126e View commit details
    Browse the repository at this point in the history

  2. base: docker-compose: move the oe-go-mod-autogen version 

    | 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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    c4cd4c6 View commit details
    Browse the repository at this point in the history

  3. base: docker-compose: sync bbappend with oe-go-mod-autogen version 

    Signed-off-by: Jose Quaresma <[email protected]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    1a54087 View commit details
    Browse the repository at this point in the history

  4. base: runc-opencontainers: drop 

    - 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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    8fcf5df View commit details
    Browse the repository at this point in the history

  5. base: containerd-opencontainers: drop 

    - 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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    cc58bee View commit details
    Browse the repository at this point in the history

  6. base: docker-compose: drop 

    - 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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    1fd9391 View commit details
    Browse the repository at this point in the history

  7. base: docker-compose: refresh patches for v2.28.1 

    Signed-off-by: Jose Quaresma <[email protected]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    9a7e484 View commit details
    Browse the repository at this point in the history

  8. base: docker-ce: drop 

    - 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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    20ca445 View commit details
    Browse the repository at this point in the history

  9. base: docker-ce -> docker-moby 

    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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    d5382ea View commit details
    Browse the repository at this point in the history

  10. base: lmp: drop PREFERRED_PROVIDER_virtual/docker 

    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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    cf6ca44 View commit details
    Browse the repository at this point in the history

  11. base: layer: add meta-virt kirkstone compatability 

    This is needed to use the meta-virt (scarthgap) with oe-core kirkstone

Signed-off-by: Jose Quaresma <[email protected]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    0b1a2e8 View commit details
    Browse the repository at this point in the history

  12. base: layer: mask meta-virt incompatible bbappends 

    The meta-virt scarthgap branch have some incompatible bbappends
that dont exist on the kirkstone branch.

Signed-off-by: Jose Quaresma <[email protected]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    64613a7 View commit details
    Browse the repository at this point in the history

  13. base: layer: adapt tegra docker-ce to docker-moby 

    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]>
    @quaresmajose
    quaresmajose committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    6e8e562 View commit details
    Browse the repository at this point in the history