Skip to content

Port to Yocto scarthgap [Part2]#1540

Merged
quaresmajose merged 40 commits intofoundriesio:mainfrom
quaresmajose:scarthgap-next-p2
Nov 27, 2024
Merged

Port to Yocto scarthgap [Part2]#1540
quaresmajose merged 40 commits intofoundriesio:mainfrom
quaresmajose:scarthgap-next-p2

Conversation

@quaresmajose
Copy link
Copy Markdown
Member

The full PR was submitted #1532 but it was very big and we decided to break it down into smaller parts to facilitate the review process.

These small parts have not been tested at all and only the complete PR has been, so it is quite possible that they will not work separately as they are submitted now.

The full list of changes that have been tested are at https://github.com/foundriesio/meta-lmp/tree/scarthgap-next

Rebased on top of #1538

@quaresmajose quaresmajose marked this pull request as ready for review November 22, 2024 11:27
@quaresmajose quaresmajose requested a review from a team November 22, 2024 11:27
Comment thread meta-lmp-base/recipes-containers/docker-compose/docker-compose_git.bb Outdated
Comment thread meta-lmp-base/recipes-containers/docker-compose/docker-compose_git.bb Outdated
Comment thread meta-lmp-base/recipes-containers/docker-compose/docker-compose_git.bb Outdated
Comment thread meta-lmp-base/recipes-containers/docker-compose/docker-compose_git.bb Outdated
Comment thread meta-lmp-base/conf/distro/include/lmp.inc
Comment thread meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
Comment thread meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc Outdated
@ricardosalveti
Copy link
Copy Markdown
Member

Mostly fine, but please improve the commit message saying why things were removed, renamed or reverted.

Covert the recipe with the oe-go-mod-autogen [1] helper script.

The tool will autogenerate all the required files:
 modules.txt
 relocation.inc
 src_uri.in

Main step to perform:
| ../meta-virtualization/scripts/oe-go-mod-autogen.py --repo https://github.com/docker/compose --rev v2.21.0
| mv modules.txt ../meta-lmp/meta-lmp-base/recipes-containers/docker-compose/files
| mv relocation.inc src_uri.inc ../meta-lmp/meta-lmp-base/recipes-containers/docker-compose
| # manualy update PV and SRCREV

[1] https://git.yoctoproject.org/meta-virtualization/tree/scripts/README-oe-go-mod-autogen.txt

Signed-off-by: Jose Quaresma <[email protected]>
@quaresmajose
Copy link
Copy Markdown
Member Author

Mostly fine, but please improve the commit message saying why things were removed, renamed or reverted.

Suggestions added and fixed.
Thanks for the review.

Comment thread meta-lmp-base/conf/distro/lmp-base.conf
Comment thread meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand we are reverting this commit as a consequence of PACKAGECONFIG:remove = "static" in the previous commit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still have the impression that static will be required, but would need to validate at runtime.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand we are reverting this commit as a consequence of PACKAGECONFIG:remove = "static" in the previous commit

Yes, the reason of the revert is the previous commit but I will mention that on message.

I still have the impression that static will be required, but would need to validate at runtime.

The main reason of this was to support the composefs.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the plan for the documentation of this process, @igoropaniuk ?

Added to fix the lack of systemd in the initramfs [1]
but look like is not need anymore.

[1] foundriesio@17d647d

Signed-off-by: Jose Quaresma <[email protected]>
This reverts commit 0abb08c.

Since we disabled the static, we no longer need this.

Signed-off-by: Jose Quaresma <[email protected]>
- Switch to meta-virt[scarthgap] 1.2.0-rc.2: from 1.1.12

Signed-off-by: Jose Quaresma <[email protected]>
- Switch to meta-virt[scarthgap] v2.0.0-beta.0: from v1.7.13

Signed-off-by: Jose Quaresma <[email protected]>
- Switch to meta-virt[scarthgap] v2.28.1: from v2.21.0
- We will keep our cli-config-support-default-system-config.patch applied

Signed-off-by: Jose Quaresma <[email protected]>
- Switch to meta-virt[scarthgap] 27.0.3: from 25.0.2-ce+git-fce6e0c

