Skip to content

Commit 8cf6a72

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 8cf6a72

2 files changed

Lines changed: 65 additions & 0 deletions

File tree

.github/workflows/build-multi.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,67 @@ 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 "=== Package contents ==="
198+
for pkg in ${MOUNT_TARGET}/level-zero-package/*.deb; do
199+
echo "--- \$pkg ---"
200+
dpkg -c "\$pkg"
201+
done
202+
echo "=== Installing level-zero (legacy) .deb packages ==="
203+
dpkg -i ${MOUNT_TARGET}/level-zero-package/level-zero_*.deb \
204+
${MOUNT_TARGET}/level-zero-package/level-zero-devel_*.deb
205+
echo "=== Installed level-zero packages ==="
206+
dpkg -l 'level-zero*'
207+
echo "=== Uninstalling legacy packages ==="
208+
dpkg -r level-zero-devel level-zero
209+
if ls ${MOUNT_TARGET}/level-zero-package/libze1_*.deb 2>/dev/null; then
210+
echo "=== Installing libze (new) .deb packages ==="
211+
dpkg -i ${MOUNT_TARGET}/level-zero-package/libze1_*.deb \
212+
${MOUNT_TARGET}/level-zero-package/libze-dev_*.deb
213+
echo "=== Installed libze packages ==="
214+
dpkg -l 'libze*'
215+
echo "=== Uninstalling libze packages ==="
216+
dpkg -r libze-dev libze1
217+
fi
218+
elif [[ '${{ matrix.os.name }}' == 'sles' ]]; then
219+
echo "=== Package contents ==="
220+
for pkg in ${MOUNT_TARGET}/level-zero-package/*.rpm; do
221+
echo "--- \$pkg ---"
222+
rpm -qpl "\$pkg"
223+
done
224+
echo "=== Verifying filesystem package is installed (checks devel dir conflict) ==="
225+
rpm -q filesystem
226+
echo "=== Installing .rpm packages ==="
227+
rpm -ivh ${MOUNT_TARGET}/level-zero-package/*.rpm
228+
echo "=== Installed level-zero packages ==="
229+
rpm -qa 'level-zero*'
230+
echo "=== Uninstalling packages ==="
231+
rpm -e \$(rpm -qa 'level-zero*')
232+
elif [[ '${{ matrix.os.name }}' == 'rhel' ]]; then
233+
echo "=== Package contents ==="
234+
for pkg in ${MOUNT_TARGET}/level-zero-package/*.rpm; do
235+
echo "--- \$pkg ---"
236+
rpm -qpl "\$pkg"
237+
done
238+
echo "=== Installing .rpm packages ==="
239+
rpm -ivh ${MOUNT_TARGET}/level-zero-package/*.rpm
240+
echo "=== Installed level-zero packages ==="
241+
rpm -qa 'level-zero*'
242+
echo "=== Uninstalling packages ==="
243+
rpm -e \$(rpm -qa 'level-zero*')
244+
fi
245+
183246
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)