Skip to content

Commit b94ffc4

Browse files
rwmcguirrwmcguir
authored
Remove unneeded RPMs and DEBs from builds (#460)
* Remove level-zero* packages from DEB builds * Remove unnecessary packages from RPM builds, by accident during libze1 introduction * Update build-multi.yml CI to not look for level-zero*.deb Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent 0f246f6 commit b94ffc4

2 files changed

Lines changed: 18 additions & 30 deletions

File tree

‎.github/workflows/build-multi.yml‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -199,22 +199,13 @@ jobs:
199199
echo "--- \$pkg ---"
200200
dpkg -c "\$pkg"
201201
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
202+
echo "=== Installing libze .deb packages ==="
203+
dpkg -i ${MOUNT_TARGET}/level-zero-package/libze1_*.deb \
204+
${MOUNT_TARGET}/level-zero-package/libze-dev_*.deb
205+
echo "=== Installed libze packages ==="
206+
dpkg -l 'libze*'
207+
echo "=== Uninstalling libze packages ==="
208+
dpkg -r libze-dev libze1
218209
elif [[ '${{ matrix.os.name }}' == 'sles' ]]; then
219210
echo "=== Package contents ==="
220211
for pkg in ${MOUNT_TARGET}/level-zero-package/*.rpm; do

‎CMakeLists.txt‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,9 @@ set(TARGET_LOADER_NAME ze_loader)
224224

225225
# Canonical Ubuntu/Debian package names (libze1 / libze-dev)
226226
# produced alongside the existing level-zero / level-zero-devel packages.
227-
if(NOT BUILD_INSTALLER)
227+
# Restricted to Debian/Ubuntu systems only; RPM-based distros (SLES, RHEL, …)
228+
# must not produce libze1/libze-dev packages.
229+
if(NOT BUILD_INSTALLER AND EXISTS "/etc/debian_version")
228230
set(CANONICAL_LIB_COMPONENT "libze1")
229231
set(CANONICAL_SDK_COMPONENT "libze-dev")
230232
endif()
@@ -414,7 +416,6 @@ if(CPACK_GENERATOR MATCHES "RPM")
414416
set(CPACK_RPM_LEVEL-ZERO-DEVEL_FILE_NAME "${PROJECT_NAME}-devel-${PROJECT_VERSION}-${os_name}${os_version}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
415417
set(CPACK_RPM_LEVEL-ZERO-DEVEL_PACKAGE_REQUIRES "level-zero = ${PROJECT_VERSION}")
416418

417-
418419
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
419420
/etc/ld.so.conf.d
420421
/usr/lib64
@@ -435,26 +436,22 @@ if(CPACK_GENERATOR MATCHES "DEB")
435436
endif()
436437
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/oneapi-src/level-zero")
437438
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
438-
set(CPACK_DEBIAN_LEVEL-ZERO_PACKAGE_NAME "${PROJECT_NAME}")
439-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_NAME "${PROJECT_NAME}-devel")
440-
set(CPACK_DEBIAN_LEVEL-ZERO_FILE_NAME "${PROJECT_NAME}_${PROJECT_VERSION}+${os_name}${os_version}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
441-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_FILE_NAME "${PROJECT_NAME}-devel_${PROJECT_VERSION}+${os_name}${os_version}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
442-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_DEPENDS "level-zero(=${PROJECT_VERSION})")
443-
# Mutual exclusion with the canonical libze1 / libze-dev packages
444-
set(CPACK_DEBIAN_LEVEL-ZERO_PACKAGE_CONFLICTS "libze1")
445-
set(CPACK_DEBIAN_LEVEL-ZERO_PACKAGE_PROVIDES "libze1")
446-
set(CPACK_DEBIAN_LEVEL-ZERO_PACKAGE_REPLACES "libze1")
447-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_CONFLICTS "libze-dev")
448-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_PROVIDES "libze-dev")
449-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_REPLACES "libze-dev")
439+
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "oneAPI Level Zero")
440+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "oneAPI Level Zero")
450441

451442
# Canonical Ubuntu naming: libze1 (runtime) and libze-dev (development)
443+
# For Debian/Ubuntu, only produce libze1 and libze-dev packages, not level-zero and level-zero-devel
444+
get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
445+
list(REMOVE_ITEM CPACK_COMPONENTS_ALL "level-zero" "level-zero-devel")
446+
452447
set(CPACK_DEBIAN_LIBZE1_PACKAGE_NAME "libze1")
453448
set(CPACK_DEBIAN_LIBZE-DEV_PACKAGE_NAME "libze-dev")
454449
set(CPACK_DEBIAN_LIBZE1_FILE_NAME "libze1_${PROJECT_VERSION}+${os_name}${os_version}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
455450
set(CPACK_DEBIAN_LIBZE-DEV_FILE_NAME "libze-dev_${PROJECT_VERSION}+${os_name}${os_version}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
456451
set(CPACK_DEBIAN_LIBZE-DEV_PACKAGE_DEPENDS "libze1 (= ${PROJECT_VERSION})")
452+
457453
# Mutual exclusion with the level-zero / level-zero-devel packages
454+
# Allows seamless upgrade from old naming to new Canonical naming
458455
set(CPACK_DEBIAN_LIBZE1_PACKAGE_CONFLICTS "level-zero")
459456
set(CPACK_DEBIAN_LIBZE1_PACKAGE_PROVIDES "level-zero")
460457
set(CPACK_DEBIAN_LIBZE1_PACKAGE_REPLACES "level-zero")

0 commit comments

Comments
 (0)