From 8929f780ed4b5d85160745c170967fe1914db84a Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 27 Dec 2023 13:07:35 +0100 Subject: [PATCH 1/2] ci: switch to debian for build --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7f55134..4cc6c64 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,12 +5,12 @@ name: default steps: - name: build - image: alpine:latest + image: debian:12 environment: PACKAGE_BASENAME: igmpgen_linux_amd64 commands: - - apk update - - apk add cmake gcc g++ libnet libnet-dev debian-devscripts rpm make + - apt-get update + - apt-get install -y cmake gcc g++ libnet1 libnet-dev rpm make - make build - make package - mkdir -p /_cache/bin /_cache/packages From f35ab53a6e03b0235ad4ec77b09b12515a74a399 Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 27 Dec 2023 13:13:13 +0100 Subject: [PATCH 2/2] chore: fix RPM package naming + add license --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bf7d64..956ded5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${igmpgen_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${igmpgen_VERSION_MINOR}") # CPack RPM specific settings +set(CPACK_RPM_FILE_NAME RPM-DEFAULT) set(CPACK_RPM_PACKAGE_LICENSE "MIT") set(CPACK_RPM_PACKAGE_SUMMARY "IGMP Packet Generator") set(CPACK_RPM_PACKAGE_NAME "igmpgen") @@ -64,8 +65,10 @@ set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") set(CPACK_RPM_PACKAGE_GROUP "Network") set(CPACK_RPM_PACKAGE_VENDOR "Your Company/Organization") set(CPACK_RPM_PACKAGE_DESCRIPTION "A tool for generating IGMP packets.") +set(CPACK_RPM_PACKAGE_LICENSE "LGPL-3.0-or-later") # CPack DEB specific settings +set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Your Name ") set(CPACK_DEBIAN_PACKAGE_NAME "igmpgen") set(CPACK_DEBIAN_PACKAGE_VERSION "${igmpgen_VERSION}")