Skip to content

Commit dcbaf3c

Browse files
committed
Fix duplicate install when addig Canonical packages
+ Also fix mising Python3 warning Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent fee87bb commit dcbaf3c

7 files changed

Lines changed: 31 additions & 4 deletions

File tree

.github/docker/ubuntu.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ apt-get install -y \
5252
libc6:arm64 \
5353
libstdc++6:arm64 \
5454
git \
55-
ninja-build
55+
ninja-build \
56+
python3
5657
rm -rf /var/lib/apt/lists/*
5758
EOF

CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2020-2025 Intel Corporation
1+
# Copyright (C) 2020-2026 Intel Corporation
22
# SPDX-License-Identifier: MIT
33

44
cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
@@ -271,18 +271,26 @@ install(FILES ${LEVEL_ZERO_LOADER_API_HEADERS}
271271
COMPONENT ${SDK_COMPONENT_STRING}
272272
)
273273

274+
# Canonical Ubuntu/Debian package naming (libze1 / libze-dev) mirrors Canonical's own packaging.
275+
# EXCLUDE_FROM_ALL prevents these rules from running during 'make install' — the same files are
276+
# already installed by the level-zero / level-zero-devel components above. CPack ignores
277+
# EXCLUDE_FROM_ALL when building component packages, so 'cmake --build . --target package'
278+
# still produces all four .deb files without duplicating entries in install_manifest.txt.
274279
if(CANONICAL_SDK_COMPONENT)
275280
install(FILES ${LEVEL_ZERO_API_HEADERS}
276281
DESTINATION ./include/level_zero
277282
COMPONENT ${CANONICAL_SDK_COMPONENT}
283+
EXCLUDE_FROM_ALL
278284
)
279285
install(FILES ${LEVEL_ZERO_LAYERS_API_HEADERS}
280286
DESTINATION ./include/level_zero/layers
281287
COMPONENT ${CANONICAL_SDK_COMPONENT}
288+
EXCLUDE_FROM_ALL
282289
)
283290
install(FILES ${LEVEL_ZERO_LOADER_API_HEADERS}
284291
DESTINATION ./include/level_zero/loader
285292
COMPONENT ${CANONICAL_SDK_COMPONENT}
293+
EXCLUDE_FROM_ALL
286294
)
287295
endif()
288296

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (C) 2019-2021 Intel Corporation
3+
Copyright (C) 2019-2026 Intel Corporation
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

source/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,16 @@ install(TARGETS ze_loader
7474
NAMELINK_COMPONENT ${SDK_COMPONENT_STRING}
7575
)
7676

77+
# EXCLUDE_FROM_ALL: canonical libze1/libze-dev components are for CPack .deb packaging only.
78+
# 'make install' uses the level-zero/level-zero-devel components above to avoid duplicate
79+
# entries in install_manifest.txt which would cause 'xargs rm' uninstall to fail.
7780
if(CANONICAL_LIB_COMPONENT)
7881
install(TARGETS ze_loader
7982
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${CANONICAL_SDK_COMPONENT}
8083
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${CANONICAL_LIB_COMPONENT}
8184
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${CANONICAL_LIB_COMPONENT}
8285
NAMELINK_COMPONENT ${CANONICAL_SDK_COMPONENT}
86+
EXCLUDE_FROM_ALL
8387
)
8488
endif()
8589

@@ -96,8 +100,10 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libze_loader.pc"
96100
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" COMPONENT ${SDK_COMPONENT_STRING})
97101

98102
if(CANONICAL_SDK_COMPONENT)
103+
# EXCLUDE_FROM_ALL: CPack-only; avoids duplicate install_manifest.txt entries.
99104
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libze_loader.pc"
100105
"${CMAKE_CURRENT_BINARY_DIR}/level-zero.pc"
101-
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" COMPONENT ${CANONICAL_SDK_COMPONENT})
106+
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" COMPONENT ${CANONICAL_SDK_COMPONENT}
107+
EXCLUDE_FROM_ALL)
102108
endif()
103109
endif()

source/drivers/null/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ if(INSTALL_NULL_DRIVER)
2727
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero
2828
NAMELINK_COMPONENT level-zero-devel
2929
)
30+
# EXCLUDE_FROM_ALL: canonical libze1/libze-dev components are for CPack .deb packaging only.
31+
# 'make install' uses the level-zero/level-zero-devel components above to avoid duplicate
32+
# entries in install_manifest.txt which would cause 'xargs rm' uninstall to fail.
3033
if(CANONICAL_LIB_COMPONENT)
3134
install(TARGETS ze_null
3235
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${CANONICAL_SDK_COMPONENT}
3336
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${CANONICAL_LIB_COMPONENT}
3437
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${CANONICAL_LIB_COMPONENT}
3538
NAMELINK_COMPONENT ${CANONICAL_SDK_COMPONENT}
39+
EXCLUDE_FROM_ALL
3640
)
3741
endif()
3842
endif()

source/layers/tracing/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,15 @@ install(TARGETS ze_tracing_layer
7070
NAMELINK_COMPONENT ${SDK_COMPONENT_STRING}
7171
)
7272

73+
# EXCLUDE_FROM_ALL: canonical libze1/libze-dev components are for CPack .deb packaging only.
74+
# 'make install' uses the level-zero/level-zero-devel components above to avoid duplicate
75+
# entries in install_manifest.txt which would cause 'xargs rm' uninstall to fail.
7376
if(CANONICAL_LIB_COMPONENT)
7477
install(TARGETS ze_tracing_layer
7578
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${CANONICAL_SDK_COMPONENT}
7679
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${CANONICAL_LIB_COMPONENT}
7780
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${CANONICAL_LIB_COMPONENT}
7881
NAMELINK_COMPONENT ${CANONICAL_SDK_COMPONENT}
82+
EXCLUDE_FROM_ALL
7983
)
8084
endif()

source/layers/validation/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,16 @@ install(TARGETS ze_validation_layer
5959
NAMELINK_COMPONENT ${SDK_COMPONENT_STRING}
6060
)
6161

62+
# EXCLUDE_FROM_ALL: canonical libze1/libze-dev components are for CPack .deb packaging only.
63+
# 'make install' uses the level-zero/level-zero-devel components above to avoid duplicate
64+
# entries in install_manifest.txt which would cause 'xargs rm' uninstall to fail.
6265
if(CANONICAL_LIB_COMPONENT)
6366
install(TARGETS ze_validation_layer
6467
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${CANONICAL_SDK_COMPONENT}
6568
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${CANONICAL_LIB_COMPONENT}
6669
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${CANONICAL_LIB_COMPONENT}
6770
NAMELINK_COMPONENT ${CANONICAL_SDK_COMPONENT}
71+
EXCLUDE_FROM_ALL
6872
)
6973
endif()
7074

0 commit comments

Comments
 (0)