Skip to content

Commit 83a8825

Browse files
committed
fix: level zero devel package config filesystem conflict on sles
Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
1 parent ea2f4f4 commit 83a8825

2 files changed

Lines changed: 40 additions & 0 deletions

File tree

.github/workflows/build-multi.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,42 @@ jobs:
180180
181181
ccache --show-stats
182182
183+
EOF
184+
- name: Test package install/uninstall (Linux)
185+
if: matrix.os.name != 'windows' && matrix.target == 'package' && matrix.arch == ''
186+
run: |
187+
docker run \
188+
--rm \
189+
--interactive \
190+
--platform linux/amd64 \
191+
-v '${{ github.workspace }}':${MOUNT_TARGET} \
192+
-w ${MOUNT_TARGET} \
193+
${DOCKER_IMAGE}:${{ needs.config.outputs.ref-slug }} \
194+
bash -e -x <<-EOF
195+
196+
if [[ '${{ matrix.os.name }}' == 'ubuntu' ]]; then
197+
echo "=== Installing .deb packages ==="
198+
dpkg -i ${MOUNT_TARGET}/level-zero-package/*.deb
199+
echo "=== Installed level-zero packages ==="
200+
dpkg -l 'level-zero*'
201+
echo "=== Uninstalling packages ==="
202+
dpkg -r \$(dpkg -l 'level-zero*' | awk '/^ii/{print \$2}')
203+
elif [[ '${{ matrix.os.name }}' == 'sles' ]]; then
204+
echo "=== Installing filesystem package first (checks devel dir conflict) ==="
205+
zypper --non-interactive install -y filesystem
206+
echo "=== Installing .rpm packages ==="
207+
rpm -ivh ${MOUNT_TARGET}/level-zero-package/*.rpm
208+
echo "=== Installed level-zero packages ==="
209+
rpm -qa 'level-zero*'
210+
echo "=== Uninstalling packages ==="
211+
rpm -e \$(rpm -qa 'level-zero*')
212+
elif [[ '${{ matrix.os.name }}' == 'rhel' ]]; then
213+
echo "=== Installing .rpm packages ==="
214+
rpm -ivh ${MOUNT_TARGET}/level-zero-package/*.rpm
215+
echo "=== Installed level-zero packages ==="
216+
rpm -qa 'level-zero*'
217+
echo "=== Uninstalling packages ==="
218+
rpm -e \$(rpm -qa 'level-zero*')
219+
fi
220+
183221
EOF

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,8 @@ if(CPACK_GENERATOR MATCHES "RPM")
417417

418418
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
419419
/etc/ld.so.conf.d
420+
/usr/lib64
421+
/usr/lib64/pkgconfig
420422
/usr/local
421423
/usr/local/lib64
422424
/usr/local/bin

0 commit comments

Comments
 (0)