xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-05-02 13:07:46 +00:00
Code Issues Releases Wiki Activity

fix: Pull xCAT-genesis-scripts based on the arch

Browse Source 
Signed-off-by: Daniel Hilst Selli <392820+dhilst@users.noreply.github.com>
This commit is contained in:
Daniel Hilst Selli
2026-03-18 18:22:37 -03:00
parent ee87e90099
commit d7e8ec9607
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT/xCAT.spec
View File

@@ -35,14 +35,26 @@ Requires: xCAT-server = 4:%{version}-%{release}
%define s390x %(if [ "$s390x" = "1" ];then echo 1; else echo 0; fi)
%define nots390x %(if [ "$s390x" = "1" ];then echo 0; else echo 1; fi)
# Match xCAT-genesis-scripts package naming by build architecture.
%ifarch i386 i586 i686 x86
%define genesistarch x86
%endif
%ifarch x86_64
%define genesistarch x86_64
%endif
%ifarch ppc ppc64 ppc64le
%define genesistarch ppc64
%endif
%ifarch aarch64
%define genesistarch aarch64
%endif
# Define a different location for various httpd configs in s390x mode
%define httpconfigdir %(if [ "$s390x" = "1" ];then echo "xcathttpdsave"; else echo "xcat"; fi)
%if %nots390x
Requires: xCAT-probe = 4:%{version}-%{release}
Requires: xCAT-genesis-scripts-x86_64 = 1:%{version}-%{release}
# Disabling temporary for testing in x86_64, no ppc build yet
# Requires: xCAT-genesis-scripts-ppc64 = 1:%{version}-%{release}
Requires: xCAT-genesis-scripts-%{genesistarch} = 1:%{version}-%{release}
%endif
Requires: rsync
@@ -70,10 +82,11 @@ Requires: goconserver >= 0.3.3
#support mixed cluster
%if %nots390x
Requires: elilo-xcat xnba-undi
Requires: elilo-xcat
%endif
%ifarch i386 i586 i686 x86 x86_64
Requires: xnba-undi
Requires: syslinux-xcat
Requires: ipmitool-xcat >= 1.8.17-1
%endif

17
xCATsn/xCATsn.spec
View File

@@ -21,8 +21,20 @@ Requires: perl-DBD-SQLite
Requires: xCAT-client = 4:%{version}-%{release}
Requires: xCAT-server = 4:%{version}-%{release}
Requires: xCAT-probe = 4:%{version}-%{release}
# Match xCAT-genesis-scripts package naming by build architecture.
%ifarch i386 i586 i686 x86
Requires: xCAT-genesis-scripts-x86 = 1:%{version}-%{release}
%endif
%ifarch x86_64
Requires: xCAT-genesis-scripts-x86_64 = 1:%{version}-%{release}
Requires: xCAT-genesis-scripts-ppc64 = 1:%{version}-%{release}
%endif
%ifarch ppc ppc64 ppc64le
Requires: xCAT-genesis-scripts-ppc64 = 1:%{version}-%{release}
%endif
%ifarch aarch64
Requires: xCAT-genesis-scripts-aarch64 = 1:%{version}-%{release}
%endif
Conflicts: xCAT
@@ -53,10 +65,11 @@ Requires: goconserver >= 0.3.3
#support mixed cluster
%ifnarch s390x
Requires: elilo-xcat xnba-undi
Requires: elilo-xcat
%endif
%ifarch i386 i586 i686 x86 x86_64
Requires: xnba-undi
Requires: syslinux-xcat
Requires: ipmitool-xcat >= 1.8.17-1
%endif