Skip to content

Commit aabb54b

Browse files
committed
Remove level-zero* packages from DEB builds
Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent 921d788 commit aabb54b

1 file changed

Lines changed: 6 additions & 20 deletions

File tree

CMakeLists.txt

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@ if(CPACK_GENERATOR MATCHES "RPM")
416416
set(CPACK_RPM_LEVEL-ZERO-DEVEL_FILE_NAME "${PROJECT_NAME}-devel-${PROJECT_VERSION}-${os_name}${os_version}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
417417
set(CPACK_RPM_LEVEL-ZERO-DEVEL_PACKAGE_REQUIRES "level-zero = ${PROJECT_VERSION}")
418418

419-
420419
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
421420
/etc/ld.so.conf.d
422421
/usr/lib64
@@ -437,32 +436,19 @@ if(CPACK_GENERATOR MATCHES "DEB")
437436
endif()
438437
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/oneapi-src/level-zero")
439438
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
440-
set(CPACK_DEBIAN_LEVEL-ZERO_PACKAGE_NAME "${PROJECT_NAME}")
441-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_NAME "${PROJECT_NAME}-devel")
442-
set(CPACK_DEBIAN_LEVEL-ZERO_FILE_NAME "${PROJECT_NAME}_${PROJECT_VERSION}+${os_name}${os_version}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
443-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_FILE_NAME "${PROJECT_NAME}-devel_${PROJECT_VERSION}+${os_name}${os_version}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
444-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_DEPENDS "level-zero(=${PROJECT_VERSION})")
445-
# Mutual exclusion with the canonical libze1 / libze-dev packages
446-
set(CPACK_DEBIAN_LEVEL-ZERO_PACKAGE_CONFLICTS "libze1")
447-
set(CPACK_DEBIAN_LEVEL-ZERO_PACKAGE_PROVIDES "libze1")
448-
set(CPACK_DEBIAN_LEVEL-ZERO_PACKAGE_REPLACES "libze1")
449-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_CONFLICTS "libze-dev")
450-
set(CPACK_DEBIAN_LEVEL-ZERO-DEVEL_PACKAGE_PROVIDES "libze-dev")
451-
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")
452441

453442
# 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+
454447
set(CPACK_DEBIAN_LIBZE1_PACKAGE_NAME "libze1")
455448
set(CPACK_DEBIAN_LIBZE-DEV_PACKAGE_NAME "libze-dev")
456449
set(CPACK_DEBIAN_LIBZE1_FILE_NAME "libze1_${PROJECT_VERSION}+${os_name}${os_version}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
457450
set(CPACK_DEBIAN_LIBZE-DEV_FILE_NAME "libze-dev_${PROJECT_VERSION}+${os_name}${os_version}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
458451
set(CPACK_DEBIAN_LIBZE-DEV_PACKAGE_DEPENDS "libze1 (= ${PROJECT_VERSION})")
459-
# Mutual exclusion with the level-zero / level-zero-devel packages
460-
set(CPACK_DEBIAN_LIBZE1_PACKAGE_CONFLICTS "level-zero")
461-
set(CPACK_DEBIAN_LIBZE1_PACKAGE_PROVIDES "level-zero")
462-
set(CPACK_DEBIAN_LIBZE1_PACKAGE_REPLACES "level-zero")
463-
set(CPACK_DEBIAN_LIBZE-DEV_PACKAGE_CONFLICTS "level-zero-devel")
464-
set(CPACK_DEBIAN_LIBZE-DEV_PACKAGE_PROVIDES "level-zero-devel")
465-
set(CPACK_DEBIAN_LIBZE-DEV_PACKAGE_REPLACES "level-zero-devel")
466452

467453
set(CPACK_DEB_COMPONENT_INSTALL ON)
468454
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)

0 commit comments

Comments
 (0)