Skip to content

Commit e5f961b

Browse files
authored
Merge pull request #10 from craflin/update-version
Changed version to 0.1.2, Build with Rocky Linux 8
2 parents ff95752 + 8c5734d commit e5f961b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cmake_minimum_required(VERSION 3.1)
33
cmake_policy(SET CMP0048 NEW)
44

5-
project(dehprox VERSION 0.1.1)
5+
project(dehprox VERSION 0.1.2)
66

77
set(CDEPLOY_NO_DEBUG_BUILD True)
88
set(CDEPLOY_NO_COMPILER True)
@@ -26,7 +26,7 @@ if(CDEPLOY_OS MATCHES "ubuntu.*" OR CDEPLOY_OS MATCHES "raspbian.*")
2626
set(CPACK_DEBIAN_PACKAGE_SECTION "net")
2727
endif()
2828

29-
if(CDEPLOY_OS MATCHES "centos.*")
29+
if(CDEPLOY_OS MATCHES "centos.*" OR CDEPLOY_OS MATCHES "rocky.*")
3030
set(CPACK_GENERATOR "RPM")
3131
set(CPACK_RPM_PACKAGE_LICENSE "Apache License")
3232
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/sbin")

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pipeline {
99
axes {
1010
axis {
1111
name 'platform'
12-
values 'ubuntu20.04-x86_64', 'ubuntu18.04-x86_64', 'raspbian10-armv7l', 'centos8-x86_64'
12+
values 'ubuntu22.04-x86_64', 'ubuntu20.04-x86_64', 'ubuntu18.04-x86_64', 'raspbian10-armv7l', 'rocky8-x86_64'
1313
}
1414
}
1515
stages {

etc/init.d/dehprox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ start() {
4646

4747
stop() {
4848
echo -n "Stopping $DESC: "
49-
killall $DAEMON
49+
kill $(pidof $DAEMON)
5050
if [ $? -eq 0 ]; then
5151
echo "$NAME."
5252
else

0 commit comments

Comments
 (0)