Skip to content

Commit

Permalink
chore: changing how project versions are generated
Browse files Browse the repository at this point in the history
add deps 'util-linux' for linglong-box

Signed-off-by: ComixHe <heyuming@deepin.org>
  • Loading branch information
ComixHe authored and dengbo11 committed May 22, 2024
1 parent e9ee2f1 commit 66cd16b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,18 @@ cmake_minimum_required(VERSION 3.11.4)

project(
linglong
VERSION 1.5.0
VERSION 1.5.1
DESCRIPTION "a container based package manager for deepin"
HOMEPAGE_URL "https://github.com/linuxdeepin/linglong"
LANGUAGES CXX)

set(LINGLONG_VERSION "" CACHE STRING "The version of linglong project.")

if(NOT ("${LINGLONG_VERSION}" STREQUAL ""))
message(STATUS "Project version has been overridden to ${LINGLONG_VERSION}")
set(CMAKE_PROJECT_VERSION ${LINGLONG_VERSION})
endif()

set(LINGLONG_USERNAME
"deepin-linglong"
CACHE STRING "The username for linglong package manager")
Expand Down
4 changes: 3 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ Description: Linglong application building tools.

Package: linglong-box
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Depends: util-linux,
${misc:Depends},
${shlibs:Depends}
Description: Deepin sandbox with OCI standard.
Deepin sandbox...
3 changes: 2 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
include /usr/share/dpkg/pkg-info.mk

OS=$(shell awk '/^NAME=/' /etc/os-release | sed 's/NAME=//' | sed 's/\"//g' | tr '[:upper:]' '[:lower:]')
ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH | cut -c1-3)
Expand All @@ -15,7 +16,7 @@ override_dh_auto_install:
endif

override_dh_auto_configure:
dh_auto_configure -- -DCPM_LOCAL_PACKAGES_ONLY=ON ${DH_AUTO_ARGS}
dh_auto_configure -- -DCPM_LOCAL_PACKAGES_ONLY=ON -DLINGLONG_VERSION=$(DEB_VERSION_UPSTREAM) ${DH_AUTO_ARGS}

# https://sources.debian.org/src/amavisd-new/1:2.13.0-3/debian/rules/?hl=10#L10
execute_after_dh_installinit:
Expand Down

0 comments on commit 66cd16b

Please sign in to comment.