Skip to content

Commit ec533cd

Browse files
authored
Add support EL10 (#11546)
1 parent 23c9e83 commit ec533cd

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

packaging/el10

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
el8

packaging/el8/cloud.spec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
%define __os_install_post %{nil}
1919
%global debug_package %{nil}
20-
%global __requires_exclude libc\\.so\\..*
20+
%global __requires_exclude libc\\.so\\..*|libc\\.so\\.6\\(GLIBC_.*\\)
2121
%define _binaries_in_noarch_packages_terminate_build 0
2222

2323
# DISABLE the post-percentinstall java repacking and line number stripping
@@ -39,7 +39,7 @@ Source0: %{name}-%{_maventag}.tgz
3939
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
4040
BuildArch: noarch
4141

42-
BuildRequires: (java-11-openjdk-devel or java-17-openjdk-devel)
42+
BuildRequires: (java-11-openjdk-devel or java-17-openjdk-devel or java-21-openjdk-devel)
4343
#BuildRequires: ws-commons-util
4444
BuildRequires: jpackage-utils
4545
BuildRequires: gcc
@@ -55,7 +55,7 @@ intelligent IaaS cloud implementation.
5555

5656
%package management
5757
Summary: CloudStack management server UI
58-
Requires: java-17-openjdk
58+
Requires: (java-17-openjdk or java-21-openjdk)
5959
Requires: (tzdata-java or timezone-java)
6060
Requires: python3
6161
Requires: bash
@@ -66,12 +66,12 @@ Requires: tar
6666
Requires: bzip2
6767
Requires: gzip
6868
Requires: unzip
69-
Requires: /sbin/mount.nfs
69+
Requires: (/sbin/mount.nfs or /usr/sbin/mount.nfs)
7070
Requires: (openssh-clients or openssh)
7171
Requires: (nfs-utils or nfs-client)
7272
Requires: iproute
7373
Requires: wget
74-
Requires: (mysql or mariadb)
74+
Requires: (mysql or mariadb or mysql8.4)
7575
Requires: sudo
7676
Requires: /sbin/service
7777
Requires: /sbin/chkconfig
@@ -96,12 +96,12 @@ Requires: python3
9696
Group: System Environment/Libraries
9797
%description common
9898
The Apache CloudStack files shared between agent and management server
99-
%global __requires_exclude ^(libuuid\\.so\\.1|/usr/bin/python)$
99+
%global __requires_exclude libc\\.so\\..*|libc\\.so\\.6\\(GLIBC_.*\\)|^(libuuid\\.so\\.1|/usr/bin/python)$
100100

101101
%package agent
102102
Summary: CloudStack Agent for KVM hypervisors
103103
Requires: (openssh-clients or openssh)
104-
Requires: java-17-openjdk
104+
Requires: (java-17-openjdk or java-21-openjdk)
105105
Requires: (tzdata-java or timezone-java)
106106
Requires: %{name}-common = %{_ver}
107107
Requires: libvirt
@@ -142,7 +142,7 @@ The CloudStack baremetal agent
142142

143143
%package usage
144144
Summary: CloudStack Usage calculation server
145-
Requires: java-17-openjdk
145+
Requires: (java-17-openjdk or java-21-openjdk)
146146
Requires: (tzdata-java or timezone-java)
147147
Group: System Environment/Libraries
148148
%description usage

scripts/installer/pre-check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ if [ -z $JAVA_MAJOR_VERSION ];then
2828
exit 0
2929
fi
3030

31-
if [ "$JAVA_MAJOR_VERSION" != "17" ] && [ "$JAVA_MAJOR_VERSION" != "11" ];then
32-
echo "ERROR: JAVA $JAVA_MAJOR_VERSION is not supported. Currently only JAVA 17 and JAVA 11 are supported."
31+
if [ "$JAVA_MAJOR_VERSION" != "21" ] && [ "$JAVA_MAJOR_VERSION" != "17" ] && [ "$JAVA_MAJOR_VERSION" != "11" ];then
32+
echo "ERROR: JAVA $JAVA_MAJOR_VERSION is not supported. Currently only JAVA versions 11, 17 and 21 are supported."
3333
exit 1
3434
fi
3535

0 commit comments

Comments
 (0)