diff mbox series

[2/2] linux-yocto: implicitly track oe-core's kernel version for genericarm64

Message ID 20240312181115.3848230-2-ross.burton@arm.com (mailing list archive)
State New
Headers show
Series [1/2] linux-yocto: put COMPATIBLE_MACHINE first | expand

Commit Message

Ross Burton March 12, 2024, 6:11 p.m. UTC
From: Ross Burton <ross.burton@arm.com>

Don't override KBRANCH/SRCREV/LINUX_VERSION, instead use the values in
the base oe-core linux-yocto recipe.

The advantage of this is that we don't need to update this file every
time the kernel is upgraded in oe-core.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend | 3 ---
 1 file changed, 3 deletions(-)

Comments

Bruce Ashfield March 13, 2024, 1:47 a.m. UTC | #1
On Tue, Mar 12, 2024 at 2:11 PM Ross Burton <ross.burton@arm.com> wrote:
>
> From: Ross Burton <ross.burton@arm.com>
>
> Don't override KBRANCH/SRCREV/LINUX_VERSION, instead use the values in
> the base oe-core linux-yocto recipe.
>
> The advantage of this is that we don't need to update this file every
> time the kernel is upgraded in oe-core.

I'm ok with this as well, and in theory, we could probably do it for the
other reference BSPs as well.

It would be even better if I could boot test this with qemu, but we'll
worry about that part later.

Bruce

>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
> index 7a1fb6f245c..b404f827e7b 100644
> --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
> +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
> @@ -3,7 +3,6 @@ COMPATIBLE_MACHINE:genericx86 = "genericx86"
>  COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
>  COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
>
> -KBRANCH:genericarm64  = "v6.6/standard/base"
>  KBRANCH:genericx86  = "v6.6/standard/base"
>  KBRANCH:genericx86-64  = "v6.6/standard/base"
>  KBRANCH:beaglebone-yocto = "v6.6/standard/beaglebone"
> @@ -13,12 +12,10 @@ KMACHINE:genericx86 ?= "common-pc"
>  KMACHINE:genericx86-64 ?= "common-pc-64"
>  KMACHINE:beaglebone-yocto ?= "beaglebone"
>
> -SRCREV_machine:genericarm64 ?= "e064a7d658a30b027b999183e21cd37305caff2a"
>  SRCREV_machine:genericx86 ?= "332d4668fcc32826907d4f3c4938845206006089"
>  SRCREV_machine:genericx86-64 ?= "332d4668fcc32826907d4f3c4938845206006089"
>  SRCREV_machine:beaglebone-yocto ?= "332d4668fcc32826907d4f3c4938845206006089"
>
> -LINUX_VERSION:genericarm64 = "6.6.18"
>  LINUX_VERSION:genericx86 = "6.6.15"
>  LINUX_VERSION:genericx86-64 = "6.6.15"
>  LINUX_VERSION:beaglebone-yocto = "6.6.15"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#13307): https://lists.yoctoproject.org/g/poky/message/13307
> Mute This Topic: https://lists.yoctoproject.org/mt/104890079/1050810
> Group Owner: poky+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/poky/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
index 7a1fb6f245c..b404f827e7b 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
@@ -3,7 +3,6 @@  COMPATIBLE_MACHINE:genericx86 = "genericx86"
 COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
 COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
 
-KBRANCH:genericarm64  = "v6.6/standard/base"
 KBRANCH:genericx86  = "v6.6/standard/base"
 KBRANCH:genericx86-64  = "v6.6/standard/base"
 KBRANCH:beaglebone-yocto = "v6.6/standard/beaglebone"
@@ -13,12 +12,10 @@  KMACHINE:genericx86 ?= "common-pc"
 KMACHINE:genericx86-64 ?= "common-pc-64"
 KMACHINE:beaglebone-yocto ?= "beaglebone"
 
-SRCREV_machine:genericarm64 ?= "e064a7d658a30b027b999183e21cd37305caff2a"
 SRCREV_machine:genericx86 ?= "332d4668fcc32826907d4f3c4938845206006089"
 SRCREV_machine:genericx86-64 ?= "332d4668fcc32826907d4f3c4938845206006089"
 SRCREV_machine:beaglebone-yocto ?= "332d4668fcc32826907d4f3c4938845206006089"
 
-LINUX_VERSION:genericarm64 = "6.6.18"
 LINUX_VERSION:genericx86 = "6.6.15"
 LINUX_VERSION:genericx86-64 = "6.6.15"
 LINUX_VERSION:beaglebone-yocto = "6.6.15"