Skip to content

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

Merged
ricardosalveti merged 1 commit intofoundriesio:mainfrom
angolini:backport-meson
Jun 21, 2024
Merged

bsp: meson: Backport 1.3.1.imx from scarthgap#1459
ricardosalveti merged 1 commit intofoundriesio:mainfrom
angolini:backport-meson

Conversation

@angolini
Copy link
Copy Markdown
Contributor

@angolini angolini commented May 15, 2024

When using kirkstone with some scarthgap compatible metalayers, some gstreamer from the BSP layer require the version 0.62.1 or newer.

This patch brings this version from scarthgap as a backport.


This is to be removed when we start using Scarthgap branch by default.


Tested with bitbake gstreamer1.0

and also:

bitbake-layers show-recipes meson
=== Matching recipes: ===
meson:
  meta-lmp-bsp         0.63.3.imx
  meta                 0.61.3

@angolini angolini changed the title bsp: meson: Backport 0.62.1 from scarthgap [RFC] bsp: meson: Backport 0.62.1 from scarthgap May 15, 2024
@angolini angolini marked this pull request as ready for review May 15, 2024 13:13
@ricardosalveti ricardosalveti requested a review from a team May 15, 2024 13:20
@quaresmajose
Copy link
Copy Markdown
Member

The meason is a critical piece to build the software so in my opinion we should use the upstream version and try to push this to the bsp that requires the version with some PREFERRED_VERSION_meson and renaming the recipe to be bsp specific. I think this is a IMX requirement so ended up with something like meson_0.62.1.imx that we make the default one with:

PREFERRED_VERSION_meson:imx-nxp-bsp ??= "0.62.1.imx"

if not possible to change upstream we can try the same on the meta-lmp-bsp layer.

@ricardosalveti
Copy link
Copy Markdown
Member

in my opinion we should use the upstream version and try to push this to the bsp

+1, we can make it freescale specific to avoid having a side effect to the other layers.

@angolini
Copy link
Copy Markdown
Contributor Author

We can also start using meta-gstreamer1.0 where all the backport is supported (although I haven't tested what it takes to integrate the layer directly).

My point is, gstreamer version might always be a point of pain when using mixed branches, although I think this is going to happen only now, and in the next LTS LmP will handle differently the branching schema.

What do you mean exactly by saying "we should use the upstream version"? Are you saying to push the 0.62.1 version to meta-freescale master?

@ricardosalveti
Copy link
Copy Markdown
Member

We can also start using meta-gstreamer1.0 where all the backport is supported (although I haven't tested what it takes to integrate the layer directly).

For now I would prefer to avoid meta-gstreamer1.0 as that adds a lot of complexity and possible side effects here.

What do you mean exactly by saying "we should use the upstream version"? Are you saying to push the 0.62.1 version to meta-freescale master?

I think that would be a cherry-pick from oe-master based on the version we need, instead of fetching the recipe from meta-gstreamer1.0.

@quaresmajose
Copy link
Copy Markdown
Member

We can also start using meta-gstreamer1.0 where all the backport is supported (although I haven't tested what it takes to integrate the layer directly).

For now I would prefer to avoid meta-gstreamer1.0 as that adds a lot of complexity and possible side effects here.

What do you mean exactly by saying "we should use the upstream version"? Are you saying to push the 0.62.1 version to meta-freescale master?

I think that would be a cherry-pick from oe-master based on the version we need, instead of fetching the recipe from meta-gstreamer1.0.

I mean having a downstream fork on meta-freescale[master] with a different version name 0.62.1.imx that can be chosen to be used on imx machines with PREFERRED_VERSION.
This meson version is only needed to build the gstreamer from meta-freescale[master] so it should be restricted to that bsp layer and not be of global use.
If you think it is not suitable for meta-freescale we can carry it in the same way in our meta-lmp-bsp layer.

@angolini angolini requested a review from ricardosalveti May 31, 2024 21:31
@angolini angolini changed the title [RFC] bsp: meson: Backport 0.62.1 from scarthgap [RFC] bsp: meson: Backport 1.3.1.imx from scarthgap Jun 4, 2024
PREFERRED_VERSION_meson ?= "0.61.3"
PREFERRED_VERSION_meson:imx8-nxp-bsp ?= "1.3.1.imx"
PREFERRED_VERSION_meson:imx9-nxp-bsp ?= "1.3.1.imx"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

because we are setting here PREFERRED_VERSION, we may want to mark this somehow as a backport.
I suggest we use the [REVERTME-scargthgap] tag as we use on factories https://docs.foundries.io/latest/reference-manual/linux/linux-update.html#common-pitfalls

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.

we have more backports that are marked but I agree to mark it someway as it was easy to remember

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yes, I'm still trying to find good ways to track the backports

I will recreate this patch, so we can see what it looks like with the tag

Copy link
Copy Markdown
Member

@quaresmajose quaresmajose Jun 19, 2024

Choose a reason for hiding this comment

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

Instead of having the [REVERTME-scargthgap] tag on the commit title, I would rather open a new PR as draft revert this one

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 think we can keep without the tag since this branch in particular is kirkstone specific, having it under recipes-backports is already enough from my perspective.

I believe we will have to keep 2 branches in order to keep kirkstone and scarthgap in place, so we would just skip this from merging in scarthgap.

Comment thread meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc Outdated
@angolini angolini changed the title [RFC] bsp: meson: Backport 1.3.1.imx from scarthgap bsp: meson: Backport 1.3.1.imx from scarthgap Jun 6, 2024
@angolini angolini requested a review from quaresmajose June 7, 2024 16:09
@ricardosalveti
Copy link
Copy Markdown
Member

ricardosalveti commented Jun 11, 2024

Hm, do we need version 1.3.1? That is a major bump, I was thinking we would end up backporting 0.63 or close by.

@angolini
Copy link
Copy Markdown
Contributor Author

Those are the versions:

scarthgap meson 1.3.1
nanbield meson 1.2.2
mickledore meson 1.0.1
langdale meson 0.63.3
kirkstone meson 0.61.3

The requirement is to be 0.62 or newer

the version from meta-multimedia is 0.62.y and it was ok, that's why I chose that one at first. This time I thought it would be better to already go to scarthgap version, but I'm ok to recreate the PR.

@quaresmajose
Copy link
Copy Markdown
Member

quaresmajose commented Jun 17, 2024

The langdale version 0.63.3 is more aligned in my opinion

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 (with the revert removal from the commit message).

When using kirkstone with some scarthgap compatible meta layers some
gstreamer from the BSP layer require the meson version 0.62.1 or newer.

This commit copies from oe/meta at langdale.

Signed-off-by: Daiane Angolini <[email protected]>
@angolini
Copy link
Copy Markdown
Contributor Author

LGTM (with the revert removal from the commit message).

done @ricardosalveti

@ricardosalveti ricardosalveti merged commit c8db41e into foundriesio:main Jun 21, 2024
@angolini angolini deleted the backport-meson branch August 21, 2024 13:54
quaresmajose added a commit to quaresmajose/meta-lmp that referenced this pull request Nov 25, 2024
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]>
quaresmajose added a commit to quaresmajose/meta-lmp that referenced this pull request Nov 25, 2024
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 added a commit to quaresmajose/meta-lmp that referenced this pull request Nov 26, 2024
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]>
quaresmajose added a commit to quaresmajose/meta-lmp that referenced this pull request Nov 26, 2024
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 added a commit that referenced this pull request Nov 27, 2024
This reverts commit 915af2c.

- Reverts scarthgap meson backport

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

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 27, 2024
This reverts commit c8db41e.

- Reverts scarthgap meson backport

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

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.

3 participants