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

Port to Yocto scarthgap [Part1] #1538

Merged
merged 50 commits into from
Nov 22, 2024
Merged

Port to Yocto scarthgap [Part1] #1538

merged 50 commits into from
Nov 22, 2024

Conversation

quaresmajose
Copy link
Member

@quaresmajose quaresmajose commented Nov 15, 2024 •
edited
Loading

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

@quaresmajose
bsp: u-boot-ti-staging: remove multiconfig common files
68622e9 
Because TI uses multiconfig we can't have this file names shared between machines in [1]

| ERROR: mc:k3r5:u-boot-ti-staging-1_2023.04+git-r0 do_deploy: Recipe u-boot-ti-staging is trying to install files into a shared area when those files already exist. The files and the manifests listing them are:
|   /build/deploy/images/am62xx-evm/u-boot-ti-staging-config
|     (matched in manifest-am62xx_evm-u-boot-ti-staging.deploy)
| Please adjust the recipes so only one recipe provides a given file.

[1] meta-lmp-base/recipes-bsp/u-boot/u-boot-lmp-common.inc

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose quaresmajose requested a review from a team November 15, 2024 17:36
@ricardosalveti
Copy link
Member

Can you please have the patches changing the same recipe done in sequence? Current flow makes it harder to review the individual changes.

@quaresmajose
Copy link
Member Author

The current order is basically chronological, I'll try to change it to be by recipe

angolini
angolini approved these changes Nov 18, 2024
View reviewed changes
Copy link
Contributor

@angolini angolini left a comment

Choose a reason for hiding this comment

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

I reviewed the PR.
I would squash all commits for the same recipe together, but it does not hurt to leave it this way.
Thanks a lot for this!

@quaresmajose
Revert "base: gnu-efi: enable for riscv64"
4568404 
This reverts commit 96d6173.

merged https://git.yoctoproject.org/poky/commit/?id=b02bdaa5a5b1dc051849919785d4687bec1bfaf8

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: layer: add langdale compatibility
3f7253e 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: layer: add langdale compatibility
a358dd8 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
Revert "base: ovmf: backport patches to fix nvm support with qemu"
d32ff7d 
This reverts commit 35696b6.

These patches are already included in ovmf 2022.11

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: lshw: drop recipe and use a bbappend
32d09a7 
Use the meta-openembedded version that is updated to b4e0673

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: u-boot-xlnx: increase u-boot spl size limit
8dd5d3d 
We are facing some build erros on uz3eg-iocc-sec machine
because we don't have sufficient space.

| spl/u-boot-spl.bin exceeds file size limit:
|   limit:  0x26000 bytes
|   actual: 0x26009 bytes
|   excess: 0x9 bytes

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: layer: add mickledore compatibility
bbccdcd 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: layer: add mickledore compatibility
2286770 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base/bsp: mxm-mwifiex-setup: drop recipe and use yocto variables for …
08d73d5 
…this propose

Use yocto variables for this propose:

- KERNEL_MODULE_AUTOLOAD
  https://docs.yoctoproject.org/ref-manual/variables.html?highlight=kernel_module_autoload#term-KERNEL_MODULE_AUTOLOAD
- KERNEL_MODULE_PROBECONF
  https://docs.yoctoproject.org/ref-manual/variables.html?highlight=kernel_module_autoload#term-KERNEL_MODULE_PROBECONF

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
Revert "base: layer: adjust tpm-layer priority"
91e34e2 
This reverts commit bceb837.

Merged upstream
https://git.yoctoproject.org/meta-security/commit/?id=0e648bae9cdb8a2f41bde1f9a3ecaaf5fb80df63

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: lmp-machine-custom: explicity disable imx-boot-container
71a2c95 
The imx-boot-container MACHINEOVERRIDES is now SoC specific [1]
with higher prioririty than mx8-generic-bsp.
The meta-freescale layer also check for 1/0 so set it to 0.

[1] Freescale/meta-freescale#1465

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: lmp-machine-custom: imx-boot-container override removed upstream
e21edba 
The imx-boot-container [1] is now only enabled on mx8m-generic-bsp
machines.

[1] Freescale/meta-freescale#1488

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: lmp-machine-custom: UBOOT_PROVIDES_BOOT_CONTAINER is now chosed …
cea1d57 
…dynamic

Add boot container dynamic selection to imx-base.inc
Freescale/meta-freescale#1492

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose quaresmajose force-pushed the scarthgap-next-p1 branch 2 times, most recently from 7d326ba to e2e20cc Compare November 19, 2024 10:26
@quaresmajose
Copy link
Member Author

