2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-31 07:18:25 +00:00

Skip building non-x86, also fix the server build

For this branch, we don't build anything but x86.
Also, previous commit had a mistake in the path.
This commit is contained in:
Jarrod Johnson
2017-06-30 10:04:41 -04:00
parent 3cb6e44555
commit e6bd554b66
3 changed files with 4 additions and 4 deletions

View File

@@ -1 +1 @@
snap000000000000
snap201706301004

View File

@@ -377,7 +377,7 @@ for rpmname in xCAT xCATsn; do
./makerpm $rpmname "$EMBED"
if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi
else
for arch in x86_64 ppc64 ppc64le s390x; do
for arch in x86_64; do # ppc64 ppc64le s390x; do
if [ "$rpmname" = "xCAT-OpenStack" -a "$arch" != "x86_64" ] || [ "$rpmname" = "xCAT-OpenStack-baremetal" -a "$arch" != "x86_64" ] ; then continue; fi # only bld openstack for x86_64 for now
./makerpm $rpmname $arch "$EMBED"
if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname-$arch"; fi

View File

@@ -203,8 +203,8 @@ chmod 755 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples
chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples/*
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/OPENBMC.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/xcat/plugins/docker.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/xcat/plugins/openbmc.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/docker.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/openbmc.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/fsp.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hmc.pm