[master] mesa-demos: set default PREFERRED_VERSION

From: "Denys Dmytriyenko (TI)" <denys@konsulko.com>

Set default PREFERRED_VERSION for mesa-demos to use the version from
OE-Core when not using Arago distro. When Arago distro is used, it
gets changed to our version in arago-prefs.conf
This addresses the signature change issue in yocto-check-layer.

Signed-off-by: Denys Dmytriyenko (TI) <denys@konsulko.com>
---
 meta-arago-distro/conf/layer.conf                         | 2 ++
 meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

meta-arago / na / 20260420195557.22133-1-denis

PRC Results: PASS

=========================================================
  check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [master][PATCH] mesa-demos: set default PREFERRED_VERSION
    WARN: Missing Signed-off-by by sender in commit message. (SIGNED-OFF-BY-2)
        patch
    
    For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887



=========================================================
  apply-yocto-patch: PASS
=========================================================
master
=====================
Summary:
- Patch Series: [master][PATCH] mesa-demos: set default PREFERRED_VERSION
- Submitter: From: Denys Dmytriyenko <denis@denix.org>
From: "Denys Dmytriyenko (TI)" <denys@konsulko.com>
- Date: Date: Mon, 20 Apr 2026 15:55:57 -0400
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: e7fb78dca537389589264ca362112b4d8bc89695

Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: master-next
- Commit Author: LCPD Automation Script <lcpdbld@list.ti.com>
- Commit Subject: CI/CD Auto-Merger: cicd.master.202604201357
- Commit SHA: c3de43f19b4d7918ebe43756e8a42fcf08383a96

Patches
----------------------------------------
All patches applied



=========================================================
  check-yocto-repo: PASS
=========================================================
master
=====================
PASS



=========================================================
  yocto-check-layers: PASS
=========================================================
master - PASS
=====================
All checks passed

On 4/20/2026 2:55 PM, Denys Dmytriyenko wrote:
> From: "Denys Dmytriyenko (TI)" <denys@konsulko.com>
> 
> Set default PREFERRED_VERSION for mesa-demos to use the version from
> OE-Core when not using Arago distro. When Arago distro is used, it
> gets changed to our version in arago-prefs.conf
> This addresses the signature change issue in yocto-check-layer.

This means we have to stay on top of this change for when they change 
the version from 9.0.0 to something else.  We will be preferring a 
version that no longer exists.

Need to think on this.  Thanks for tracking down an alternative solution.


> Signed-off-by: Denys Dmytriyenko (TI) <denys@konsulko.com>
> ---
>   meta-arago-distro/conf/layer.conf                         | 2 ++
>   meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb | 1 -
>   2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-arago-distro/conf/layer.conf b/meta-arago-distro/conf/layer.conf
> index 2ad036f5..af3be2b9 100644
> --- a/meta-arago-distro/conf/layer.conf
> +++ b/meta-arago-distro/conf/layer.conf
> @@ -39,3 +39,5 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
>   "
>   
>   HOSTTOOLS_NONFATAL += "corkscrew getent socket"
> +
> +PREFERRED_VERSION_mesa-demos = "9.0.0"
> diff --git a/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb b/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
> index 2da3ceff..62cb0ee6 100644
> --- a/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
> +++ b/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
> @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=a481
>   SRC_URI = "git://gitlab.freedesktop.org/mesa/demos.git;protocol=https;branch=main"
>   SRCREV = "02eae079cb0b8186064d5b194ca4cc2995f099ee"
>   
> -DEFAULT_PREFERENCE = "-1"
>   PV = "9.0.0+git"
>   
>   inherit meson pkgconfig features_check

On Tue, Apr 21, 2026 at 08:20:52AM -0500, Ryan Eatmon wrote:
> 
> 
> On 4/20/2026 2:55 PM, Denys Dmytriyenko wrote:
> >From: "Denys Dmytriyenko (TI)" <denys@konsulko.com>
> >
> >Set default PREFERRED_VERSION for mesa-demos to use the version from
> >OE-Core when not using Arago distro. When Arago distro is used, it
> >gets changed to our version in arago-prefs.conf
> >This addresses the signature change issue in yocto-check-layer.
> 
> This means we have to stay on top of this change for when they
> change the version from 9.0.0 to something else.  We will be
> preferring a version that no longer exists.

Yes, this is correct and rather inconvenient. But lowering DEFAULT_PREFERENCE 
won't work here, as meta-arago-distro has a higher layer priority than OE-Core 
and hence supersedes the recipe's DEFAULT_PREFERENCE.

It's either keep track of the OE-Core version or convert the recipe to a 
bbappend, like you already did.

