Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion libs/linglong/src/linglong/builder/builder_releases.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ SPDX-License-Identifier: LGPL-3.0-or-later
<file alias="scripts/fetch-file-source">../../../../../misc/libexec/linglong/fetch-file-source</file>
<file alias="scripts/fetch-archive-source">../../../../../misc/libexec/linglong/fetch-archive-source</file>
<file alias="scripts/app-conf-generator">../../../../../misc/libexec/linglong/app-conf-generator</file>
<file alias="container/config.json">../../../../../misc/lib/linglong/container/config.json</file>
</qresource>
</RCC>
29 changes: 1 addition & 28 deletions misc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,6 @@ configure_files(
libexec/linglong/fetch-git-source
libexec/linglong/font-cache-generator
libexec/linglong/ld-cache-generator
lib/linglong/container/config.d/00-id-mapping
lib/linglong/container/config.d/05-initialize
lib/linglong/container/config.d/10-basics.json
lib/linglong/container/config.d/20-devices
lib/linglong/container/config.d/25-host-env
lib/linglong/container/config.d/25-host-rootfs.json
lib/linglong/container/config.d/25-host-statics.json
lib/linglong/container/config.d/30-user-home
lib/linglong/container/config.d/40-host-ipc
lib/linglong/container/config.d/90-legacy
lib/linglong/container/config.json
lib/linglong/container/README.md
lib/linglong/generate-xdg-data-dirs.sh
lib/systemd/system-environment-generators/61-linglong
Expand Down Expand Up @@ -108,29 +97,13 @@ install(
DESTINATION ${LIBEXEC_LINGLONG_BUILDER_DIR}/helper)

# linglong
set(LINGLONG_CONFIG_DIR
${CMAKE_CURRENT_BINARY_DIR}/lib/linglong/container/config.d)
install(
PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lib/linglong/generate-xdg-data-dirs.sh
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/linglong)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib/linglong/container/config.json
${CMAKE_CURRENT_BINARY_DIR}/lib/linglong/container/README.md
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib/linglong/container/README.md
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/linglong/container)

install(
FILES ${LINGLONG_CONFIG_DIR}/10-basics.json
${LINGLONG_CONFIG_DIR}/25-host-rootfs.json
${LINGLONG_CONFIG_DIR}/25-host-statics.json
${LINGLONG_CONFIG_DIR}/00-id-mapping
${LINGLONG_CONFIG_DIR}/05-initialize
${LINGLONG_CONFIG_DIR}/20-devices
${LINGLONG_CONFIG_DIR}/25-host-env
${LINGLONG_CONFIG_DIR}/30-user-home
${LINGLONG_CONFIG_DIR}/40-host-ipc
${LINGLONG_CONFIG_DIR}/90-legacy
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/linglong/container/config.d)

# linglong default configuration
install(FILES ${CMAKE_CURRENT_LIST_DIR}/share/linglong/config.yaml
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/linglong)
Expand Down
Loading