Fix build.sh to recognize AlmaLinux as RHEL-compatible

This commit is contained in:
Eduard Abdullin 2026-07-22 10:56:05 +00:00 committed by root
parent 0119b9aabb
commit ba32f0728c
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 \
@ -66,6 +66,9 @@ Source15: resteasy-servlet-initializer-3.0.26.Final.jar
Patch: 0001-Fix-bundled-jackson-version-mismatch.patch
# AlmaLinux Patch
Patch: 1000-fix-build-sh-recognize-almalinux.patch
%if 0%{?java_arches:1}
ExclusiveArch: %{java_arches}
%else
@ -2176,6 +2179,9 @@ fi
################################################################################
%changelog
* Wed Jul 22 2026 Eduard Abdullin <eabdullin@almalinux.org> - 11.9.0-4.alma.1
- Fix build.sh to recognize AlmaLinux as RHEL-compatible
* Thu Jul 16 2026 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.9.0-4
- Update jackson bundled to 2.21.4
- Resolves: RHEL-188290