From 503e4e567eb268fc51e7e85df03e2e92076e07cd Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Wed, 8 Mar 2023 13:18:58 +0800 Subject: [PATCH] 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 Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel-rt_5.19.bb | 2 -- recipes-kernel/linux/linux-intel.inc | 1 + ...-mconf-cfg-Allow-specification-of-ncurses-.patch} | 0 recipes-kernel/linux/linux-intel_6.1.bb | 2 -- .../{linux-intel_5.19.bb => linux-intel_6.2.bb} | 12 +++++------- 5 files changed, 6 insertions(+), 11 deletions(-) rename recipes-kernel/linux/linux-intel/{0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch => 0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch} (100%) rename recipes-kernel/linux/{linux-intel_5.19.bb => linux-intel_6.2.bb} (57%) 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 SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ " -SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - # Skip processing of this recipe if it is not explicitly specified as the # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying # 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 = " \ file://0001-vt-conmakehash-improve-reproducibility.patch \ file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ file://fix-perf-reproducibility.patch \ + file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ " PV = "${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 similarity index 100% rename from recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch rename to 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 SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ " -SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - KBRANCH = "6.1/linux" KMETA_BRANCH = "yocto-6.1" diff --git a/recipes-kernel/linux/linux-intel_5.19.bb b/recipes-kernel/linux/linux-intel_6.2.bb similarity index 57% rename from recipes-kernel/linux/linux-intel_5.19.bb rename to 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 SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ " -SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - -KMETA_BRANCH = "yocto-5.19" +KMETA_BRANCH = "master" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" @@ -12,11 +10,11 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" -LINUX_VERSION ?= "5.19.0" -SRCREV_machine ?= "51b9920cab3c5ee38b2c0cd5c7509ce005241b72" -SRCREV_meta ?= "f5d4c109d6de04005def04c3a06f053ae0c397ad" +LINUX_VERSION ?= "6.2.0" +SRCREV_machine ?= "4b86b0f8f30699805284163233f6ac34fc507863" +SRCREV_meta ?= "bd77e1f904f681d21732bb3ae77b6591f6ec3d81" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" -UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v5.19-linux-(?P(\d+)T(\d+)Z)$" +UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.2-linux-(?P(\d+)T(\d+)Z)$"