5 files changed, 39 insertions, 22 deletions

diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb b/recipes-kernel/intel-ethernet/ixgbe_6.3.4.bb
index 75ebf6f4..17bfd0b2 100644
--- a/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb
+++ b/recipes-kernel/intel-ethernet/ixgbe_6.3.4.bb
@@ -2,18 +2,18 @@ SUMMARY = "ixgbe kernel driver for Intel Magnolia Park 10GbE"
 DESCRIPTION = "The ixgbe driver supports 82598- and 82599-based \
 PCI Express* 10 Gigabit Network Connections."
 
-HOMEPAGE = "https://sourceforge.net/projects/e1000/"
+HOMEPAGE = "https://github.com/intel/ethernet-linux-ixgbe"
 SECTION = "kernel/network"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
 
-SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \
+SRC_URI = "https://github.com/intel/ethernet-linux-ixgbe/releases/download/v${PV}/${BP}.tar.gz \
            "
 
-SRC_URI[sha256sum] = "da7e7b62ffb85a820d7541623fbef5c4abef8d1df7ac0af3f1acc3b3d76c9822"
+SRC_URI[sha256sum] = "1bb6a63bf2502bfd205ba55e48ef6486754b1823ed330cb103ac1a590544abe6"
 
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/"
-UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/"
+UPSTREAM_CHECK_URI = "https://github.com/intel/ethernet-linux-ixgbe/releases"
+UPSTREAM_CHECK_REGEX = "ixgbe-(?P<pver>\d+(\.\d+)+)\.tar\.gz"
 
 CVE_PRODUCT = "linux:linux_kernel_ixgbe"
 
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb b/recipes-kernel/intel-ethernet/ixgbevf_5.2.2.bb
index 8bb0923c..10b29676 100644
--- a/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb
+++ b/recipes-kernel/intel-ethernet/ixgbevf_5.2.2.bb
@@ -5,18 +5,18 @@ that can only be activated on kernels that support SR-IOV. \
 SR-IOV requires the correct platform and OS support. \
 The guest OS loading this driver must support MSI-X interrupts."
 
-HOMEPAGE = "https://sourceforge.net/projects/e1000/"
+HOMEPAGE = "https://github.com/intel/ethernet-linux-ixgbevf"
 SECTION = "kernel/network"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
 
-SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \
+SRC_URI = "https://github.com/intel/ethernet-linux-ixgbevf/releases/download/v${PV}/${BP}.tar.gz \
            "
 
-SRC_URI[sha256sum] = "73c6a27be324a48b069dbda0d1d07212a2214c71f54df57bca7177fc92b04881"
+SRC_URI[sha256sum] = "8e0950ccfc19515f4fcb0dd347f776ed49aa6781ee3a177511d0fb7ac4d25e9a"
 
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"
-UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/"
+UPSTREAM_CHECK_URI = "https://github.com/intel/ethernet-linux-ixgbevf/releases"
+UPSTREAM_CHECK_REGEX = "ixgbevf-(?P<pver>\d+(\.\d+)+)\.tar\.gz"
 
 CVE_PRODUCT = "linux:linux_kernel_ixgbe"
 
diff --git a/recipes-kernel/linux/linux-intel-rt_6.12.bb b/recipes-kernel/linux/linux-intel-rt_6.18.bb
index e0f6f1f5..8dd4f027 100644
--- a/recipes-kernel/linux/linux-intel-rt_6.12.bb
+++ b/recipes-kernel/linux/linux-intel-rt_6.18.bb
@@ -12,8 +12,8 @@ python () {
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
 }
 
-KBRANCH = "6.12/linux"
-KMETA_BRANCH = "yocto-6.12"
+KBRANCH = "6.18/linux"
+KMETA_BRANCH = "yocto-6.18"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
@@ -21,13 +21,13 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
 
 LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
 
-LINUX_VERSION ?= "6.12.61"
-SRCREV_machine ?= "7190df9cb5fc10c673e960b7144d470fcd373627"
-SRCREV_meta ?= "46ae7e7d4ce1ee55091957bff63e0f54a761a93d"
+LINUX_VERSION ?= "6.18.15"
+SRCREV_machine ?= "16b46595039e12fe48cef4b96a78e3e8061508e5"
+SRCREV_meta ?= "bc293057a14f94dd50838a399bd8758a6766b877"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
 
-UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.12.(\d+)-linux-(\d+)T(\d+)Z)$"
+UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.18.(\d+)-linux-(\d+)T(\d+)Z)$"
diff --git a/recipes-kernel/linux/linux-intel_6.12.bb b/recipes-kernel/linux/linux-intel_6.18.bb
index aa8817f0..de20eb51 100644
--- a/recipes-kernel/linux/linux-intel_6.12.bb
+++ b/recipes-kernel/linux/linux-intel_6.18.bb
@@ -2,8 +2,8 @@ require linux-intel.inc
 
 SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
                     "
-KBRANCH = "6.12/linux"
-KMETA_BRANCH = "yocto-6.12"
+KBRANCH = "6.18/linux"
+KMETA_BRANCH = "yocto-6.18"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
@@ -11,13 +11,13 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
 
 LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
 
-LINUX_VERSION ?= "6.12.61"
-SRCREV_machine ?= "7190df9cb5fc10c673e960b7144d470fcd373627"
-SRCREV_meta ?= "46ae7e7d4ce1ee55091957bff63e0f54a761a93d"
+LINUX_VERSION ?= "6.18.15"
+SRCREV_machine ?= "16b46595039e12fe48cef4b96a78e3e8061508e5"
+SRCREV_meta ?= "bc293057a14f94dd50838a399bd8758a6766b877"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \
                             features/security/security.scc \
                             features/intel-npu/intel-npu.scc"
 
-UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.12.(\d+)-linux-(\d+)T(\d+)Z)$"
+UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.18.(\d+)-linux-(\d+)T(\d+)Z)$"
diff --git a/recipes-kernel/perf/perf.bbappend b/recipes-kernel/perf/perf.bbappend
new file mode 100644
index 00000000..54ad4dd9
--- /dev/null
+++ b/recipes-kernel/perf/perf.bbappend
@@ -0,0 +1,17 @@
+# Fix const qualifier warnings in libbpf.c when building with -Werror
+# This is a workaround for older kernel versions (6.12.x) that don't have
+# the upstream fix yet. The issue is already fixed in kernel 6.13+.
+
+# remove at next version upgrade or when output changes
+PR = "r3"
+HASHEQUIV_HASH_VERSION .= ".3"
+
+do_configure:prepend () {
+    # Apply libbpf const qualifier fixes
+    if [ -e "${S}/tools/lib/bpf/libbpf.c" ]; then
+        # Fix kallsyms_cb function - change 'char *res' to 'const char *res'
+        sed -i 's/^\(\s*\)char \*res;/\1const char *res;/' "${S}/tools/lib/bpf/libbpf.c"
+        # Fix resolve_full_path function - change 'char *next_path' to 'const char *next_path'
+        sed -i 's/^\(\s*\)char \*next_path;/\1const char *next_path;/' "${S}/tools/lib/bpf/libbpf.c"
+    fi
+}