Add --nodeps to xCAT-server in instxcat for aix
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4843 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		
							
								
								
									
										29
									
								
								buildcore.sh
									
									
									
									
									
								
							
							
						
						
									
										29
									
								
								buildcore.sh
									
									
									
									
									
								
							@@ -102,10 +102,17 @@ if [ -z "$SVNUP" ]; then
 | 
			
		||||
	svn up > $SVNUP
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# If anything has changed, we should rebuild perl-xCAT
 | 
			
		||||
BUILDIT=0
 | 
			
		||||
if ! $GREP 'At revision' $SVNUP; then
 | 
			
		||||
   BUILDIT=1
 | 
			
		||||
# If anything has changed, we should always rebuild perl-xCAT
 | 
			
		||||
if ! $GREP 'At revision' $SVNUP; then		# Use to be:  $GREP perl-xCAT $SVNUP; then
 | 
			
		||||
   UPLOAD=1
 | 
			
		||||
   ./makeperlxcatrpm
 | 
			
		||||
   rm -f $DESTDIR/perl-xCAT*rpm
 | 
			
		||||
   rm -f $SRCDIR/perl-xCAT*rpm
 | 
			
		||||
   mv $source/RPMS/$NOARCH/perl-xCAT-$VER*rpm $DESTDIR/
 | 
			
		||||
   mv $source/SRPMS/perl-xCAT-$VER*rpm $SRCDIR/
 | 
			
		||||
fi
 | 
			
		||||
if [ "$OSNAME" = "AIX" ]; then
 | 
			
		||||
	echo "rpm -Uvh perl-xCAT-$VER-*rpm" >> $DESTDIR/instxcat
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if $GREP xCAT-client $SVNUP; then
 | 
			
		||||
@@ -121,18 +128,6 @@ if [ "$OSNAME" = "AIX" ]; then
 | 
			
		||||
	echo "rpm -Uvh xCAT-client-$VER-*rpm" > $DESTDIR/instxcat
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if [ $BUILDIT -eq 1 ]; then		# Use to be:  $GREP perl-xCAT $SVNUP; then
 | 
			
		||||
   UPLOAD=1
 | 
			
		||||
   ./makeperlxcatrpm
 | 
			
		||||
   rm -f $DESTDIR/perl-xCAT*rpm
 | 
			
		||||
   rm -f $SRCDIR/perl-xCAT*rpm
 | 
			
		||||
   mv $source/RPMS/$NOARCH/perl-xCAT-$VER*rpm $DESTDIR/
 | 
			
		||||
   mv $source/SRPMS/perl-xCAT-$VER*rpm $SRCDIR/
 | 
			
		||||
fi
 | 
			
		||||
if [ "$OSNAME" = "AIX" ]; then
 | 
			
		||||
	echo "rpm -Uvh perl-xCAT-$VER-*rpm" >> $DESTDIR/instxcat
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if $GREP xCAT-UI $SVNUP; then
 | 
			
		||||
   UPLOAD=1
 | 
			
		||||
   rm -f $DESTDIR/xCAT-UI*rpm
 | 
			
		||||
@@ -154,7 +149,7 @@ if $GREP xCAT-server $SVNUP; then
 | 
			
		||||
   mv $source/SRPMS/xCAT-server-$VER*rpm $SRCDIR
 | 
			
		||||
fi
 | 
			
		||||
if [ "$OSNAME" = "AIX" ]; then
 | 
			
		||||
	echo "rpm -Uvh xCAT-server-$VER-*rpm" >> $DESTDIR/instxcat
 | 
			
		||||
	echo "rpm -Uvh --nodeps xCAT-server-$VER-*rpm" >> $DESTDIR/instxcat
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if $GREP xCAT-rmc $SVNUP; then
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user