ci: infra revision update

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2024-06-25 14:44:27 +00:00 · 2024-06-25 14:44:27 +00:00 · aa467ec10f
parent c817d15b59
commit aa467ec10f
6 changed files with 74 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -871,9 +871,13 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
      set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /SafeSEH")
    endif()
  else()
+    string(FIND ${CMAKE_CXX_FLAGS} "-D_FORTIFY_SOURCE=3" __FORTIFY_SOURCE_3_SET)
+    if(${__FORTIFY_SOURCE_3_SET} LESS 0)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
+    endif()
+
    if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
    else()
      # gcc, g++ only
@ -882,7 +886,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
      else()
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
      endif()
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
      set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,noexecstack")
      set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,relro")
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@ -31,7 +31,7 @@ components:
    branch: master
    dest_dir: infra
    fetch_tags: true
-    revision: v6093
+    revision: v6096
    type: git
  internal:
    branch: master
--- a/scripts/packaging/build_deb.sh
+++ b/scripts/packaging/build_deb.sh
@ -15,6 +15,8 @@ BUILD_DIR="${REPO_DIR}/../build_neo"
 NEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS:-FALSE}
 NEO_SKIP_AUB_TESTS_RUN=${NEO_SKIP_AUB_TESTS_RUN:-TRUE}
 NEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION:-FALSE}
+NEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT:-TRUE}
+NEO_CURRENT_PLATFORMS_SUPPORT=${NEO_CURRENT_PLATFORMS_SUPPORT:-TRUE}
 NEO_BUILD_WITH_L0=${NEO_BUILD_WITH_L0:-TRUE}

 BRANCH_SUFFIX="$( cat ${REPO_DIR}/.branch )"
@ -102,6 +104,38 @@ if [ -z "${BRANCH_SUFFIX}" ]; then
    fi
 fi

+echo "NEO_CURRENT_PLATFORMS_SUPPORT: ${NEO_CURRENT_PLATFORMS_SUPPORT}"
+echo "NEO_LEGACY_PLATFORMS_SUPPORT: ${NEO_LEGACY_PLATFORMS_SUPPORT}"
+
+if [[ "${NEO_LEGACY_PLATFORMS_SUPPORT}" == "TRUE" ]] && [[ ! "${NEO_CURRENT_PLATFORMS_SUPPORT}" == "TRUE" ]]; then
+    echo "Building Legacy package"
+    export NEO_OCLOC_VERSION_MAJOR=24
+    export NEO_OCLOC_VERSION_MINOR=22
+    perl -pi -e "s/^Package: intel-opencl-icd$/Package: intel-opencl-icd-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/control"
+    mv -v "$BUILD_DIR/debian/intel-opencl-icd.install" "$BUILD_DIR/debian/intel-opencl-icd-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}.install" 
+
+    perl -pi -e "s/^Package: intel-ocloc$/Package: intel-ocloc-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/control"
+    mv -v "$BUILD_DIR/debian/intel-ocloc.install" "$BUILD_DIR/debian/intel-ocloc-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}.install" 
+    mv -v "$BUILD_DIR/debian/intel-ocloc.postinst" "$BUILD_DIR/debian/intel-ocloc-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}.postinst" 
+    mv -v "$BUILD_DIR/debian/intel-ocloc.prerm" "$BUILD_DIR/debian/intel-ocloc-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}.prerm" 
+    perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR} ${NEO_OCLOC_VERSION_MAJOR}${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/intel-ocloc-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}.postinst"
+    perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/intel-ocloc-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}.prerm"
+
+    perl -pi -e "s/^Package: libze-intel-gpu1$/Package: libze-intel-gpu1-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/control"
+    mv -v "$BUILD_DIR/debian/libze-intel-gpu1.install" "$BUILD_DIR/debian/libze-intel-gpu1-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}.install" 
+
+    perl -i -lne 'if (/^Package: intel-ocloc-dev$/ .. /^$/) { print if !$flag } else {$flag=1; print}' "$BUILD_DIR/debian/control"
+    perl -i -lne 'if (/^Package: libze-intel-gpu-dev$/ .. /^$/) { print if !$flag } else {$flag=1; print}' "$BUILD_DIR/debian/control"
+else
+    echo "Building Current/Full package"
+    export NEO_OCLOC_VERSION_MAJOR=${NEO_VERSION_MAJOR}
+    export NEO_OCLOC_VERSION_MINOR=${NEO_VERSION_MINOR}
+
+    perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR} ${NEO_OCLOC_VERSION_MAJOR}${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/intel-ocloc.postinst"
+    perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/intel-ocloc.prerm"
+fi
+
+
 #needs a top level CMAKE file
 cat << EOF | tee $BUILD_DIR/CMakeLists.txt
 cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR)
--- a/scripts/packaging/ubuntu/debian/intel-ocloc.postinst
+++ b/scripts/packaging/ubuntu/debian/intel-ocloc.postinst
@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+#
+# Copyright (C) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+update-alternatives --quiet \
+    --install /usr/bin/ocloc ocloc /usr/bin/ocloc 0
+
+exit 0
--- a/scripts/packaging/ubuntu/debian/intel-ocloc.prerm
+++ b/scripts/packaging/ubuntu/debian/intel-ocloc.prerm
@ -0,0 +1,14 @@
+#! /bin/sh -e
+
+#
+# Copyright (C) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if [ $1 != "upgrade" ]; then
+    update-alternatives --quiet --remove ocloc /usr/bin/ocloc
+fi
+
+exit 0
+
--- a/scripts/packaging/ubuntu/debian/rules
+++ b/scripts/packaging/ubuntu/debian/rules
@ -12,12 +12,20 @@ NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
 NEO_ENABLE_XE_EU_DEBUG_SUPPORT ?= FALSE
 NEO_FORCE_USE_AUB_STREAM ?= TRUE
 NEO_BUILD_WITH_L0 ?= TRUE
+NEO_LEGACY_PLATFORMS_SUPPORT ?= TRUE
+NEO_CURRENT_PLATFORMS_SUPPORT ?= TRUE
+NEO_OCLOC_VERSION_MAJOR ?= ${NEO_OCL_VERSION_MAJOR}
+NEO_OCLOC_VERSION_MINOR ?= ${NEO_OCL_VERSION_MINOR}

 override_dh_auto_configure:
 	dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
 		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
 		-DNEO_OCL_VERSION_MAJOR=${NEO_VERSION_MAJOR} \
 		-DNEO_OCL_VERSION_MINOR=${NEO_VERSION_MINOR} \
+		-DNEO_OCLOC_VERSION_MAJOR=${NEO_OCLOC_VERSION_MAJOR} \
+		-DNEO_OCLOC_VERSION_MINOR=${NEO_OCLOC_VERSION_MINOR} \
+		-DNEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT} \
+		-DNEO_CURRENT_PLATFORMS_SUPPORT=${NEO_CURRENT_PLATFORMS_SUPPORT} \
 		-DNEO_VERSION_BUILD=${NEO_VERSION_BUILD} \
 		-DNEO_VERSION_HOTFIX=${NEO_VERSION_HOTFIX} \
 		-DNEO_SKIP_AUB_TESTS_RUN=${NEO_SKIP_AUB_TESTS_RUN} \