Support Debian 12 builds (#30)

* Support Debian 12 builds * Fix arch logic
OSC · Oct 20, 2023 · 513824d · 513824d
1 parent 521dbfb
commit 513824d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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