Fix Debian package generation.
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone/push Build was killed
Details
This commit is contained in:
parent
941f272f60
commit
23f8f69e0e
|
@ -110,7 +110,7 @@ steps:
|
|||
- rm /etc/apt/apt.conf.d/docker-clean
|
||||
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
||||
- apt-get update -q
|
||||
- apt-get install -qy g++-6 cmake pkg-config libmagick++-dev gnupg
|
||||
- apt-get install -qy g++-6 cmake pkg-config libmagick++-dev gnupg dpkg-dev d-shlibs lsb-release
|
||||
- rm -rf build && mkdir -p build && cd build
|
||||
- cmake -DWITH_DEB=YES ..
|
||||
- make package
|
||||
|
@ -138,7 +138,7 @@ steps:
|
|||
- yum install -qy centos-release-scl
|
||||
- yum install -qy devtoolset-6
|
||||
- scl enable devtoolset-6 bash
|
||||
- yum install -qy rpm-build ImageMagick-c++-devel gnupg
|
||||
- yum install -qy rpm-build ImageMagick-c++-devel gnupg redhat-lsb-core
|
||||
- yum --enablerepo=epel install -qy cmake3
|
||||
- rm -rf build && mkdir -p build && cd build
|
||||
- cmake3 -DWITH_RPM=YES ..
|
||||
|
|
|
@ -31,9 +31,11 @@ if (WITH_DEB)
|
|||
execute_process(COMMAND dpkg --print-architecture
|
||||
OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(COMMAND lsb_release --codename --short
|
||||
OUTPUT_VARIABLE DEBIAN_CODENAME
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
set(CPACK_PACKAGE_FILE_NAME
|
||||
"${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-0_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}_${DEBIAN_CO
|
||||
DENAME}")
|
||||
"${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-0_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}_${DEBIAN_CODENAME}")
|
||||
endif()
|
||||
|
||||
if (WITH_RPM)
|
||||
|
@ -44,6 +46,9 @@ if (WITH_RPM)
|
|||
set(CPACK_RPM_PACKAGE_REQUIRES "libMagick++")
|
||||
set(CPACK_PACKAGE_FILE_NAME
|
||||
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}")
|
||||
execute_process(COMMAND lsb_release --id --short
|
||||
OUTPUT_VARIABLE OS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
if("${OS}" STREQUAL "CentOS")
|
||||
execute_process(COMMAND rpm -E %{rhel}
|
||||
OUTPUT_VARIABLE OS_RELEASE
|
||||
|
|
Loading…
Reference in New Issue