Compare commits

...

3 Commits
c10s ... a10s

Author SHA1 Message Date
Eduard Abdullin
4e2c79f6b4 Fix build.sh to recognize AlmaLinux as RHEL-compatible 2026-03-24 01:20:44 +00:00
Eduard Abdullin
d19f51ebb4 Fix build.sh to recognize AlmaLinux as RHEL-compatible 2026-03-17 10:15:53 +00:00
Eduard Abdullin
6439dd2bd5 Fix build.sh to recognize AlmaLinux as RHEL-compatible 2026-03-13 17:26:01 +00:00
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Eduard Abdullin <eabdullin@almalinux.org>
Date: Thu, 13 Mar 2026 12:00:00 +0000
Subject: [PATCH] Fix build.sh to recognize AlmaLinux as RHEL-compatible
build.sh only handles centos, rhel, and fedora.
On AlmaLinux (ID=almalinux), it falls into the default case which echoes
an undefined $def_app_server variable (empty string), causing cmake to
receive an empty APP_SERVER and fail with:
CMake Error at base/CMakeLists.txt (add_subdirectory):
add_subdirectory called with incorrect number of arguments
---
build.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/build.sh b/build.sh
--- a/build.sh
+++ b/build.sh
@@ -192,6 +192,10 @@
distro="rhel"
ver=$VERSION_ID
;;
+ "almalinux")
+ distro="rhel"
+ ver=$VERSION_ID
+ ;;
*)
echo $def_app_server
return
--
2.43.0

View File

@ -30,7 +30,7 @@ URL: https://www.dogtagpki.org
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPL-2.0-only AND LGPL-2.0-only
Version: %{major_version}.%{minor_version}.%{update_version}
Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.alma.1
# To create a tarball from a version tag:
# $ git archive \
@ -56,6 +56,9 @@ Source13: resteasy-client-3.0.26.Final.jar
Source14: resteasy-jackson2-provider-3.0.26.Final.jar
Source15: resteasy-servlet-initializer-3.0.26.Final.jar
# AlmaLinux Patch
Patch1000: 1000-fix-build-sh-recognize-almalinux.patch
# To create a patch for all changes since a version tag:
# $ git format-patch \
# --stdout \
@ -2172,6 +2175,9 @@ fi
################################################################################
%changelog
* Tue Mar 24 2026 Eduard Abdullin <eabdullin@almalinux.org> - 11.9.0-3.alma.1
- Fix build.sh to recognize AlmaLinux as RHEL-compatible
* Fri Mar 13 2026 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.9.0-3
- Revert to tomcat 9
- Resolves: RHEL-155406