Signed-off-by: Jose Quaresma <[email protected]>
The meta-virt scarthgap branch has droped the docker-ce and only keeps docker-moby.
So curretly only one version exist and the PREFERRED_PROVIDER is not more need.

Signed-off-by: Jose Quaresma <[email protected]>
The meta-virt scarthgap branch has droped the docker-ce and only keeps docker-moby.

Signed-off-by: Jose Quaresma <[email protected]>
This reverts commit 36ab4c6.

- Switch to meta-security[scarthgap] 5.7: from 5.5

Signed-off-by: Jose Quaresma <[email protected]>
This reverts commit aee51bd.

- Switch to meta-security[scarthgap] 3.0.0: from 3.0.0

Signed-off-by: Jose Quaresma <[email protected]>
This reverts commit 17f5095.

- Switch to meta-security[scarthgap] 4.0.2: from 4.0.1

Signed-off-by: Jose Quaresma <[email protected]>
This reverts commit 67c2334.

- Switch to meta-security[scarthgap] 1.9.0: from 1.9.0

Signed-off-by: Jose Quaresma <[email protected]>
…hanges

Includes:
- 733b9787 tegra-helper-scripts: remove fuselevel settings in initrd-flash script
OE4T/meta-tegra@733b978

Signed-off-by: Jose Quaresma <[email protected]>
The master branch have the 1.18 witch don't need it

Signed-off-by: Jose Quaresma <[email protected]>
Signed-off-by: Jose Quaresma <[email protected]>
This reverts commit 9986c69.

Not need anymore with the scarthgap, fix the error:
| ERROR: Layer stm-st-stm32mp is not compatible with the core layer which only supports these series: scarthgap (layer is compatible with kirkstone)

Signed-off-by: Jose Quaresma <[email protected]>
This reverts commit 915af2c.

- Reverts scarthgap meson backport

bsp: meson: Backport 1.3.1.imx from scarthgap
foundriesio#1459

Signed-off-by: Jose Quaresma <[email protected]>
This reverts commit c8db41e.

- Reverts scarthgap meson backport

bsp: meson: Backport 1.3.1.imx from scarthgap
foundriesio#1459

Signed-off-by: Jose Quaresma <[email protected]>
@quaresmajose
Copy link
Copy Markdown
Member Author

General comment about fioefi, probably better to separate our own development done in scarthgap as part of another PR, as they are not strictly related to our scarthgap updating work (they are extras).

I will move the fioefi patchset again to the scarthgap-next branch that contains what is still pending

@quaresmajose
Copy link
Copy Markdown
Member Author

Thanks for the review

@angolini
Copy link
Copy Markdown
Contributor

General comment about fioefi, probably better to separate our own development done in scarthgap as part of another PR, as they are not strictly related to our scarthgap updating work (they are extras).

I will move the fioefi patchset again to the scarthgap-next branch that contains what is still pending

When you create it, please add me to the reviewers. I'm afraid github inbox don't notify me, and it's still pending in my mind what level of documentation the change requires. Thanks

@quaresmajose
Copy link
Copy Markdown
Member Author

quaresmajose commented Nov 26, 2024

General comment about fioefi, probably better to separate our own development done in scarthgap as part of another PR, as they are not strictly related to our scarthgap updating work (they are extras).

I will move the fioefi patchset again to the scarthgap-next branch that contains what is still pending

When you create it, please add me to the reviewers. I'm afraid github inbox don't notify me, and it's still pending in my mind what level of documentation the change requires. Thanks

I have already move it to https://github.com/foundriesio/meta-lmp/commits/scarthgap-next
IMO it will be better if @igoropaniuk can submit this again when we have the main branch in a better state

Copy link
Copy Markdown
Member

@ricardosalveti ricardosalveti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@quaresmajose quaresmajose merged commit b16edd3 into foundriesio:main Nov 27, 2024
@quaresmajose quaresmajose deleted the scarthgap-next-p2 branch November 27, 2024 10:08
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.

3 participants