From 36e44b684cc74e5d3112f7e430e8ef563d69ee92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= Date: Tue, 4 Nov 2025 13:27:30 +0100 Subject: [PATCH] Support whinlatter only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Yocto 5.3 merged most of meta-clang. Move recipes from dynamic-layers/clang-layer to the toplevel. Signed-off-by: Zoltán Böszörményi --- conf/layer.conf | 4 +--- .../recipes-core => recipes-core}/dnn/files/run-ptest | 0 .../recipes-core => recipes-core}/dnn/onednn_3.5.3.bb | 0 .../0002-Build-not-able-to-locate-cpp_generation_tool.patch | 0 .../intel-compute-runtime/0003-external-ocloc.patch | 0 .../compute-runtime/intel-compute-runtime_25.13.33276.16.bb | 0 .../0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch | 0 .../files/0001-Build-not-able-to-locate-BiFManager-bin.patch | 0 ...external-SPIRV-Tools-change-path-to-tools-and-header.patch | 0 .../igc/files/0001-fix-tblgen.patch | 0 .../files/0003-Improve-Reproducibility-for-src-package.patch | 0 .../igc/intel-graphics-compiler_2.10.10.bb | 0 ...cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch | 0 ...2-Request-native-clang-only-when-cross-compiling-464.patch | 0 .../opencl-clang/opencl-clang.inc | 0 .../opencl-clang/opencl-clang_15.0.0.bb | 0 16 files changed, 1 insertion(+), 3 deletions(-) rename {dynamic-layers/clang-layer/recipes-core => recipes-core}/dnn/files/run-ptest (100%) rename {dynamic-layers/clang-layer/recipes-core => recipes-core}/dnn/onednn_3.5.3.bb (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/compute-runtime/intel-compute-runtime_25.13.33276.16.bb (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/igc/files/0001-fix-tblgen.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/igc/files/0003-Improve-Reproducibility-for-src-package.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/igc/intel-graphics-compiler_2.10.10.bb (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/opencl-clang/opencl-clang.inc (100%) rename {dynamic-layers/clang-layer/recipes-opencl => recipes-opencl}/opencl-clang/opencl-clang_15.0.0.bb (100%) diff --git a/conf/layer.conf b/conf/layer.conf index 9365f3a2..be9503dc 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -19,11 +19,9 @@ 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 = "scarthgap whinlatter" +LAYERSERIES_COMPAT_intel = "whinlatter" BBFILES_DYNAMIC += " \ - clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ - clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bbappend \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \ diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/files/run-ptest b/recipes-core/dnn/files/run-ptest similarity index 100% rename from dynamic-layers/clang-layer/recipes-core/dnn/files/run-ptest rename to recipes-core/dnn/files/run-ptest diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb b/recipes-core/dnn/onednn_3.5.3.bb similarity index 100% rename from dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb rename to recipes-core/dnn/onednn_3.5.3.bb diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch b/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch rename to recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch b/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch rename to recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb b/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb rename to recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch b/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch rename to recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch b/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch rename to recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch b/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch rename to recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch b/recipes-opencl/igc/files/0001-fix-tblgen.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch rename to recipes-opencl/igc/files/0001-fix-tblgen.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch b/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch rename to recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb b/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb rename to recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch b/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch rename to recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch b/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch rename to recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/recipes-opencl/opencl-clang/opencl-clang.inc similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc rename to recipes-opencl/opencl-clang/opencl-clang.inc diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb b/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb similarity index 100% rename from dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb rename to recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb