Skip to content

Commit fc86810

Browse files
Add arm64 architecture for osv packaging
Related-To: NEO-5854 Signed-off-by: Pawel Cieslak <[email protected]>
1 parent b420bc6 commit fc86810

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ if [ -f "${SHLIBS}" ]; then
5858
cp $SHLIBS $BUILD_DIR/debian/
5959
fi
6060

61-
LEVEL_ZERO_DEVEL_VERSION=$(apt-cache policy level-zero-devel | grep Installed | cut -f2- -d ':' | xargs)
61+
LEVEL_ZERO_DEVEL_NAME=${LEVEL_ZERO_DEVEL_NAME:-level-zero-devel}
62+
63+
LEVEL_ZERO_DEVEL_VERSION=$(apt-cache policy ${LEVEL_ZERO_DEVEL_NAME} | grep Installed | cut -f2- -d ':' | xargs)
6264
if [ ! -z "${LEVEL_ZERO_DEVEL_VERSION}" ]; then
63-
perl -pi -e "s/^ level-zero-devel(?=,|$)/ level-zero-devel (=$LEVEL_ZERO_DEVEL_VERSION)/" "$BUILD_DIR/debian/control"
65+
perl -pi -e "s/^ level-zero-devel(?=,|$)/ ${LEVEL_ZERO_DEVEL_NAME} (=$LEVEL_ZERO_DEVEL_VERSION)/" "$BUILD_DIR/debian/control"
6466
fi
6567

6668
if [ -z "${BRANCH_SUFFIX}" ]; then

scripts/packaging/opencl/build_opencl_deb.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ EOF
127127
if [ "${ENABLE_ULT}" == "0" ]; then
128128
SKIP_UNIT_TESTS="TRUE"
129129
fi
130+
131+
if [ "${TARGET_ARCH}" == "aarch64" ]; then
132+
SKIP_UNIT_TESTS="TRUE"
133+
export NEO_DISABLE_BUILTINS_COMPILATION="TRUE"
134+
fi
135+
130136
export SKIP_UNIT_TESTS
131137

132138
dch -v ${PKG_VERSION} -m "build $PKG_VERSION" -b

scripts/packaging/opencl/ubuntu_20.04/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Standards-Version: 4.3.0
1313
Homepage: https://github.com/intel/compute-runtime
1414

1515
Package: intel-opencl-icd
16-
Architecture: amd64
16+
Architecture: amd64 arm64
1717
Depends:
1818
${shlibs:Depends},
1919
${misc:Depends},

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
%:
44
dh $@ --builddir build/ --buildsystem=cmake+ninja
55

6+
NEO_DISABLE_BUILTINS_COMPILATION ?= FALSE
7+
68
override_dh_auto_configure:
79
dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
810
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
@@ -11,6 +13,7 @@ override_dh_auto_configure:
1113
-DNEO_VERSION_BUILD=${NEO_OCL_VERSION_BUILD} \
1214
-DDO_NOT_RUN_AUB_TESTS=${DO_NOT_RUN_AUB_TESTS} \
1315
-DSKIP_UNIT_TESTS=${SKIP_UNIT_TESTS} \
16+
-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
1417
-DBUILD_WITH_L0=0 \
1518
-DRELEASE_WITH_REGKEYS=1 \
1619
-Wno-dev

0 commit comments

Comments
 (0)