From 9853ea93826d83e0790bc4a2b2ba10455205a6c5 Mon Sep 17 00:00:00 2001
From: mphanias <121247041+mphanias@users.noreply.github.com>
Date: Tue, 12 Dec 2023 15:58:03 +0530
Subject: [PATCH] OM152 - Package name correction for rpms and removal of
 debian10 (#102)

1. removed minor version from RPM artefact names
2. removed debian 10 support
---
 .github/workflows/build_release_artifacts.yaml | 8 +-------
 pkg/Makefile                                   | 5 ++++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_release_artifacts.yaml b/.github/workflows/build_release_artifacts.yaml
index 2d5de835..d4215540 100644
--- a/.github/workflows/build_release_artifacts.yaml
+++ b/.github/workflows/build_release_artifacts.yaml
@@ -23,10 +23,7 @@ jobs:
         fail-fast: false
         matrix:
           arch: ["amd64","arm64"]
-          container: ["ubuntu:20.04","ubuntu:22.04","redhat:8","redhat:9","amazonlinux:2023","debian:10","debian:11","debian:12"]
-          exclude:
-            - container: "debian:10"
-              arch: "arm64"
+          container: ["ubuntu:20.04","ubuntu:22.04","redhat:8","redhat:9","amazonlinux:2023","debian:11","debian:12"]
           include:
             - container: "ubuntu:22.04"
               name: "Ubuntu22.04"
@@ -45,9 +42,6 @@ jobs:
             - container: "amazonlinux:2023" 
               cmd: "make rpm"
               ext: "rpm"
-            - container: "debian:10"
-              cmd: "make deb"
-              ext: "deb"
             - container: "debian:11"
               cmd: "make deb"
               ext: "deb"
diff --git a/pkg/Makefile b/pkg/Makefile
index c136f138..7be8e08c 100644
--- a/pkg/Makefile
+++ b/pkg/Makefile
@@ -89,6 +89,9 @@ fips-rpm: fipsparam rpm
 
 .PHONY: rpm
 rpm: prep
+	$(eval ARCH := $(shell uname -m))
+	$(eval DISTRO_VERSION := $(shell echo $(DISTRO_VERSION) | cut -d'.' -f1)) # Only major version for RPM
+
 	fpm --force \
 		--config-files /etc/aerospike-prometheus-exporter \
 		--input-type dir \
@@ -140,4 +143,4 @@ prep:
 clean:
 	rm -rf $(TARGET_DIR)
 	rm -rf $(BUILD_DIR)/etc
-	rm -rf $(BUILD_DIR)/usr/bin
+	rm -rf $(BUILD_DIR)/usr/bin
\ No newline at end of file