From 6e014cc6df6e72ab5ece7713837a23fa205e0632 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 9 Jan 2013 22:48:54 +0000
Subject: [PATCH] added xCAT-genesis-scripts to xcat-core build

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14840 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 buildcore.sh | 39 ++++++++++++++++++++-------------------
 makerpm      |  7 ++++---
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/buildcore.sh b/buildcore.sh
index 1fbfe1832..8c7b79a3a 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -40,11 +40,11 @@ UPLOADUSER=bp-sawyers
 FRS=/home/frs/project/x/xc/xcat
 
 # These are the rpms that should be built for each kind of xcat build
-ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT xCATsn"
+ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts"
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
 PCMBUILD="xCAT"
-PCMLINK="perl-xCAT xCAT-client xCAT-server xCAT-buildkit"
+PCMLINK="perl-xCAT xCAT-client xCAT-server xCAT-buildkit xCAT-genesis-scripts"
 # Note: for FSM, the FlexCAT rpm is built separately from gsa/git
 FSMBUILD="perl-xCAT xCAT-client xCAT-server"
 FSMLINK=""
@@ -221,23 +221,24 @@ for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xC
 	fi
 done
 
-# We are not building nbroot any more.  Instead, we manually build xCAT-genesis and put it in xcat-dep.
-#if [ "$OSNAME" != "AIX" -a "$EMBED" != "zvm" ]; then
-#	if grep -v nbroot2 $SVNUP|$GREP xCAT-nbroot || [ "$BUILDALL" == 1 ]; then
-#		UPLOAD=1
-#		ORIGFAILEDRPMS="$FAILEDRPMS"
-#		for arch in x86_64 x86 ppc64; do
-#			./makerpm xCAT-nbroot-core $arch
-#			if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS xCAT-nbroot-core-$arch"; fi
-#		done
-#		if [ "$FAILEDRPMS" = "$ORIGFAILEDRPMS" ]; then	# all succeeded
-#			rm -f $DESTDIR/xCAT-nbroot-core*rpm
-#			rm -f $SRCDIR/xCAT-nbroot-core*rpm
-#			mv $source/RPMS/noarch/xCAT-nbroot-core-*rpm $DESTDIR
-#			mv $source/SRPMS/xCAT-nbroot-core-*rpm $SRCDIR
-#		fi
-#	fi
-#fi
+# Build xCAT-genesis-scripts for xcat-core.  xCAT-genesis-base gets built by hand and put in xcat-dep.
+# The mknb cmd combines them at install time.
+if [ "$OSNAME" != "AIX" ]; then
+	if [[ " $EMBEDBUILD " = *\ xCAT-genesis-scripts\ * ]]; then
+		if $GREP xCAT-genesis-scripts $SVNUP || [ "$BUILDALL" == 1 ]; then
+			UPLOAD=1
+			ORIGFAILEDRPMS="$FAILEDRPMS"
+			./makerpm xCAT-genesis-scripts x86_64 "$EMBED"
+			if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS xCAT-genesis-scripts-x86_64"; fi
+			if [ "$FAILEDRPMS" = "$ORIGFAILEDRPMS" ]; then	# all succeeded
+				rm -f $DESTDIR/xCAT-genesis-scripts*rpm
+				rm -f $SRCDIR/xCAT-genesis-scripts*rpm
+				mv $source/RPMS/noarch/xCAT-genesis-scripts-*rpm $DESTDIR
+				mv $source/SRPMS/xCAT-genesis-scripts-*rpm $SRCDIR
+			fi
+		fi
+	fi
+fi
 
 # Build the xCAT and xCATsn rpms for all platforms
 for rpmname in xCAT xCATsn; do
diff --git a/makerpm b/makerpm
index 177955450..a85e63918 100755
--- a/makerpm
+++ b/makerpm
@@ -147,6 +147,7 @@ function makegenesisscripts {
 
 	RPMNAME="$1"
 	ARCH="$2"
+	TARGET="--target $ARCH"
 	cd `dirname $0`/
 	tar --exclude .svn -cjf $RPMROOT/SOURCES/$RPMNAME.tar.bz2 $DIR
 	cp $DIR/LICENSE.html $RPMROOT/BUILD
@@ -154,7 +155,7 @@ function makegenesisscripts {
 	cd - >/dev/null
 	rm -f $RPMROOT/SRPMS/$RPMNAME-$ARCH-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$ARCH-$VER*rpm
 	echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$ARCH-$VER-snap*.noarch.rpm $EMBEDTXT..."
-	rpmbuild $QUIET -ba $DIR/$RPMNAME.spec
+	rpmbuild $QUIET -ba $DIR/$RPMNAME.spec $TARGET
 }
 
 
@@ -207,8 +208,8 @@ elif [ "$1" = "xCAT-nbroot" -o "$1" = "xCAT-nbroot-core" ]; then
 	exportEmbed $3
 	makenbroot xCAT-nbroot-core $2
 elif [ "$1" = "xCAT-genesis-builder" ]; then
-	exportEmbed $3
-	makegenesis $1 $2
+	exportEmbed $2
+	makegenesis $1
 elif [ "$1" = "xCAT-genesis-scripts" ]; then
 	exportEmbed $3
 	makegenesisscripts $1 $2