summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2023-03-08 13:18:58 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2023-03-09 09:46:07 +0800
commit503e4e567eb268fc51e7e85df03e2e92076e07cd (patch)
tree5c31f88fb443712c2634931734d732ea1be007eb /recipes-kernel/linux
parent197effab2bf62ccc0bc36a707013e73e5c5462ed (diff)
downloadmeta-intel-503e4e567eb268fc51e7e85df03e2e92076e07cd.tar.gz
linux-intel/6.2: add recipe
It builds 6.2 kernel version from mainline-tracking tree. https://github.com/intel/mainline-tracking tag: mainline-tracking-v6.2-linux-230223T032049Z Remove linux-intel 5.19 recipe. There is no -rt version of 6.2 yet so 5.19-rt has been kept. Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-kernel/linux')
-rw-r--r--recipes-kernel/linux/linux-intel-rt_5.19.bb2
-rw-r--r--recipes-kernel/linux/linux-intel.inc1
-rw-r--r--recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch (renamed from recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch)0
-rw-r--r--recipes-kernel/linux/linux-intel_6.1.bb2
-rw-r--r--recipes-kernel/linux/linux-intel_6.2.bb (renamed from recipes-kernel/linux/linux-intel_5.19.bb)12
5 files changed, 6 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-intel-rt_5.19.bb b/recipes-kernel/linux/linux-intel-rt_5.19.bb
index 117c903b..7fab89a9 100644
--- a/recipes-kernel/linux/linux-intel-rt_5.19.bb
+++ b/recipes-kernel/linux/linux-intel-rt_5.19.bb
@@ -2,8 +2,6 @@ require linux-intel.inc
2 2
3SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ 3SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \
4 " 4 "
5SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch"
6
7# Skip processing of this recipe if it is not explicitly specified as the 5# Skip processing of this recipe if it is not explicitly specified as the
8# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying 6# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
9# to build multiple virtual/kernel providers, e.g. as dependency of 7# to build multiple virtual/kernel providers, e.g. as dependency of
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index b54d634b..7f81fc18 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -10,6 +10,7 @@ SRC_URI = " \
10 file://0001-vt-conmakehash-improve-reproducibility.patch \ 10 file://0001-vt-conmakehash-improve-reproducibility.patch \
11 file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ 11 file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
12 file://fix-perf-reproducibility.patch \ 12 file://fix-perf-reproducibility.patch \
13 file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
13 " 14 "
14 15
15PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
index 9aff37de..9aff37de 100644
--- a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
+++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
diff --git a/recipes-kernel/linux/linux-intel_6.1.bb b/recipes-kernel/linux/linux-intel_6.1.bb
index ee27a5cf..a3c113f5 100644
--- a/recipes-kernel/linux/linux-intel_6.1.bb
+++ b/recipes-kernel/linux/linux-intel_6.1.bb
@@ -2,8 +2,6 @@ require linux-intel.inc
2 2
3SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ 3SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
4 " 4 "
5SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch"
6
7KBRANCH = "6.1/linux" 5KBRANCH = "6.1/linux"
8KMETA_BRANCH = "yocto-6.1" 6KMETA_BRANCH = "yocto-6.1"
9 7
diff --git a/recipes-kernel/linux/linux-intel_5.19.bb b/recipes-kernel/linux/linux-intel_6.2.bb
index 9c3e9890..60f8d315 100644
--- a/recipes-kernel/linux/linux-intel_5.19.bb
+++ b/recipes-kernel/linux/linux-intel_6.2.bb
@@ -2,9 +2,7 @@ require linux-intel.inc
2 2
3SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ 3SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \
4 " 4 "
5SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" 5KMETA_BRANCH = "master"
6
7KMETA_BRANCH = "yocto-5.19"
8 6
9LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 7LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
10 8
@@ -12,11 +10,11 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
12 10
13LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" 11LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
14 12
15LINUX_VERSION ?= "5.19.0" 13LINUX_VERSION ?= "6.2.0"
16SRCREV_machine ?= "51b9920cab3c5ee38b2c0cd5c7509ce005241b72" 14SRCREV_machine ?= "4b86b0f8f30699805284163233f6ac34fc507863"
17SRCREV_meta ?= "f5d4c109d6de04005def04c3a06f053ae0c397ad" 15SRCREV_meta ?= "bd77e1f904f681d21732bb3ae77b6591f6ec3d81"
18 16
19# Functionality flags 17# Functionality flags
20KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" 18KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
21 19
22UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v5.19-linux-(?P<pver>(\d+)T(\d+)Z)$" 20UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.2-linux-(?P<pver>(\d+)T(\d+)Z)$"