From e6bd554b66bb5f3b39482b25b0c4ec1a588daf19 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 30 Jun 2017 10:04:41 -0400
Subject: [PATCH] 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.
---
 Release                      | 2 +-
 buildcore.sh                 | 2 +-
 xCAT-server/xCAT-server.spec | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Release b/Release
index a33a0ed75..1becf3976 100644
--- a/Release
+++ b/Release
@@ -1 +1 @@
-snap000000000000
+snap201706301004
diff --git a/buildcore.sh b/buildcore.sh
index e9ce9d053..5d0bdf593 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -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
diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index 0f6ab55b2..41c8a2734 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -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