From 908acba7265dc6a11c954a7d53fa7954cc6dcb54 Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 26 Mar 2009 17:03:55 +0000
Subject: [PATCH] Move bundle files to core-aix

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3000 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 mkAIXdeps |  8 --------
 mkAIXsnap | 25 ++++++++++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/mkAIXdeps b/mkAIXdeps
index e7d20e613..fa5b7cf55 100755
--- a/mkAIXdeps
+++ b/mkAIXdeps
@@ -98,19 +98,11 @@ echo "rpm -Uvh net-snmp-perl-5.4.2.1-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss
 # get the OSS README file
 cp ./../../../xcat-dep/trunk/AIX/README $RPMDIR/
 
-# add the bundle files to the dep packages
-cp $BLDTOP/xCATaixSN.bnd $RPMDIR/
-cp $BLDTOP/xCATaixSSH.bnd $RPMDIR/
-cp $BLDTOP/xCATaixSSL.bnd $RPMDIR/
-
 # make the default required RPM tar.gz file
 ls *.rpm > $RPMDIR/flist
 chmod +x $RPMDIR/instoss
 echo "README" >> $RPMDIR/flist
 echo "instoss" >> $RPMDIR/flist
-echo "xCATaixSN.bnd" >> $RPMDIR/flist
-echo "xCATaixSSH.bnd" >> $RPMDIR/flist
-echo "xCATaixSSL.bnd" >> $RPMDIR/flist
 tar -cvf $RPMDIR/dep-aix-$VER-$SNAP.tar -L $RPMDIR/flist
 gzip $RPMDIR/dep-aix-$VER-$SNAP.tar
 
diff --git a/mkAIXsnap b/mkAIXsnap
index 815836fa0..be3dee90e 100755
--- a/mkAIXsnap
+++ b/mkAIXsnap
@@ -74,18 +74,21 @@ echo "rpm -Uvh xCAT-$VER-*rpm" >> $RPMDIR/instxcat
 #
 # create the tar.gz file to upload
 #
+chmod +x $RPMDIR/instxcat
+
+# add to flist
+echo "instxcat" > $RPMDIR/flist
+
+# add the service node bundle files 
+cp $BLDTOP/xCATaixSN.bnd $RPMDIR/
+cp $BLDTOP/xCATaixSSH.bnd $RPMDIR/
+cp $BLDTOP/xCATaixSSL.bnd $RPMDIR/
+echo "xCATaixSN.bnd" >> $RPMDIR/flist
+echo "xCATaixSSH.bnd" >> $RPMDIR/flist
+echo "xCATaixSSL.bnd" >> $RPMDIR/flist
+
 cd $RPMDIR
-chmod +x ./instxcat
-
-# add all the file names to flist
-echo "instxcat" > ./flist
-ls *.rpm >> ./flist
-
-# add the service node bundle files to the tar file
-#cp $BLDTOP/xCATaixSN.bnd $RPMDIR
-#cp $BLDTOP/xCATaixSSH.bnd $RPMDIR 
-#echo "xCATaixSN.bnd" >> ./flist
-#echo "xCATaixSSH.bnd" >> ./flist
+ls *.rpm >> flist
 
 #TIME=`date +%Y%m%d%H%M`
 tar -cvf core-aix-snap.tar -L flist