Specifically in this case it's not so bad - OE-Core has version 9.0.0 and 
Randolph's updated local version pulls additional commits that were merged 
after the release, making it 9.0.0+git. So, when a new version comes out and 
OE-Core updates the recipe, we would anyway need to remove our local version.


> Need to think on this.  Thanks for tracking down an alternative solution.
> 
> 
> >Signed-off-by: Denys Dmytriyenko (TI) <denys@konsulko.com>
> >---
> >  meta-arago-distro/conf/layer.conf                         | 2 ++
> >  meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb | 1 -
> >  2 files changed, 2 insertions(+), 1 deletion(-)
> >
> >diff --git a/meta-arago-distro/conf/layer.conf b/meta-arago-distro/conf/layer.conf
> >index 2ad036f5..af3be2b9 100644
> >--- a/meta-arago-distro/conf/layer.conf
> >+++ b/meta-arago-distro/conf/layer.conf
> >@@ -39,3 +39,5 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
> >  "
> >  HOSTTOOLS_NONFATAL += "corkscrew getent socket"
> >+
> >+PREFERRED_VERSION_mesa-demos = "9.0.0"
> >diff --git a/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb b/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
> >index 2da3ceff..62cb0ee6 100644
> >--- a/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
> >+++ b/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
> >@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=a481
> >  SRC_URI = "git://gitlab.freedesktop.org/mesa/demos.git;protocol=https;branch=main"
> >  SRCREV = "02eae079cb0b8186064d5b194ca4cc2995f099ee"
> >-DEFAULT_PREFERENCE = "-1"
> >  PV = "9.0.0+git"
> >  inherit meson pkgconfig features_check

On 4/21/2026 1:28 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 21, 2026 at 08:20:52AM -0500, Ryan Eatmon wrote:
>>
>>
>> On 4/20/2026 2:55 PM, Denys Dmytriyenko wrote:
>>> From: "Denys Dmytriyenko (TI)" <denys@konsulko.com>
>>>
>>> Set default PREFERRED_VERSION for mesa-demos to use the version from
>>> OE-Core when not using Arago distro. When Arago distro is used, it
>>> gets changed to our version in arago-prefs.conf
>>> This addresses the signature change issue in yocto-check-layer.
>>
>> This means we have to stay on top of this change for when they
>> change the version from 9.0.0 to something else.  We will be
>> preferring a version that no longer exists.
> 
> Yes, this is correct and rather inconvenient. But lowering DEFAULT_PREFERENCE
> won't work here, as meta-arago-distro has a higher layer priority than OE-Core
> and hence supersedes the recipe's DEFAULT_PREFERENCE.
> 
> It's either keep track of the OE-Core version or convert the recipe to a
> bbappend, like you already did.
> 
> Specifically in this case it's not so bad - OE-Core has version 9.0.0 and
> Randolph's updated local version pulls additional commits that were merged
> after the release, making it 9.0.0+git. So, when a new version comes out and
> OE-Core updates the recipe, we would anyway need to remove our local version.

True.


> 
>> Need to think on this.  Thanks for tracking down an alternative solution.
>>
>>
>>> Signed-off-by: Denys Dmytriyenko (TI) <denys@konsulko.com>
>>> ---
>>>   meta-arago-distro/conf/layer.conf                         | 2 ++
>>>   meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb | 1 -
>>>   2 files changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta-arago-distro/conf/layer.conf b/meta-arago-distro/conf/layer.conf
>>> index 2ad036f5..af3be2b9 100644
>>> --- a/meta-arago-distro/conf/layer.conf
>>> +++ b/meta-arago-distro/conf/layer.conf
>>> @@ -39,3 +39,5 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
>>>   "
>>>   HOSTTOOLS_NONFATAL += "corkscrew getent socket"
>>> +
>>> +PREFERRED_VERSION_mesa-demos = "9.0.0"
>>> diff --git a/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb b/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
>>> index 2da3ceff..62cb0ee6 100644
>>> --- a/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
>>> +++ b/meta-arago-distro/recipes-graphics/mesa/mesa-demos_git.bb
>>> @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=a481
>>>   SRC_URI = "git://gitlab.freedesktop.org/mesa/demos.git;protocol=https;branch=main"
>>>   SRCREV = "02eae079cb0b8186064d5b194ca4cc2995f099ee"
>>> -DEFAULT_PREFERENCE = "-1"
>>>   PV = "9.0.0+git"
>>>   inherit meson pkgconfig features_check
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17480): https://lists.yoctoproject.org/g/meta-arago/message/17480
> Mute This Topic: https://lists.yoctoproject.org/mt/118927074/6551054
> Group Owner: meta-arago+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 
>