summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/linux')
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb12
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-dev.bb14
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb (renamed from meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb)10
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb (renamed from meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb)14
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc13
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb26
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.15.bb (renamed from meta/recipes-kernel/linux/linux-yocto_5.14.bb)50
9 files changed, 91 insertions, 62 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index d395739..4ceb35f 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -48,7 +48,7 @@ do_install() {
48 mkdir -p ${D}/usr/src 48 mkdir -p ${D}/usr/src
49 ( 49 (
50 cd ${D}/usr/src 50 cd ${D}/usr/src
51 lnr ${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel 51 ln -rs ${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel
52 ) 52 )
53 53
54 # for on target purposes, we unify build and source 54 # for on target purposes, we unify build and source
@@ -109,8 +109,8 @@ do_install() {
109 fi 109 fi
110 fi 110 fi
111 111
112 if [ "${ARCH}" = "arm64" ]; then 112 if [ "${ARCH}" = "arm64" -o "${ARCH}" = "riscv" ]; then
113 cp -a --parents arch/arm64/kernel/vdso/vdso.lds $kerneldir/build/ 113 cp -a --parents arch/${ARCH}/kernel/vdso/vdso.lds $kerneldir/build/
114 fi 114 fi
115 if [ "${ARCH}" = "powerpc" ]; then 115 if [ "${ARCH}" = "powerpc" ]; then
116 cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || : 116 cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || :
@@ -185,6 +185,12 @@ do_install() {
185 cp -a --parents arch/${ARCH}/kernel/vdso32/* $kerneldir/build/ 2>/dev/null || : 185 cp -a --parents arch/${ARCH}/kernel/vdso32/* $kerneldir/build/ 2>/dev/null || :
186 cp -a --parents arch/${ARCH}/kernel/vdso64/* $kerneldir/build/ 2>/dev/null || : 186 cp -a --parents arch/${ARCH}/kernel/vdso64/* $kerneldir/build/ 2>/dev/null || :
187 fi 187 fi
188 if [ "${ARCH}" = "riscv" ]; then
189 cp -a --parents arch/riscv/kernel/vdso/*gettimeofday.* $kerneldir/build/
190 cp -a --parents arch/riscv/kernel/vdso/note.S $kerneldir/build/
191 cp -a --parents arch/riscv/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/
192 cp -a --parents arch/riscv/kernel/vdso/* $kerneldir/build/ 2>/dev/null || :
193 fi
188 194
189 # include the machine specific headers for ARM variants, if available. 195 # include the machine specific headers for ARM variants, if available.
190 if [ "${ARCH}" = "arm" ]; then 196 if [ "${ARCH}" = "arm" ]; then
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 005b688..0d94637 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -16,7 +16,7 @@ inherit pkgconfig
16# provide this .inc to set specific revisions 16# provide this .inc to set specific revisions
17include recipes-kernel/linux/linux-yocto-dev-revisions.inc 17include recipes-kernel/linux/linux-yocto-dev-revisions.inc
18 18
19KBRANCH = "standard/base" 19KBRANCH = "v5.16/standard/base"
20KMETA = "kernel-meta" 20KMETA = "kernel-meta"
21 21
22SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \ 22SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name
30SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' 30SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
31SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' 31SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
32 32
33LINUX_VERSION ?= "5.15+" 33LINUX_VERSION ?= "5.16+"
34LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" 34LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"
35PV = "${LINUX_VERSION}+git${SRCPV}" 35PV = "${LINUX_VERSION}+git${SRCPV}"
36 36
@@ -40,6 +40,16 @@ DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
40DEPENDS += "openssl-native util-linux-native" 40DEPENDS += "openssl-native util-linux-native"
41DEPENDS += "gmp-native libmpc-native" 41DEPENDS += "gmp-native libmpc-native"
42 42
43# yaml and dtschema are required for 5.16+ device tree validation, libyaml is checked
44# via pkgconfig, so must always be present, but we can wrap the others to make them
45# conditional
46DEPENDS += "libyaml-native"
47
48PACKAGECONFIG ??= ""
49PACKAGECONFIG[dt-validation] = ",,python3-dtschema-native"
50# we need the wrappers if validation isn't in the packageconfig
51DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'dt-validation', '', 'python3-dtschema-wrapper-native', d)}"
52
43COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" 53COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)"
44 54
45KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" 55KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index e35a91d..420d670 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "42d1c4e85643d634bddd98e5c4d8a9bcc61b3e18" 14SRCREV_machine ?= "85c14e209f1ab7cee673735c4561e656b4e65217"
15SRCREV_meta ?= "f8afd84b117f336477846b9e22178ebefb26c08d" 15SRCREV_meta ?= "de35f8006d0f932924752ddda94dd24e2da67fbc"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
19 19
20LINUX_VERSION ?= "5.10.70" 20LINUX_VERSION ?= "5.10.91"
21 21
22LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 22LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 0baffe6..4713e45 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -1,4 +1,4 @@
1KBRANCH ?= "v5.14/standard/preempt-rt/base" 1KBRANCH ?= "v5.15/standard/preempt-rt/base"
2 2
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
@@ -11,13 +11,13 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "ca5b19aa3996eb1907f546fce7a7fa55053fbead" 14SRCREV_machine ?= "799919ec2113ffcec02207ea67abdc629f3bbebe"
15SRCREV_meta ?= "884dfea956ec6b166d1f99a295c47338573a974c" 15SRCREV_meta ?= "72e4eafb6b3c999aefc56e1c1b9dfa0c94ae2fbb"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
19 19
20LINUX_VERSION ?= "5.14.9" 20LINUX_VERSION ?= "5.15.14"
21 21
22LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 22LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index c92a149..dabcb97 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
6 6
7require recipes-kernel/linux/linux-yocto.inc 7require recipes-kernel/linux/linux-yocto.inc
8 8
9LINUX_VERSION ?= "5.10.70" 9LINUX_VERSION ?= "5.10.91"
10LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 10LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
11 11
12DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" 12DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine:qemuarm ?= "71ff272be9e9436f27088fbd494da2de613121ea" 18SRCREV_machine:qemuarm ?= "2227ab16358ca3193f03d0cd8509092076aeffbb"
19SRCREV_machine ?= "4d1eeccd06dd8d310b238d6350cb0f7d937f4427" 19SRCREV_machine ?= "b3fdab7a9f3c11a61565cead0445883a61081583"
20SRCREV_meta ?= "f8afd84b117f336477846b9e22178ebefb26c08d" 20SRCREV_meta ?= "de35f8006d0f932924752ddda94dd24e2da67fbc"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index 5ca45ad..b539752 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -1,12 +1,12 @@
1KBRANCH ?= "v5.14/standard/tiny/base" 1KBRANCH ?= "v5.15/standard/tiny/base"
2KBRANCH:qemuarm ?= "v5.14/standard/tiny/arm-versatile-926ejs" 2KBRANCH:qemuarm ?= "v5.15/standard/tiny/arm-versatile-926ejs"
3 3
4LINUX_KERNEL_TYPE = "tiny" 4LINUX_KERNEL_TYPE = "tiny"
5KCONFIG_MODE = "--allnoconfig" 5KCONFIG_MODE = "--allnoconfig"
6 6
7require recipes-kernel/linux/linux-yocto.inc 7require recipes-kernel/linux/linux-yocto.inc
8 8
9LINUX_VERSION ?= "5.14.9" 9LINUX_VERSION ?= "5.15.14"
10LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 10LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
11 11
12DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" 12DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,14 +15,14 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine:qemuarm ?= "66b3eb63900447948655628e141b54ce0dc3a009" 18SRCREV_machine:qemuarm ?= "a499d1d7ad7cee5ddea8a737bfd0c44b109b63b6"
19SRCREV_machine ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" 19SRCREV_machine ?= "f77b2ba7d575bca40670dd20fcafa4574d9e56f1"
20SRCREV_meta ?= "884dfea956ec6b166d1f99a295c47338573a974c" 20SRCREV_meta ?= "72e4eafb6b3c999aefc56e1c1b9dfa0c94ae2fbb"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
26 26
27COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" 27COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
28 28
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 331727d..a3b2416 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -46,6 +46,7 @@ LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}"
46# Pick up shared functions 46# Pick up shared functions
47inherit kernel 47inherit kernel
48inherit kernel-yocto 48inherit kernel-yocto
49inherit pkgconfig
49 50
50B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build" 51B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build"
51 52
@@ -57,3 +58,15 @@ do_install:append(){
57 58
58# enable kernel-sample for oeqa/runtime/cases's ksample.py test 59# enable kernel-sample for oeqa/runtime/cases's ksample.py test
59KERNEL_FEATURES:append:qemuall=" features/kernel-sample/kernel-sample.scc" 60KERNEL_FEATURES:append:qemuall=" features/kernel-sample/kernel-sample.scc"
61
62KERNEL_DEBUG_OPTIONS ?= "stack"
63KERNEL_EXTRA_ARGS:append:x86-64 = "${@bb.utils.contains('KERNEL_DEBUG_OPTIONS', 'stack', 'HOST_LIBELF_LIBS="-L${RECIPE_SYSROOT_NATIVE}/usr/lib/pkgconfig/../../../usr/lib/ -lelf"', '', d)}"
64
65do_devshell:prepend() {
66 # setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native)
67 d.setVar("PKG_CONFIG_DIR", "${STAGING_DIR_NATIVE}${libdir_native}/pkgconfig")
68 d.setVar("PKG_CONFIG_PATH", "${PKG_CONFIG_DIR}:${STAGING_DATADIR_NATIVE}/pkgconfig")
69 d.setVar("PKG_CONFIG_LIBDIR", "${PKG_CONFIG_DIR}")
70 d.setVarFlag("PKG_CONFIG_SYSROOT_DIR", "unexport", "1")
71 d.appendVar("OE_TERMINAL_EXPORTS", " PKG_CONFIG_DIR PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR")
72}
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index b4ccdb2..9c43738 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.10/standard/base"
13KBRANCH:qemux86-64 ?= "v5.10/standard/base" 13KBRANCH:qemux86-64 ?= "v5.10/standard/base"
14KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" 14KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
15 15
16SRCREV_machine:qemuarm ?= "011882741f10bd0c725139baa383eb5a4d833bca" 16SRCREV_machine:qemuarm ?= "fb570663823bd492e4c8d4339be825bda4210dc6"
17SRCREV_machine:qemuarm64 ?= "098464b7c0c3d6f2a5b9226aab3245c3fcfb4797" 17SRCREV_machine:qemuarm64 ?= "5a52b700c1693a95b8efa54cb65bec7807a75cd2"
18SRCREV_machine:qemumips ?= "88494c005ab76864e706097056557b5616da65c6" 18SRCREV_machine:qemumips ?= "8eb8a801f5f4764c362aefd5e97e704755cf740b"
19SRCREV_machine:qemuppc ?= "a2b9c27f431a20ebfcd4146971c9422f4216aa90" 19SRCREV_machine:qemuppc ?= "21b014e385a6b54a2fd7d667a1b556c69cda77de"
20SRCREV_machine:qemuriscv64 ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" 20SRCREV_machine:qemuriscv64 ?= "77c8d144b066f69e009ce2ee540a593b11eb736a"
21SRCREV_machine:qemuriscv32 ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" 21SRCREV_machine:qemuriscv32 ?= "77c8d144b066f69e009ce2ee540a593b11eb736a"
22SRCREV_machine:qemux86 ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" 22SRCREV_machine:qemux86 ?= "77c8d144b066f69e009ce2ee540a593b11eb736a"
23SRCREV_machine:qemux86-64 ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" 23SRCREV_machine:qemux86-64 ?= "77c8d144b066f69e009ce2ee540a593b11eb736a"
24SRCREV_machine:qemumips64 ?= "80da62cff32617711767cd6b01f64f1dc14f94d8" 24SRCREV_machine:qemumips64 ?= "5468343e50389dba73b5d441289d5094bd0dc9f0"
25SRCREV_machine ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" 25SRCREV_machine ?= "77c8d144b066f69e009ce2ee540a593b11eb736a"
26SRCREV_meta ?= "f8afd84b117f336477846b9e22178ebefb26c08d" 26SRCREV_meta ?= "de35f8006d0f932924752ddda94dd24e2da67fbc"
27 27
28# remap qemuarm to qemuarma15 for the 5.8 kernel 28# remap qemuarm to qemuarma15 for the 5.8 kernel
29# KMACHINE:qemuarm ?= "qemuarma15" 29# KMACHINE:qemuarm ?= "qemuarma15"
@@ -32,11 +32,11 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
32 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" 32 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
33 33
34LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 34LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
35LINUX_VERSION ?= "5.10.70" 35LINUX_VERSION ?= "5.10.91"
36 36
37DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" 37DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
38DEPENDS += "openssl-native util-linux-native" 38DEPENDS += "openssl-native util-linux-native"
39DEPENDS += "gmp-native" 39DEPENDS += "gmp-native libmpc-native"
40 40
41PV = "${LINUX_VERSION}+git${SRCPV}" 41PV = "${LINUX_VERSION}+git${SRCPV}"
42 42
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.14.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 6a032a1..daa83eb 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -1,29 +1,29 @@
1KBRANCH ?= "v5.14/standard/base" 1KBRANCH ?= "v5.15/standard/base"
2 2
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5# board specific branches 5# board specific branches
6KBRANCH:qemuarm ?= "v5.14/standard/arm-versatile-926ejs" 6KBRANCH:qemuarm ?= "v5.15/standard/arm-versatile-926ejs"
7KBRANCH:qemuarm64 ?= "v5.14/standard/qemuarm64" 7KBRANCH:qemuarm64 ?= "v5.15/standard/qemuarm64"
8KBRANCH:qemumips ?= "v5.14/standard/mti-malta32" 8KBRANCH:qemumips ?= "v5.15/standard/mti-malta32"
9KBRANCH:qemuppc ?= "v5.14/standard/qemuppc" 9KBRANCH:qemuppc ?= "v5.15/standard/qemuppc"
10KBRANCH:qemuriscv64 ?= "v5.14/standard/base" 10KBRANCH:qemuriscv64 ?= "v5.15/standard/base"
11KBRANCH:qemuriscv32 ?= "v5.14/standard/base" 11KBRANCH:qemuriscv32 ?= "v5.15/standard/base"
12KBRANCH:qemux86 ?= "v5.14/standard/base" 12KBRANCH:qemux86 ?= "v5.15/standard/base"
13KBRANCH:qemux86-64 ?= "v5.14/standard/base" 13KBRANCH:qemux86-64 ?= "v5.15/standard/base"
14KBRANCH:qemumips64 ?= "v5.14/standard/mti-malta64" 14KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
15 15
16SRCREV_machine:qemuarm ?= "c3a887f62f231d6b31f0209712014f9cbc7fd77e" 16SRCREV_machine:qemuarm ?= "03294d897ba8374d172b5c035e8c5698f676a1d7"
17SRCREV_machine:qemuarm64 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" 17SRCREV_machine:qemuarm64 ?= "f77b2ba7d575bca40670dd20fcafa4574d9e56f1"
18SRCREV_machine:qemumips ?= "77174bdf6581bdb93f0f458601364800670f8531" 18SRCREV_machine:qemumips ?= "84d8700593a35c850938994e080422bd354245ce"
19SRCREV_machine:qemuppc ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" 19SRCREV_machine:qemuppc ?= "f77b2ba7d575bca40670dd20fcafa4574d9e56f1"
20SRCREV_machine:qemuriscv64 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" 20SRCREV_machine:qemuriscv64 ?= "f77b2ba7d575bca40670dd20fcafa4574d9e56f1"
21SRCREV_machine:qemuriscv32 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" 21SRCREV_machine:qemuriscv32 ?= "f77b2ba7d575bca40670dd20fcafa4574d9e56f1"
22SRCREV_machine:qemux86 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" 22SRCREV_machine:qemux86 ?= "f77b2ba7d575bca40670dd20fcafa4574d9e56f1"
23SRCREV_machine:qemux86-64 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" 23SRCREV_machine:qemux86-64 ?= "f77b2ba7d575bca40670dd20fcafa4574d9e56f1"
24SRCREV_machine:qemumips64 ?= "e86c3a6ad2fde78ad03e0b899286bf603756207d" 24SRCREV_machine:qemumips64 ?= "4b8ef0714dd9fe90b5f92fab297926c482a58b88"
25SRCREV_machine ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" 25SRCREV_machine ?= "f77b2ba7d575bca40670dd20fcafa4574d9e56f1"
26SRCREV_meta ?= "884dfea956ec6b166d1f99a295c47338573a974c" 26SRCREV_meta ?= "72e4eafb6b3c999aefc56e1c1b9dfa0c94ae2fbb"
27 27
28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
29# get the <version>/base branch, which is pure upstream -stable, and the same 29# get the <version>/base branch, which is pure upstream -stable, and the same
@@ -31,18 +31,18 @@ SRCREV_meta ?= "884dfea956ec6b166d1f99a295c47338573a974c"
31# normal PREFERRED_VERSION settings. 31# normal PREFERRED_VERSION settings.
32BBCLASSEXTEND = "devupstream:target" 32BBCLASSEXTEND = "devupstream:target"
33DEFAULT_PREFERENCE:class-devupstream = "-1" 33DEFAULT_PREFERENCE:class-devupstream = "-1"
34SRCREV_machine:class-devupstream ?= "70248e7b378b96f208d5544ee25b808a8ef2ddc2" 34SRCREV_machine:class-devupstream ?= "d114b082bef784345bfac1e1d5c17257005284f2"
35PN:class-devupstream = "linux-yocto-upstream" 35PN:class-devupstream = "linux-yocto-upstream"
36KBRANCH:class-devupstream = "v5.14/base" 36KBRANCH:class-devupstream = "v5.15/base"
37 37
38# remap qemuarm to qemuarma15 for the 5.8 kernel 38# remap qemuarm to qemuarma15 for the 5.8 kernel
39# KMACHINE:qemuarm ?= "qemuarma15" 39# KMACHINE:qemuarm ?= "qemuarma15"
40 40
41SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 41SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
42 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}" 42 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
43 43
44LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 44LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
45LINUX_VERSION ?= "5.14.9" 45LINUX_VERSION ?= "5.15.14"
46 46
47DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" 47DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
48DEPENDS += "openssl-native util-linux-native" 48DEPENDS += "openssl-native util-linux-native"