Add xCATsn rpm to AIX build.
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5191 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		
							
								
								
									
										14
									
								
								buildcore.sh
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								buildcore.sh
									
									
									
									
									
								
							| @@ -178,11 +178,15 @@ if [ "$OSNAME" != "AIX" ]; then | ||||
| 	fi | ||||
| fi | ||||
|  | ||||
| if [ "$OSNAME" != "AIX" ]; then | ||||
| 	if $GREP -E '^[UAD] +xCATsn/' $SVNUP; then | ||||
| 	   UPLOAD=1 | ||||
| 	   rm -f $DESTDIR/xCATsn-$SHORTVER*rpm | ||||
| 	   rm -f $SRCDIR/xCATsn-$SHORTVER*rpm | ||||
| if $GREP -E '^[UAD] +xCATsn/' $SVNUP; then | ||||
|    UPLOAD=1 | ||||
|    rm -f $DESTDIR/xCATsn-$SHORTVER*rpm | ||||
|    rm -f $SRCDIR/xCATsn-$SHORTVER*rpm | ||||
| 	if [ "$OSNAME" = "AIX" ]; then | ||||
| 		./makexcatsnrpm | ||||
| 		mv $source/RPMS/*/xCATsn-$VER*rpm $DESTDIR | ||||
| 		mv $source/SRPMS/xCATsn-$VER*rpm $SRCDIR | ||||
| 	else | ||||
| 	   ./makexcatsnrpm x86_64 | ||||
| 	   mv $source/RPMS/*/xCATsn-$VER*rpm $DESTDIR | ||||
| 	   mv $source/SRPMS/xCATsn-$VER*rpm $SRCDIR | ||||
|   | ||||
| @@ -7,12 +7,15 @@ if [ "$OSNAME" = "AIX" ] | ||||
| then | ||||
|     cd `dirname $0`/xCATsn | ||||
|     echo '.svn' > /tmp/xcat-excludes | ||||
| 	echo 'upflag' >> /tmp/xcat-excludes | ||||
|  | ||||
|     tar -X /tmp/xcat-excludes -cf /opt/freeware/src/packages/SOURCES/license.tar LICENSE.html | ||||
|     gzip -f /opt/freeware/src/packages/SOURCES/license.tar | ||||
|  | ||||
|     cp xcat.conf /opt/freeware/src/packages/SOURCES | ||||
|     cp xCATSN /usr/src/$pkg/SOURCES | ||||
| #    cp xcat.conf /opt/freeware/src/packages/SOURCES | ||||
| #    cp xCATSN /usr/src/$pkg/SOURCES | ||||
|  | ||||
| 	cp xCATSN /opt/freeware/src/packages/SOURCES | ||||
|     rm -f /opt/freeware/src/packages/SRPMS/xCATsn-$VER*rpm /opt/freeware/src/packages/RPMS/ppc/xCATsn-$VER*rpm | ||||
|     cd - | ||||
|  | ||||
|   | ||||
| @@ -15,8 +15,13 @@ Source1: xcat.conf | ||||
| Source2: license.tar.gz | ||||
| Source3: xCATSN  | ||||
| Provides: xCATsn = %{version} | ||||
| Requires: xCAT-server xCAT-client  perl-xCAT perl-XML-Parser | ||||
| Conflicts: xCAT-2  | ||||
| Requires: xCAT-server xCAT-client perl-xCAT  | ||||
|  | ||||
| %ifos linux | ||||
| Requires: perl-XML-Parser | ||||
| %endif | ||||
|  | ||||
| Conflicts: xCAT | ||||
|  | ||||
| %ifos linux | ||||
| # yaboot-xcat is pulled in so any SN can manage ppc nodes | ||||
| @@ -53,6 +58,8 @@ tar -xf license.tar | ||||
| %build | ||||
|  | ||||
| %install | ||||
|  | ||||
| %ifos linux | ||||
| mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d | ||||
| mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/ | ||||
| mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/ | ||||
| @@ -63,7 +70,11 @@ cp %{SOURCE3} $RPM_BUILD_ROOT/etc/xCATSN | ||||
|  | ||||
| mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT | ||||
| cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT | ||||
|  | ||||
| %else | ||||
| mkdir -p $RPM_BUILD_ROOT/etc/ | ||||
| mkdir -p $RPM_BUILD_ROOT/opt/xcat/ | ||||
| cp %{SOURCE3} $RPM_BUILD_ROOT/etc/xCATSN | ||||
| %endif | ||||
|  | ||||
| %post | ||||
|  | ||||
| @@ -76,7 +87,7 @@ if [ -f /etc/xCATMN ]; then | ||||
|   rm  /etc/xCATMN | ||||
| fi | ||||
|  | ||||
|  | ||||
| %ifos linux | ||||
| # start xcatd | ||||
|     chkconfig httpd on | ||||
|     if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image | ||||
| @@ -85,6 +96,7 @@ fi | ||||
| 		/etc/init.d/httpd start | ||||
| 	fi | ||||
|     echo "xCATsn is now installed" | ||||
| %endif | ||||
| fi | ||||
|  | ||||
| %clean | ||||
| @@ -92,7 +104,9 @@ fi | ||||
| %files | ||||
| %{prefix} | ||||
| # one for sles, one for rhel. yes, it's ugly... | ||||
| %ifos linux | ||||
| /etc/httpd/conf.d/xcat.conf | ||||
| /etc/apache2/conf.d/xcat.conf | ||||
| %endif | ||||
| /etc/xCATSN | ||||
| %defattr(-,root,root) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user