summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-03-12 18:11:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-03-18 12:22:08 +0000
commit3c75e5f54093095ecac69829999bf6d1c16bbffb (patch)
tree0b43a5a337f9445f7af973a70afeffeb7000444b
parentfe29ea014e3e10f1c688e2973e7fc7e280e6eb4e (diff)
downloadpoky-master-next.tar.gz
linux-yocto: implicitly track oe-core's kernel version for genericarm64master-next
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. (From meta-yocto rev: 91c4efe03d96bee555b0c6581f3fae1145e75a68) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend3
1 files changed, 0 insertions, 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 7a1fb6f245..b404f827e7 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"
3COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" 3COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
4COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" 4COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
5 5
6KBRANCH:genericarm64 = "v6.6/standard/base"
7KBRANCH:genericx86 = "v6.6/standard/base" 6KBRANCH:genericx86 = "v6.6/standard/base"
8KBRANCH:genericx86-64 = "v6.6/standard/base" 7KBRANCH:genericx86-64 = "v6.6/standard/base"
9KBRANCH:beaglebone-yocto = "v6.6/standard/beaglebone" 8KBRANCH:beaglebone-yocto = "v6.6/standard/beaglebone"
@@ -13,12 +12,10 @@ KMACHINE:genericx86 ?= "common-pc"
13KMACHINE:genericx86-64 ?= "common-pc-64" 12KMACHINE:genericx86-64 ?= "common-pc-64"
14KMACHINE:beaglebone-yocto ?= "beaglebone" 13KMACHINE:beaglebone-yocto ?= "beaglebone"
15 14
16SRCREV_machine:genericarm64 ?= "e064a7d658a30b027b999183e21cd37305caff2a"
17SRCREV_machine:genericx86 ?= "332d4668fcc32826907d4f3c4938845206006089" 15SRCREV_machine:genericx86 ?= "332d4668fcc32826907d4f3c4938845206006089"
18SRCREV_machine:genericx86-64 ?= "332d4668fcc32826907d4f3c4938845206006089" 16SRCREV_machine:genericx86-64 ?= "332d4668fcc32826907d4f3c4938845206006089"
19SRCREV_machine:beaglebone-yocto ?= "332d4668fcc32826907d4f3c4938845206006089" 17SRCREV_machine:beaglebone-yocto ?= "332d4668fcc32826907d4f3c4938845206006089"
20 18
21LINUX_VERSION:genericarm64 = "6.6.18"
22LINUX_VERSION:genericx86 = "6.6.15" 19LINUX_VERSION:genericx86 = "6.6.15"
23LINUX_VERSION:genericx86-64 = "6.6.15" 20LINUX_VERSION:genericx86-64 = "6.6.15"
24LINUX_VERSION:beaglebone-yocto = "6.6.15" 21LINUX_VERSION:beaglebone-yocto = "6.6.15"