Skip to content

Commit 878d646

Browse files
ArturHarasimiukCompute-Runtime-Automation
ArturHarasimiuk
authored and
Compute-Runtime-Automation
committed
packaging refactor
- update versioning for RPM - make .spec files more verbose Print information about CCACHE_BASEDIR from environment. Signed-off-by: Artur Harasimiuk <[email protected]>
1 parent ed1f4a1 commit 878d646

File tree

13 files changed

+49
-38
lines changed

13 files changed

+49
-38
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,10 @@ if(CCACHE_EXE_FOUND AND CCACHE_ALLOWED)
505505
if(IS_DIRECTORY ${__tmp_dir})
506506
get_filename_component(NEO_CCACHE_BASEDIR ".." ABSOLUTE)
507507
list(APPEND NEO_RULE_LAUNCH_LIST "CCACHE_BASEDIR=${NEO_CCACHE_BASEDIR}")
508+
message(STATUS "using ccache base dir: ${NEO_CCACHE_BASEDIR}")
508509
endif()
510+
elseif(DEFINED ENV{CCACHE_BASEDIR})
511+
message(STATUS "Using ccache base dir: $ENV{CCACHE_BASEDIR}")
509512
endif()
510513
list(APPEND NEO_RULE_LAUNCH_LIST "ccache")
511514
string(REPLACE ";" " " NEO_RULE_LAUNCH_STR "${NEO_RULE_LAUNCH_LIST}")

‎manifests/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ components:
2727
branch: master
2828
dest_dir: infra
2929
fetch_tags: true
30-
revision: v4205
30+
revision: v4207
3131
type: git
3232
internal:
3333
branch: master

‎scripts/packaging/functions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ get_api_version() {
1515
API_RPM_MODEL_LINK="1"
1616
if [ "${COMPONENT_MODEL}" != "ci" ]; then
1717
API_DEB_MODEL_LINK="~${COMPONENT_MODEL:-unknown}${BUILD_ID:-0}"
18-
API_RPM_MODEL_LINK=".${COMPONENT_MODEL:-unknown}${BUILD_ID:-0}"
18+
API_RPM_MODEL_LINK="${COMPONENT_MODEL:-unknown}${BUILD_ID:-0}"
1919
fi
2020
}

‎scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ get_l0_gpu_driver_version # NEO_L0_VERSION_MAJOR.NEO_L0_VERSION_MINOR.NEO_L0_VER
3737
if [ -z "${BRANCH_SUFFIX}" ]; then
3838
VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}${API_DEB_MODEL_LINK}"
3939
else
40-
VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}.${API_VERSION}-${NEO_L0_VERSION_HOTFIX}${API_VERSION_SRC}${API_DEB_MODEL_LINK}"
40+
VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}${API_VERSION}-${NEO_L0_VERSION_HOTFIX}${API_VERSION_SRC}${API_DEB_MODEL_LINK}"
4141
fi
4242

4343
PKG_VERSION=${VERSION}

‎scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_rpm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if [ "${BUILD_SRPM}" == "1" ]; then
4949
get_api_version # API_VERSION-API_VERSION_SRC and API_RPM_MODEL_LINK
5050
get_l0_gpu_driver_version # NEO_L0_VERSION_MAJOR.NEO_L0_VERSION_MINOR.NEO_L0_VERSION_PATCH
5151

52-
VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}.${API_VERSION}"
52+
VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}${API_VERSION}"
5353
RELEASE="${NEO_L0_VERSION_HOTFIX}${API_VERSION_SRC}${API_RPM_MODEL_LINK}"
5454

5555
RELEASE_WITH_REGKEYS="${RELEASE_WITH_REGKEYS:-FALSE}"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ cd build
5858
cd build
5959
%ninja_install
6060

