9 files changed, 38 insertions, 21 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index a9de1e2a..32736255 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -19,7 +19,7 @@ LAYERRECOMMENDS_intel = "dpdk"
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_intel = "5"
-LAYERSERIES_COMPAT_intel = "whinlatter"
+LAYERSERIES_COMPAT_intel = "wrynose"
 
 BBFILES_DYNAMIC += " \
     clang-revival-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index c98aa78a..0942e777 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -7,10 +7,10 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel"
 PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel"
 
-PREFERRED_VERSION_linux-intel ?= "6.12%"
-PREFERRED_VERSION_linux-intel-rt ?= "6.12%"
-PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.12%"
-PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "6.12%"
+PREFERRED_VERSION_linux-intel ?= "6.18%"
+PREFERRED_VERSION_linux-intel-rt ?= "6.18%"
+PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.18%"
+PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "6.18%"
 
 # Need to point to latest version of libva needed for media components
 PREFERRED_PROVIDER_libva = "libva-intel"
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 5b134dc3..52383170 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-plugins-bad"
 
 XSERVER ?= "${XSERVER_X86_BASE} \
             ${XSERVER_X86_EXT} \
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 947f72d4..bd1f31fa 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver vpl-gpu-rt', d)} gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver vpl-gpu-rt', d)} gstreamer1.0-plugins-bad"
 
 # Enable optional dpdk:
 COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
index bfaf08dd..74fb9797 100644
--- a/conf/machine/intel-skylake-64.conf
+++ b/conf/machine/intel-skylake-64.conf
@@ -12,7 +12,7 @@ MACHINE_FEATURES += "efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "intel-media-driver vpl-gpu-rt gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-media-driver vpl-gpu-rt gstreamer1.0-plugins-bad"
 
 COMPATIBLE_MACHINE:pn-dpdk = "intel-skylake-64"
 COMPATIBLE_MACHINE:pn-dpdk-module = "intel-skylake-64"
diff --git a/lib/oeqa/runtime/cases/intel_vaapi_driver.py b/lib/oeqa/runtime/cases/intel_vaapi_driver.py
index 31e11a81..a1182088 100644
--- a/lib/oeqa/runtime/cases/intel_vaapi_driver.py
+++ b/lib/oeqa/runtime/cases/intel_vaapi_driver.py
@@ -10,7 +10,7 @@ class VaapiDriverTest(OERuntimeTestCase):
 
     @OEHasPackage(['gstreamer1.0-plugins-base'])
     @OEHasPackage(['gstreamer1.0-plugins-good'])
-    @OEHasPackage(['gstreamer1.0-vaapi'])
+    @OEHasPackage(['gstreamer1.0-plugins-bad'])
     @OEHasPackage(['intel-vaapi-driver'])
     def test_gstreamer_can_encode_with_intel_vaapi_driver(self):
         (status, output) = self.target.run('gst-inspect-1.0 vaapi')
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
+}