diff --git a/mkAIXdeps b/mkAIXdeps index fa5b7cf55..b4de96eba 100755 --- a/mkAIXdeps +++ b/mkAIXdeps @@ -33,7 +33,9 @@ cd $RPMDIR # build tar.gz for default required RPMs and a second tar.gz for mysql # create a simple install script -echo "# xCAT on AIX - prerequisite install script" > $RPMDIR/instoss +echo "#!/bin/sh" > $RPMDIR/instoss +echo "# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html" >> $RPMDIR/instoss +echo "# xCAT on AIX - prerequisite install script" >> $RPMDIR/instoss cp /opt/freeware/src/packages/RPMS/ppc/perl-DBI-1.55-1.aix5.3.ppc.rpm $RPMDIR/ echo "rpm -Uvh perl-DBI-1.55-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss @@ -45,13 +47,16 @@ cp /opt/freeware/src/packages/RPMS/ppc/perl-DBD-SQLite-1.13-1.aix5.3.ppc.rpm $RP echo "rpm -Uvh perl-DBD-SQLite-1.13-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss cp /opt/freeware/src/packages/RPMS/ppc/tcl-8.4.7-3.aix5.1.ppc.rpm $RPMDIR/ -echo "rpm -Uvh tcl-8.4.7-3.aix5.1.ppc.rpm" >> $RPMDIR/instoss - cp /opt/freeware/src/packages/RPMS/ppc/tk-8.4.7-3.aix5.1.ppc.rpm $RPMDIR/ -echo "rpm -Uvh tk-8.4.7-3.aix5.1.ppc.rpm" >> $RPMDIR/instoss - cp /opt/freeware/src/packages/RPMS/ppc/expect-5.42.1-3.aix5.1.ppc.rpm $RPMDIR/ -echo "rpm -Uvh expect-5.42.1-3.aix5.1.ppc.rpm" >> $RPMDIR/instoss + +echo "# don't try to install tcl, tk, or expect if they are already installed!" >> $RPMDIR/instoss +echo "lslpp -l | grep expect.base > /dev/null 2>&1" >> $RPMDIR/instoss +echo "if [ \$? -gt 0 ]; then" >> $RPMDIR/instoss +echo " rpm -Uvh tcl-8.4.7-3.aix5.1.ppc.rpm" >> $RPMDIR/instoss +echo " rpm -Uvh tk-8.4.7-3.aix5.1.ppc.rpm" >> $RPMDIR/instoss +echo " rpm -Uvh expect-5.42.1-3.aix5.1.ppc.rpm" >> $RPMDIR/instoss +echo "fi" >> $RPMDIR/instoss cp /opt/freeware/src/packages/RPMS/ppc/conserver-8.1.16-2.aix5.3.ppc.rpm $RPMDIR/ echo "rpm -Uvh conserver-8.1.16-2.aix5.3.ppc.rpm" >> $RPMDIR/instoss diff --git a/mkAIXsnap b/mkAIXsnap index 93af37b58..8ee62ce96 100755 --- a/mkAIXsnap +++ b/mkAIXsnap @@ -65,7 +65,7 @@ echo "rpm -Uvh xCAT-client-$VER-*rpm" >> $RPMDIR/instxcat ./makeserverrpm mv /opt/freeware/src/packages/RPMS/ppc/xCAT-server-$VER-*rpm $RPMDIR/ -echo "rpm -Uvh xCAT-server-$VER-*rpm" >> $RPMDIR/instxcat +echo "rpm -Uvh --nodeps xCAT-server-$VER-*rpm" >> $RPMDIR/instxcat ./makexcatrpm mv /opt/freeware/src/packages/RPMS/ppc/xCAT-$VER-*rpm $RPMDIR/