apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support EL10 (#11546)

Browse Source
This commit is contained in:
Vishesh 2025-09-25 15:37:45 +05:30 committed by GitHub
parent 23c9e83047
commit ec533cd24d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/el10 Symbolic link
View File

@ -0,0 +1 @@
el8

16
packaging/el8/cloud.spec
View File

@ -17,7 +17,7 @@
%define __os_install_post %{nil} %define __os_install_post %{nil}
%global debug_package %{nil} %global debug_package %{nil}
%global __requires_exclude libc\\.so\\..* %global __requires_exclude libc\\.so\\..*|libc\\.so\\.6\\(GLIBC_.*\\)
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
# DISABLE the post-percentinstall java repacking and line number stripping # DISABLE the post-percentinstall java repacking and line number stripping
@ -39,7 +39,7 @@ Source0: %{name}-%{_maventag}.tgz
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
BuildArch: noarch BuildArch: noarch
BuildRequires: (java-11-openjdk-devel or java-17-openjdk-devel) BuildRequires: (java-11-openjdk-devel or java-17-openjdk-devel or java-21-openjdk-devel)
#BuildRequires: ws-commons-util #BuildRequires: ws-commons-util
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
BuildRequires: gcc BuildRequires: gcc
@ -55,7 +55,7 @@ intelligent IaaS cloud implementation.
%package management %package management
Summary: CloudStack management server UI Summary: CloudStack management server UI
Requires: java-17-openjdk Requires: (java-17-openjdk or java-21-openjdk)
Requires: (tzdata-java or timezone-java) Requires: (tzdata-java or timezone-java)
Requires: python3 Requires: python3
Requires: bash Requires: bash
@ -66,12 +66,12 @@ Requires: tar
Requires: bzip2 Requires: bzip2
Requires: gzip Requires: gzip
Requires: unzip Requires: unzip
Requires: /sbin/mount.nfs Requires: (/sbin/mount.nfs or /usr/sbin/mount.nfs)
Requires: (openssh-clients or openssh) Requires: (openssh-clients or openssh)
Requires: (nfs-utils or nfs-client) Requires: (nfs-utils or nfs-client)
Requires: iproute Requires: iproute
Requires: wget Requires: wget
Requires: (mysql or mariadb) Requires: (mysql or mariadb or mysql8.4)
Requires: sudo Requires: sudo
Requires: /sbin/service Requires: /sbin/service
Requires: /sbin/chkconfig Requires: /sbin/chkconfig
@ -96,12 +96,12 @@ Requires: python3
Group: System Environment/Libraries Group: System Environment/Libraries
%description common %description common
The Apache CloudStack files shared between agent and management server The Apache CloudStack files shared between agent and management server
%global __requires_exclude ^(libuuid\\.so\\.1|/usr/bin/python)$ %global __requires_exclude libc\\.so\\..*|libc\\.so\\.6\\(GLIBC_.*\\)|^(libuuid\\.so\\.1|/usr/bin/python)$
%package agent %package agent
Summary: CloudStack Agent for KVM hypervisors Summary: CloudStack Agent for KVM hypervisors
Requires: (openssh-clients or openssh) Requires: (openssh-clients or openssh)
Requires: java-17-openjdk Requires: (java-17-openjdk or java-21-openjdk)
Requires: (tzdata-java or timezone-java) Requires: (tzdata-java or timezone-java)
Requires: %{name}-common = %{_ver} Requires: %{name}-common = %{_ver}
Requires: libvirt Requires: libvirt
@ -142,7 +142,7 @@ The CloudStack baremetal agent
%package usage %package usage
Summary: CloudStack Usage calculation server Summary: CloudStack Usage calculation server
Requires: java-17-openjdk Requires: (java-17-openjdk or java-21-openjdk)
Requires: (tzdata-java or timezone-java) Requires: (tzdata-java or timezone-java)
Group: System Environment/Libraries Group: System Environment/Libraries
%description usage %description usage

4
scripts/installer/pre-check.sh
View File

@ -28,8 +28,8 @@ if [ -z $JAVA_MAJOR_VERSION ];then
exit 0 exit 0
fi fi
if [ "$JAVA_MAJOR_VERSION" != "17" ] && [ "$JAVA_MAJOR_VERSION" != "11" ];then if [ "$JAVA_MAJOR_VERSION" != "21" ] && [ "$JAVA_MAJOR_VERSION" != "17" ] && [ "$JAVA_MAJOR_VERSION" != "11" ];then
echo "ERROR: JAVA $JAVA_MAJOR_VERSION is not supported. Currently only JAVA 17 and JAVA 11 are supported." echo "ERROR: JAVA $JAVA_MAJOR_VERSION is not supported. Currently only JAVA versions 11, 17 and 21 are supported."
exit 1 exit 1
fi fi