Skip to content

Commit 5ba6f4a

Browse files
update compilation flags
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
1 parent 9016772 commit 5ba6f4a

File tree

9 files changed

+23
-4
lines changed

9 files changed

+23
-4
lines changed

manifests/manifest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ components:
2020
infra:
2121
branch: master
2222
dest_dir: infra
23-
revision: 8a1473f7cbb98e36738ce362d20a59fd8b5dd9ad
23+
revision: 504606da822eda6cb0cb8b94dde3315016717a08
2424
type: git
2525
internal:
2626
branch: master

scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_rpm.sh

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ if [ "${BUILD_SRPM}" == "1" ]; then
5252
VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}.${API_VERSION}"
5353
RELEASE="${API_VERSION_SRC}${API_RPM_MODEL_LINK}"
5454

55+
RELEASE_WITH_REGKEYS="${RELEASE_WITH_REGKEYS:-FALSE}"
56+
5557
#setup rpm build tree
5658
rm -rf $BUILD_DIR
5759
mkdir -p $BUILD_DIR/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
@@ -68,6 +70,7 @@ if [ "${BUILD_SRPM}" == "1" ]; then
6870
# Update spec file with new version
6971
perl -pi -e "s/^%global ver .*/%global ver ${VERSION}/" $SPEC
7072
perl -pi -e "s/^%global rel .*/%global rel ${RELEASE}/" $SPEC
73+
perl -pi -e "s/^%global NEO_RELEASE_WITH_REGKEYS .*/%global NEO_RELEASE_WITH_REGKEYS ${RELEASE_WITH_REGKEYS}/" $SPEC
7174
perl -pi -e "s/^%global build_id .*/%global build_id ${NEO_L0_VERSION_PATCH}/" $SPEC
7275

7376
rpmbuild --define "_topdir $BUILD_DIR" -bs $SPEC --define 'build_type ${CMAKE_BUILD_TYPE}' "${build_args[@]}"

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

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
%global ver xxx
33
%global rel xxx
44
%global build_id xxx
5+
%global NEO_RELEASE_WITH_REGKEYS FALSE
56

67
%define _source_payload w5T16.xzdio
78
%define _binary_payload w5T16.xzdio
@@ -45,6 +46,8 @@ cd build
4546
-DCMAKE_BUILD_TYPE=Release \
4647
-DNEO_BUILD_WITH_OCL=FALSE \
4748
-DNEO_SKIP_UNIT_TESTS=1 \
49+
-DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
50+
-DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
4851
-DCMAKE_INSTALL_PREFIX=/usr \
4952
-DL0_INSTALL_UDEV_RULES=1 \
5053
-DUDEV_RULES_DIR=/etc/udev/rules.d/

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
%global ver xxx
55
%global rel xxx
66
%global build_id xxx
7+
%global NEO_RELEASE_WITH_REGKEYS FALSE
78

89
%define gmmlib_sover 12
910
%define igc_sover 1
@@ -56,7 +57,8 @@ exposing hardware capabilities to applications.
5657
-DCMAKE_INSTALL_PREFIX=/usr \
5758
-DNEO_BUILD_WITH_OCL=FALSE \
5859
-DNEO_SKIP_UNIT_TESTS=TRUE \
59-
-DRELEASE_WITH_REGKEYS=TRUE \
60+
-DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
61+
-DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
6062
-DL0_INSTALL_UDEV_RULES=1 \
6163
-DUDEV_RULES_DIR=/etc/udev/rules.d/ \
6264
-Wno-dev

scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ NEO_DISABLE_BUILTINS_COMPILATION ?= FALSE
88
RELEASE_WITH_REGKEYS ?= FALSE
99
IGDRCL_FORCE_USE_LIBVA ?= FALSE
1010
NEO_SKIP_UNIT_TESTS ?= FALSE
11+
NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
1112

1213
override_dh_auto_configure:
1314
dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
1415
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
1516
-DNEO_VERSION_BUILD=$(ver) \
1617
-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
18+
-DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \
1719
-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
1820
-DNEO_BUILD_WITH_OCL=FALSE \
1921
-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \

