4 files changed, 8 insertions, 5 deletions

diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
index 9d0df70dd..70d261900 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
@@ -9,6 +9,9 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
+
+DEPENDS += "vulkan-headers"
+
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https"
 SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229"
 
@@ -16,8 +19,6 @@ REQUIRED_DISTRO_FEATURES = "vulkan"
 
 inherit cmake features_check pkgconfig
 
-DEPENDS += "vulkan-headers"
-
 EXTRA_OECMAKE = "\
     -DBUILD_TESTS=OFF \
     -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
diff --git a/recipes-graphics/vulkan/vulkan-loader-older-1-3-296/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader-older-1-3-296/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
index da738aabe..6ef586ea9 100644
--- a/recipes-graphics/vulkan/vulkan-loader-older-1-3-296/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
+++ b/recipes-graphics/vulkan/vulkan-loader-older-1-3-296/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
@@ -3,7 +3,7 @@ From: Yuan Tian <yuan.tian@nxp.com>
 Date: Sat, 27 Apr 2024 06:06:54 +0800
 Subject: [PATCH] LF-11869 change mali wsi layer activating order
 
-Upstream-Status: Inappropriate [i.MX specific]
+Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
 ---
diff --git a/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
index f54919cd9..01f1c947a 100644
--- a/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
+++ b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
@@ -3,7 +3,7 @@ From: Yuan Tian <yuan.tian@nxp.com>
 Date: Sat, 27 Apr 2024 06:06:54 +0800
 Subject: [PATCH] LF-11869 change mali wsi layer activating order
 
-Upstream-Status: Inappropriate [i.MX specific]
+Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
 ---
diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
index 1e506c01b..185caa81c 100644
--- a/recipes-graphics/vulkan/vulkan-loader_%.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
@@ -11,4 +11,6 @@ PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
 # libvulkan.so is loaded dynamically, so put it in the main package
 SOLIBS:imx-nxp-bsp = ".so*"
 FILES_SOLIBSDEV:imx-nxp-bsp = ""
-INSANE_SKIP:${PN}:imx-nxp-bsp += "dev-so"
+# Unversioned .so lives in the main package by design (loaded dynamically).
+# nooelint: oelint.vars.insaneskip
+INSANE_SKIP:${PN}:append:imx-nxp-bsp = " dev-so"