From 93fc27b4f209f0bf3705c7a6ddaa8793e7478e13 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 22 Mar 2012 09:43:56 +0000
Subject: [PATCH] Have perl-DBD-DB2Lite not automatically installed from
 xcat-dep on aix

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11942 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 builddep.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/builddep.sh b/builddep.sh
index 80935b693..8bca0258e 100755
--- a/builddep.sh
+++ b/builddep.sh
@@ -126,7 +126,7 @@ if [ "$OSNAME" != "AIX" ]; then
 fi
 
 if [ "$OSNAME" == "AIX" ]; then
-	# Build the instoss file
+	# Build the instoss file ------------------------------------------
 
 	cat >instoss << 'EOF'
 #!/bin/ksh
@@ -146,20 +146,22 @@ else
 fi
 cd $OSVER
 # Have to install rpms 1 at a time, since some may be already installed.
-# The only interdependency between the dep rpms so far is that net-snmp requires bash
-#  pyodbc is dependent on unixODBC
+# The only interdependency between the dep rpms so far is that net-snmp requires bash, and
+# pyodbc requires unixODBC.  (The bash dependency is taken care of automatically because it
+# comes earlier in the alphabet.)
 rpm -Uvh unixODBC*
-for i in `ls *.rpm|grep -v -E '^tcl-|^tk-|^expect-|^unixODBC-|^xCAT-UI-deps'`; do
+for i in `ls *.rpm|grep -v -E '^tcl-|^tk-|^expect-|^unixODBC-|^xCAT-UI-deps|^perl-DBD-DB2Lite'`; do
 	if [ "$i" == "perl-Net-DNS-0.66-1.aix5.3.ppc.rpm" ]; then
 		opts="--nodeps"
 	else
 		opts=""
 	fi
-	# this next if stmt means: if i does not start with perl-DBD-DB2
+	
+	# just in case we need it sometime, this next if stmt would mean: if it does not start with perl-DBD-DB2
 	#if [ "${i#perl-DBD-DB2}" == "$i" ]; then
-		echo rpm -Uvh $opts $i
-		rpm -Uvh $opts $i
-	#fi
+	
+	echo rpm -Uvh $opts $i
+	rpm -Uvh $opts $i
 done
 # don't try to install tcl, tk, or expect if they are already installed!
 lslpp -l | grep expect.base > /dev/null 2>&1
@@ -174,7 +176,7 @@ if [ $? -gt 0 ]; then
 	fi
 fi
 EOF
-# end of instoss file content
+# end of instoss file content ---------------------------------------------
 
 
 	chmod +x instoss