scripts/packaging/opencl/build_opencl_rpm.sh

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ if [ "${BUILD_SRPM}" == "1" ]; then
5252
VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}.${API_VERSION}"
5353
RELEASE="${API_VERSION_SRC}${API_RPM_MODEL_LINK}"
5454

55+
RELEASE_WITH_REGKEYS="${RELEASE_WITH_REGKEYS:-FALSE}"
56+
5557
#setup rpm build tree
5658
rm -rf $BUILD_DIR
5759
mkdir -p $BUILD_DIR/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
@@ -72,6 +74,7 @@ if [ "${BUILD_SRPM}" == "1" ]; then
7274
perl -pi -e "s/^%global NEO_OCL_VERSION_MAJOR .*/%global NEO_OCL_VERSION_MAJOR ${NEO_OCL_VERSION_MAJOR}/" $BUILD_DIR/SPECS/opencl.spec
7375
perl -pi -e "s/^%global NEO_OCL_VERSION_MINOR .*/%global NEO_OCL_VERSION_MINOR ${NEO_OCL_VERSION_MINOR}/" $BUILD_DIR/SPECS/opencl.spec
7476
perl -pi -e "s/^%global NEO_OCL_VERSION_BUILD .*/%global NEO_OCL_VERSION_BUILD ${NEO_OCL_VERSION_BUILD}/" $BUILD_DIR/SPECS/opencl.spec
77+
perl -pi -e "s/^%global NEO_RELEASE_WITH_REGKEYS .*/%global NEO_RELEASE_WITH_REGKEYS ${RELEASE_WITH_REGKEYS}/" $BUILD_DIR/SPECS/opencl.spec
7578
perl -pi -e "s/^%global rel .*/%global rel ${RELEASE}/" $SPEC
7679
perl -pi -e "s/^%global ver .*/%global ver ${VERSION}/" $SPEC
7780

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
%global NEO_OCL_VERSION_MAJOR xxx
55
%global NEO_OCL_VERSION_MINOR xxx
66
%global NEO_OCL_VERSION_BUILD xxx
7+
%global NEO_RELEASE_WITH_REGKEYS FALSE
78

89
%define _source_payload w5T16.xzdio
910
%define _binary_payload w5T16.xzdio
@@ -51,8 +52,9 @@ cd build
5152
-DCMAKE_BUILD_TYPE=Release \
5253
-DBUILD_WITH_L0=FALSE \
5354
-DNEO_SKIP_UNIT_TESTS=TRUE \
55+
-DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
5456
-DCMAKE_INSTALL_PREFIX=/usr \
55-
-DRELEASE_WITH_REGKEYS=1
57+
-DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS}
5658
%make_build
5759

5860
%install

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
%global NEO_OCL_VERSION_MAJOR xxx
77
%global NEO_OCL_VERSION_MINOR xxx
88
%global NEO_OCL_VERSION_BUILD xxx
9+
%global NEO_RELEASE_WITH_REGKEYS FALSE
910

1011
%define gmmlib_sover 12
1112
%define igc_sover 1
@@ -60,7 +61,8 @@ Summary: ocloc package for opencl
6061
-DBUILD_WITH_L0=FALSE \
6162
-DCMAKE_INSTALL_PREFIX=/usr \
6263
-DNEO_SKIP_UNIT_TESTS=TRUE \
63-
-DRELEASE_WITH_REGKEYS=1 \
64+
-DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
65+
-DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
6466
-Wno-dev
6567
%make_build
6668

scripts/packaging/opencl/ubuntu_20.04/debian/rules

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ NEO_DISABLE_BUILTINS_COMPILATION ?= FALSE
77
RELEASE_WITH_REGKEYS ?= FALSE
88
IGDRCL_FORCE_USE_LIBVA ?= FALSE
99
NEO_SKIP_UNIT_TESTS ?= FALSE
10+
NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
1011

1112
override_dh_auto_configure:
1213
dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
@@ -16,6 +17,7 @@ override_dh_auto_configure:
1617
-DNEO_VERSION_BUILD=${NEO_OCL_VERSION_BUILD} \
1718
-DDO_NOT_RUN_AUB_TESTS=${DO_NOT_RUN_AUB_TESTS} \
1819
-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
20+
-DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \
1921
-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
2022
-DBUILD_WITH_L0=FALSE \
2123
-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \

0 commit comments

Comments
 (0)