61-
#Remove OpenCL files before installing
62-
rm -rf %{buildroot}%{_libdir}/intel-opencl/
63-
rm -rf %{buildroot}%{_sysconfdir}/OpenCL/
64-
rm -rf %{buildroot}%{_bindir}/ocloc
65-
rm -rf %{buildroot}%{_libdir}/libocloc.so
66-
rm -rf %{buildroot}%{_includedir}/ocloc_api.h
61+
#Remove OpenCL files
62+
rm -rvf %{buildroot}%{_libdir}/intel-opencl/
63+
rm -rvf %{buildroot}%{_sysconfdir}/OpenCL/
64+
rm -rvf %{buildroot}%{_bindir}/ocloc
65+
rm -rvf %{buildroot}%{_libdir}/libocloc.so
66+
rm -rvf %{buildroot}%{_includedir}/ocloc_api.h
6767
#Remove debug files
68-
rm -f %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
69-
rm -f %{buildroot}/%{_libdir}/libocloc.so.debug
70-
rm -rf %{buildroot}/usr/lib/debug/
68+
rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
69+
rm -vf %{buildroot}/%{_libdir}/libocloc.so.debug
70+
rm -rvf %{buildroot}/usr/lib/debug/
7171
#insert license into package
7272
mkdir -p %{buildroot}/usr/share/doc/intel-level-zero-gpu/
73-
cp -pR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu/.
73+
cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu/.
7474

7575
%files
7676
%defattr(-,root,root)

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ libraries. Level Zero offers fine-grain control over accelerators capabilities,
4545
delivering a simplified and low-latency interface to hardware, and efficiently
4646
exposing hardware capabilities to applications.
4747

48-
%debug_package
48+
%debug_package %{nil}
4949

5050
%prep
5151
%autosetup -p1 -n compute-runtime-%{version}
@@ -68,19 +68,19 @@ exposing hardware capabilities to applications.
6868
cd build
6969
%ninja_install
7070

71-
#Remove OpenCL files before installing
72-
rm -rf %{buildroot}%{_libdir}/intel-opencl/
73-
rm -rf %{buildroot}%{_sysconfdir}/OpenCL/
74-
rm -rf %{buildroot}%{_bindir}/ocloc
75-
rm -rf %{buildroot}%{_libdir}/libocloc.so
76-
rm -rf %{buildroot}%{_includedir}/ocloc_api.h
71+
#Remove OpenCL files
72+
rm -rvf %{buildroot}%{_libdir}/intel-opencl/
73+
rm -rvf %{buildroot}%{_sysconfdir}/OpenCL/
74+
rm -rvf %{buildroot}%{_bindir}/ocloc
75+
rm -rvf %{buildroot}%{_libdir}/libocloc.so
76+
rm -rvf %{buildroot}%{_includedir}/ocloc_api.h
7777
#Remove debug files
78-
rm -f %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
79-
rm -f %{buildroot}/%{_libdir}/libocloc.so.debug
80-
rm -rf %{buildroot}/usr/lib/debug/
78+
rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
79+
rm -vf %{buildroot}/%{_libdir}/libocloc.so.debug
80+
rm -rvf %{buildroot}/usr/lib/debug/
8181
#insert license into package
8282
mkdir -p %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/
83-
cp -pR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/.
83+
cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/.
8484

8585
%files -n intel-level-zero-gpu%{?name_suffix}
8686
%defattr(-,root,root)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ override_dh_install:
3838

3939
override_dh_builddeb:
4040
dh_builddeb -- -Zxz
41+
42+
override_dh_auto_test:
43+
echo "ULTs already executed"

‎scripts/packaging/opencl/build_opencl_deb.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export NEO_OCL_VERSION_BUILD
4242
if [ -z "${BRANCH_SUFFIX}" ]; then
4343
VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}${API_DEB_MODEL_LINK}"
4444
else
45-
VERSION="1:${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}.${API_VERSION}-${NEO_OCL_VERSION_HOTFIX}${API_VERSION_SRC}${API_DEB_MODEL_LINK}"
45+
VERSION="1:${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}${API_VERSION}-${NEO_OCL_VERSION_HOTFIX}${API_VERSION_SRC}${API_DEB_MODEL_LINK}"
4646
fi
4747

4848
PKG_VERSION=${VERSION}

‎scripts/packaging/opencl/build_opencl_rpm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if [ "${BUILD_SRPM}" == "1" ]; then
4949
get_opencl_version # NEO_OCL_VERSION_MAJOR.NEO_OCL_VERSION_MINOR.NEO_OCL_VERSION_BUILD
5050
get_api_version # API_VERSION-API_VERSION_SRC and API_RPM_MODEL_LINK
5151

52-
VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}.${API_VERSION}"
52+
VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}${API_VERSION}"
5353
RELEASE="${NEO_OCL_VERSION_HOTFIX}${API_VERSION_SRC}${API_RPM_MODEL_LINK}"
5454

5555
RELEASE_WITH_REGKEYS="${RELEASE_WITH_REGKEYS:-FALSE}"

0 commit comments

Comments
 (0)