build: handle NEO_I915_PRELIM_HEADERS_DIR in packaging scripts

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

cmake/find_drm.cmake

@@ -4,53 +4,41 @@
 # SPDX-License-Identifier: MIT
 #
 
-# temporary support for legacy flag
+if(NOT DEFINED NEO_DRM_HEADERS_DIR OR NEO_DRM_HEADERS_DIR STREQUAL "")
-if(NOT DEFINED I915_HEADERS_DIR OR I915_HEADERS_DIR STREQUAL "")
+  get_filename_component(NEO_DRM_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party/uapi/drm" ABSOLUTE)
-  if(NOT DEFINED NEO_DRM_HEADERS_DIR OR NEO_DRM_HEADERS_DIR STREQUAL "")
-    get_filename_component(NEO_DRM_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party/uapi/drm" ABSOLUTE)
-  endif()
-
-  message(STATUS "drm includes dir: ${NEO_DRM_HEADERS_DIR}")
-
-  if(NOT DEFINED NEO_I915_HEADERS_DIR OR NEO_I915_HEADERS_DIR STREQUAL "")
-    get_filename_component(NEO_I915_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party/uapi/i915" ABSOLUTE)
-  endif()
-
-  message(STATUS "i915 includes dir: ${NEO_I915_HEADERS_DIR}")
-
-  if(NOT DEFINED NEO_I915_PRELIM_HEADERS_DIR OR NEO_I915_PRELIM_HEADERS_DIR STREQUAL "")
-    get_filename_component(NEO_I915_PRELIM_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}uapi/i915/prelim" ABSOLUTE)
-  endif()
-
-  message(STATUS "i915 prelim includes dir: ${NEO_I915_PRELIM_HEADERS_DIR}")
-
-  if(NOT DEFINED NEO_XE_HEADERS_DIR OR NEO_XE_HEADERS_DIR STREQUAL "")
-    get_filename_component(NEO_XE_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}uapi/xe" ABSOLUTE)
-  endif()
-
-  message(STATUS "xe includes dir: ${NEO_XE_HEADERS_DIR}")
-
-  if(NOT DEFINED NEO_IAF_HEADERS_DIR OR NEO_IAF_HEADERS_DIR STREQUAL "")
-    get_filename_component(NEO_IAF_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party/uapi/iaf" ABSOLUTE)
-  endif()
-
-  message(STATUS "iaf includes dir: ${NEO_IAF_HEADERS_DIR}")
-
-  set(NEO_LINUX_KMD_HEADERS_DIR
-      ${NEO_DRM_HEADERS_DIR}
-      ${NEO_I915_HEADERS_DIR}
-      ${NEO_I915_PRELIM_HEADERS_DIR}
-      ${NEO_XE_HEADERS_DIR}
-      ${NEO_IAF_HEADERS_DIR}
-  )
-
-else()
-  message(STATUS "i915 headers set with legacy way: ${I915_HEADERS_DIR}")
-  get_filename_component(NEO_IAF_HEADERS_DIR "${I915_HEADERS_DIR}/iaf" ABSOLUTE)
-  get_filename_component(I915_HEADERS_DIR "${I915_HEADERS_DIR}/drm" ABSOLUTE)
-  set(NEO_LINUX_KMD_HEADERS_DIR
-      ${I915_HEADERS_DIR}
-      ${NEO_IAF_HEADERS_DIR}
-  )
 endif()
 
+message(STATUS "drm includes dir: ${NEO_DRM_HEADERS_DIR}")
+
+if(NOT DEFINED NEO_I915_HEADERS_DIR OR NEO_I915_HEADERS_DIR STREQUAL "")
+  get_filename_component(NEO_I915_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party/uapi/i915" ABSOLUTE)
+endif()
+
+message(STATUS "i915 includes dir: ${NEO_I915_HEADERS_DIR}")
+
+if(NOT DEFINED NEO_I915_PRELIM_HEADERS_DIR OR NEO_I915_PRELIM_HEADERS_DIR STREQUAL "")
+  get_filename_component(NEO_I915_PRELIM_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}uapi/i915/prelim" ABSOLUTE)
+endif()
+
+message(STATUS "i915 prelim includes dir: ${NEO_I915_PRELIM_HEADERS_DIR}")
+
+if(NOT DEFINED NEO_XE_HEADERS_DIR OR NEO_XE_HEADERS_DIR STREQUAL "")
+  get_filename_component(NEO_XE_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}uapi/xe" ABSOLUTE)
+endif()
+
+message(STATUS "xe includes dir: ${NEO_XE_HEADERS_DIR}")
+
+if(NOT DEFINED NEO_IAF_HEADERS_DIR OR NEO_IAF_HEADERS_DIR STREQUAL "")
+  get_filename_component(NEO_IAF_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party/uapi/iaf" ABSOLUTE)
+endif()
+
+message(STATUS "iaf includes dir: ${NEO_IAF_HEADERS_DIR}")
+
+set(NEO_LINUX_KMD_HEADERS_DIR
+    ${NEO_DRM_HEADERS_DIR}
+    ${NEO_I915_HEADERS_DIR}
+    ${NEO_I915_PRELIM_HEADERS_DIR}
+    ${NEO_XE_HEADERS_DIR}
+    ${NEO_IAF_HEADERS_DIR}
+)
+

scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_rpm.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Copyright (C) 2021-2023 Intel Corporation
+# Copyright (C) 2021-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -61,9 +61,9 @@ if [ "${BUILD_SRPM}" == "1" ]; then
     cp $COPYRIGHT $BUILD_DIR/SOURCES/
     cp $SPEC_SRC $BUILD_DIR/SPECS/
 
-    if [ -d "$I915_HEADERS_DIR" ]; then
+    if [ -d "$NEO_I915_PRELIM_HEADERS_DIR" ]; then
-        tar -c -I 'xz -6 -T0' -f $BUILD_DIR/SOURCES/uapi.tar.xz -C $REPO_DIR --transform "s,${I915_HEADERS_DIR:1},uapi," $I915_HEADERS_DIR
+        tar -c -I 'xz -6 -T0' -f $BUILD_DIR/SOURCES/uapi.tar.xz -C $REPO_DIR --transform "s,${NEO_I915_PRELIM_HEADERS_DIR:1},uapi," $NEO_I915_PRELIM_HEADERS_DIR
-        perl -pi -e "s;^%global I915_HEADERS_DIR .*;%global I915_HEADERS_DIR %{_builddir}/uapi;" $SPEC
+        perl -pi -e "s;^%global NEO_I915_PRELIM_HEADERS_DIR .*;%global NEO_I915_PRELIM_HEADERS_DIR %{_builddir}/uapi/drm;" $SPEC
     fi
 
     PATCH_SPEC="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/patch_spec.sh"

scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec

@@ -4,7 +4,7 @@
 %global build_id xxx
 %global NEO_RELEASE_WITH_REGKEYS FALSE
 %global NEO_ENABLE_XE_EU_DEBUG_SUPPORT FALSE
-%global I915_HEADERS_DIR %{nil}
+%global NEO_I915_PRELIM_HEADERS_DIR %{nil}
 
 %define _source_payload w5T16.xzdio
 %define _binary_payload w5T16.xzdio
@@ -19,7 +19,7 @@ License: MIT
 URL: https://github.com/intel/compute-runtime
 Source0: %{url}/archive/%{version}/compute-runtime.tar.xz
 Source1: copyright
-%if "%{I915_HEADERS_DIR}" != ""
+%if "%{NEO_I915_PRELIM_HEADERS_DIR}" != ""
 Source2: uapi.tar.xz
 %endif
 
@@ -50,7 +50,7 @@ Intel(R) Graphics Compute Runtime for oneAPI Level Zero - development headers
 %define debug_package %{nil}
 
 %prep
-%if "%{I915_HEADERS_DIR}" == ""
+%if "%{NEO_I915_PRELIM_HEADERS_DIR}" == ""
 %autosetup -p1 -n compute-runtime
 %else
 %autosetup -p1 -n compute-runtime -b 2
@@ -71,7 +71,7 @@ cd build
    -DL0_INSTALL_UDEV_RULES=1 \
    -DUDEV_RULES_DIR=/etc/udev/rules.d/ \
    -DCMAKE_VERBOSE_MAKEFILE=FALSE \
-   -DI915_HEADERS_DIR=$(realpath %{I915_HEADERS_DIR})
+   -DNEO_I915_PRELIM_HEADERS_DIR=$(realpath %{NEO_I915_PRELIM_HEADERS_DIR})
 %ninja_build
 
 %install

scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec

@@ -6,7 +6,7 @@
 %global build_id xxx
 %global NEO_RELEASE_WITH_REGKEYS FALSE
 %global NEO_ENABLE_XE_EU_DEBUG_SUPPORT FALSE
-%global I915_HEADERS_DIR %{nil}
+%global NEO_I915_PRELIM_HEADERS_DIR %{nil}
 
 %define gmmlib_sover 12
 %define igc_sover 1
@@ -28,7 +28,7 @@ License: MIT
 URL: https://github.com/intel/compute-runtime
 Source0: %{url}/archive/%{version}/compute-runtime.tar.xz
 Source1: copyright
-%if "%{I915_HEADERS_DIR}" != ""
+%if "%{NEO_I915_PRELIM_HEADERS_DIR}" != ""
 Source2: uapi.tar.xz
 %endif
 
@@ -62,7 +62,7 @@ Intel(R) Graphics Compute Runtime for oneAPI Level Zero - development headers
 %debug_package %{nil}
 
 %prep
-%if "%{I915_HEADERS_DIR}" == ""
+%if "%{NEO_I915_PRELIM_HEADERS_DIR}" == ""
 %autosetup -p1 -n compute-runtime
 %else
 %autosetup -p1 -n compute-runtime -b 2
@@ -81,7 +81,7 @@ Intel(R) Graphics Compute Runtime for oneAPI Level Zero - development headers
    -DL0_INSTALL_UDEV_RULES=1 \
    -DUDEV_RULES_DIR=/etc/udev/rules.d/ \
    -DCMAKE_VERBOSE_MAKEFILE=FALSE \
-   -DI915_HEADERS_DIR=$(realpath %{I915_HEADERS_DIR})
+   -DNEO_I915_PRELIM_HEADERS_DIR=$(realpath %{NEO_I915_PRELIM_HEADERS_DIR})
 %ninja_build
 
 %install

scripts/packaging/opencl/build_opencl_rpm.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Copyright (C) 2021-2023 Intel Corporation
+# Copyright (C) 2021-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -61,9 +61,9 @@ if [ "${BUILD_SRPM}" == "1" ]; then
     cp $COPYRIGHT $BUILD_DIR/SOURCES/
     cp $SPEC_SRC $BUILD_DIR/SPECS/
 
-    if [ -d "$I915_HEADERS_DIR" ]; then
+    if [ -d "$NEO_I915_PRELIM_HEADERS_DIR" ]; then
-        tar -c -I 'xz -6 -T0' -f $BUILD_DIR/SOURCES/uapi.tar.xz -C $REPO_DIR --transform "s,${I915_HEADERS_DIR:1},uapi," $I915_HEADERS_DIR
+        tar -c -I 'xz -6 -T0' -f $BUILD_DIR/SOURCES/uapi.tar.xz -C $REPO_DIR --transform "s,${NEO_I915_PRELIM_HEADERS_DIR:1},uapi," $NEO_I915_PRELIM_HEADERS_DIR
-        perl -pi -e "s;^%global I915_HEADERS_DIR .*;%global I915_HEADERS_DIR %{_builddir}/uapi;" $SPEC
+        perl -pi -e "s;^%global NEO_I915_PRELIM_HEADERS_DIR .*;%global NEO_I915_PRELIM_HEADERS_DIR %{_builddir}/uapi/drm;" $SPEC
     fi
 
     PATCH_SPEC="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/patch_spec.sh"

scripts/packaging/opencl/rhel_8/SPECS/opencl.spec

@@ -6,7 +6,7 @@
 %global NEO_OCL_VERSION_BUILD xxx
 %global NEO_RELEASE_WITH_REGKEYS FALSE
 %global NEO_ENABLE_XE_EU_DEBUG_SUPPORT FALSE
-%global I915_HEADERS_DIR %{nil}
+%global NEO_I915_PRELIM_HEADERS_DIR %{nil}
 
 %define _source_payload w5T16.xzdio
 %define _binary_payload w5T16.xzdio
@@ -22,7 +22,7 @@ License: MIT
 URL: https://github.com/intel/compute-runtime
 Source0: %{url}/archive/%{version}/compute-runtime.tar.xz
 Source1: copyright
-%if "%{I915_HEADERS_DIR}" != ""
+%if "%{NEO_I915_PRELIM_HEADERS_DIR}" != ""
 Source2: uapi.tar.xz
 %endif
 
@@ -45,7 +45,7 @@ Intel(R) Graphics Compute Runtime for OpenCL(TM) is a open source project to con
 %define debug_package %{nil}
 
 %prep
-%if "%{I915_HEADERS_DIR}" == ""
+%if "%{NEO_I915_PRELIM_HEADERS_DIR}" == ""
 %autosetup -p1 -n compute-runtime
 %else
 %autosetup -p1 -n compute-runtime -b 2
@@ -66,7 +66,7 @@ cd build
    -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=%{NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \
    -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
    -DCMAKE_VERBOSE_MAKEFILE=FALSE \
-   -DI915_HEADERS_DIR=$(realpath %{I915_HEADERS_DIR})
+   -DNEO_I915_PRELIM_HEADERS_DIR=$(realpath %{NEO_I915_PRELIM_HEADERS_DIR})
 %ninja_build
 
 %install

scripts/packaging/opencl/sles_15/SPECS/opencl.spec

@@ -8,7 +8,7 @@
 %global NEO_OCL_VERSION_BUILD xxx
 %global NEO_RELEASE_WITH_REGKEYS FALSE
 %global NEO_ENABLE_XE_EU_DEBUG_SUPPORT FALSE
-%global I915_HEADERS_DIR %{nil}
+%global NEO_I915_PRELIM_HEADERS_DIR %{nil}
 
 %define gmmlib_sover 12
 %define igc_sover 1
@@ -30,7 +30,7 @@ Group:          System Environment/Libraries
 Url:            https://github.com/intel/compute-runtime
 Source0:        %{url}/archive/%{version}/compute-runtime.tar.xz
 Source1:        copyright
-%if "%{I915_HEADERS_DIR}" != ""
+%if "%{NEO_I915_PRELIM_HEADERS_DIR}" != ""
 Source2:        uapi.tar.xz
 %endif
 
@@ -55,7 +55,7 @@ Summary:        ocloc package for opencl
 %debug_package %{nil}
 
 %prep
-%if "%{I915_HEADERS_DIR}" == ""
+%if "%{NEO_I915_PRELIM_HEADERS_DIR}" == ""
 %autosetup -p1 -n compute-runtime
 %else
 %autosetup -p1 -n compute-runtime -b 2
@@ -74,7 +74,7 @@ Summary:        ocloc package for opencl
    -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=%{NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \
    -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
    -DCMAKE_VERBOSE_MAKEFILE=FALSE \
-   -DI915_HEADERS_DIR=$(realpath %{I915_HEADERS_DIR})
+   -DNEO_I915_PRELIM_HEADERS_DIR=$(realpath %{NEO_I915_PRELIM_HEADERS_DIR})
 %ninja_build
 
 %install