I reviewed the PR. I would squash all commits for the same recipe together, but it does not hurt to leave it this way. Thanks a lot for this!

I have squashed some commits especially the ones that did not contain any changes, the others I kept because this is important if it is necessary to make any bisect.
Thank you very much for your review.

@quaresmajose
Copy link
Member Author

quaresmajose commented Nov 19, 2024 •
edited
Loading

Can you please have the patches changing the same recipe done in sequence? Current flow makes it harder to review the individual changes.

@ricardosalveti I think I got it for a significant part.

@quaresmajose
base: systemd: drop systemd-crypt as it is sent uptream
f04e77b 
Reference:
https://git.openembedded.org/openembedded-core/commit/meta/recipes-core/systemd?id=c8c615329ad62a28c0762e79e7f11216f9bd88db

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: systemd: upstream drop gnu-efi
fd7a1d3 
- systemd v254 drops dependency on gnu-efi and add dependency on pyelftools for EFI builds

Reference:
https://git.openembedded.org/openembedded-core/commit/meta/recipes-core/systemd?id=95ed1fa4ff74a77deade51ad73b2f8963ff81548

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: linux-firmware: add SRCREV_FORMAT
1852999 
The SRCREV_FORMAT variable must be set when multiple SCMs are used.

| bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception FetchError: Fetcher failure: The SRCREV_FORMAT variable must be set when multiple SCMs are used.
| The SCMs are:
| git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=https;branch=main
| git://github.com/NXP/imx-firmware.git;protocol=https;branch=lf-5.15.71_2.2.0;destsuffix=imx-firmware;name=imx-firmware;
| The variable dependency chain for the failure is: SRCPV -> PV -> BP -> FILESPATH

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: non-clangable: efivar: force gcc
5e37167 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: layer: add nanbield compatibility
41f462f 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: layer: add nanbield compatibility
90bc672 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: drop PR variable
636fdbb 
| find . -type f -exec sed -i 's/-\${PR}//g' {} +

https://git.yoctoproject.org/poky/commit/?id=ad5464eb7ef5ab80f74b22bfb0f3dc63174b78cc
https://git.yoctoproject.org/poky/commit/?id=1b94ea8b2516c929830fea716bb027a9ea1a3a1e
https://git.yoctoproject.org/poky/commit/?id=d7ce7d67994f02367750d03e9e97ebdf89cd7a33

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: systemd: upstream moves from sysconfdir to nonarch_libdir
ce54cba 
https://git.yoctoproject.org/poky/commit/?id=12da590768b9e51a66f425c07fbef266a0115395

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: networkmanager: 1.36 -> 1.38
01f061f 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: networkmanager: 1.38 -> 1.40
2675c4b 
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: networkmanager: 1.40 -> 1.44
8265960 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
bsp: opensbi: 1.0 -> 1.3
7b50565 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: bluez5: 5.65 -> 5.66
97ba73c 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: bluez5: refresh patches
adf37c8 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: bluez5: 5.66 -> 5.68
09f96af 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: bluez5: refresh patches
babf288 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: bluez5: 5.68 -> 5.69
e4752b0 
Rebase and refresh patches

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: bluez5: 5.69 -> 5.70
d9f0ebc 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: base-passwd: refresh patches
19cefdf 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: base-passwd: refresh patches
ee15e6a 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: ostree: rebase patches in v2022.7
8c783b1 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: ostree: rebase patches in v2023.1
e09ed05 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: ostree: rebase patches in v2023.3
a00b019 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose
base: ostree: rebase patches in v2023.6
f599b81 
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
@quaresmajose quaresmajose mentioned this pull request Nov 21, 2024
Merged
ricardosalveti
ricardosalveti approved these changes Nov 21, 2024
View reviewed changes
Copy link
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, please announce in platform that things will be temporarily broken as we merge this.

@quaresmajose
Copy link
Member Author

I will wait for the proposed backports #1543 and foundriesio/lmp-manifest#468 so we can have a funcional tree with mostly the same content.

@quaresmajose quaresmajose merged commit 58c0f6e into foundriesio:main Nov 22, 2024
1 check passed
@quaresmajose quaresmajose deleted the scarthgap-next-p1 branch November 25, 2024 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@angolini angolini angolini approved these changes

@ricardosalveti ricardosalveti ricardosalveti approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@quaresmajose @ricardosalveti @angolini