From 513824d49663a62cea8bb63d79212823ec539ae9 Mon Sep 17 00:00:00 2001
From: treydock <tdockendorf@osc.edu>
Date: Fri, 20 Oct 2023 10:47:46 -0400
Subject: [PATCH] Support Debian 12 builds (#30)

* Support Debian 12 builds

* Fix arch logic
---
 .github/workflows/build.yml | 2 ++
 .gitlab-ci.yml              | 2 +-
 packaging/deb/rules         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 499b434..02ec913 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,6 +18,7 @@ jobs:
           - amzn2023
           - ubuntu-20.04
           - ubuntu-22.04
+          - debian-12
         arch:
           - x86_64
           - aarch64
@@ -95,6 +96,7 @@ jobs:
           - amzn2023
           - ubuntu-20.04
           - ubuntu-22.04
+          - debian-12
         arch:
           - x86_64
         version: ['3.1']
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5de5f7a..de9b1c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ build:
       - OOD_PACKAGING_DIST: [el7, el8]
         OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le]
         OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec
-      - OOD_PACKAGING_DIST: [el9]
+      - OOD_PACKAGING_DIST: [el9, debian-12]
         OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le]
       - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04]
         OOD_PACKAGING_ARCH: [x86_64, aarch64]
diff --git a/packaging/deb/rules b/packaging/deb/rules
index abb4023..9ca3956 100755
--- a/packaging/deb/rules
+++ b/packaging/deb/rules
@@ -17,7 +17,7 @@ export DESTDIR = $(CURDIR)/debian/ondemand-dex
 export CONFDIR = $(DESTDIR)/etc/ood/dex
 export UNITDIR = $(DESTDIR)/lib/systemd/system
 export CONF_UNITDIR = $(DESTDIR)/etc/systemd/system
-export ARCH = $(shell uname -p)
+export ARCH = $(shell uname -m)
 ifeq ($(ARCH),x86_64)
 export PLATFORM = amd64
 endif