diff --git a/makeclientrpm b/makeclientrpm index 1d57461d6..451bf48b2 100755 --- a/makeclientrpm +++ b/makeclientrpm @@ -5,11 +5,11 @@ OSNAME=$(uname) if [ "$OSNAME" = "AIX" ] then - tar -cvf xCAT-client-2.0.tar xCAT-client-2.0 - gzip xCAT-client-2.0.tar - cp xCAT-client-2.0.tar.gz /opt/freeware/src/packages/SOURCES + echo '.svn' > /tmp/xcat-excludes + tar -X /tmp/xcat-excludes -cvf /opt/freeware/src/packages/SOURCES/xCAT-client-2.0.tar xCAT-client-2.0 + gzip /opt/freeware/src/packages/SOURCES/xCAT-client-2.0.tar cd ./xCAT-client-2.0 - rm /opt/freeware/src/packages/RPMS/ppc/xCAT-client-2.0*rpm + rm -f /opt/freeware/src/packages/SRPMS/xCAT-client-2.0*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-client-2.0*rpm rpm -ba xCAT-client.spec #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-client-2.0*rpm @@ -22,8 +22,8 @@ else pkg="packages" fi - tar --exclude .svn -czvf xCAT-client-2.0.tar.gz xCAT-client-2.0; - rm /usr/src/$pkg/RPMS/noarch/xCAT-client-2.0*rpm - rpmbuild -ta xCAT-client-2.0.tar.gz ; + tar --exclude .svn -czvf /usr/src/$pkg/SOURCES/xCAT-client-2.0.tar.gz xCAT-client-2.0; + rm -f /usr/src/$pkg/SRPMS/xCAT-client-2.0*rpm /usr/src/$pkg/RPMS/noarch/xCAT-client-2.0*rpm + rpmbuild -ta /usr/src/$pkg/SOURCES/xCAT-client-2.0.tar.gz ; #rpm -Uvh /usr/src/$pkg/RPMS/noarch/xCAT-client-2.0*rpm fi diff --git a/makeperlxcatrpm b/makeperlxcatrpm index 4b106140a..4002a30a3 100755 --- a/makeperlxcatrpm +++ b/makeperlxcatrpm @@ -4,12 +4,12 @@ OSNAME=$(uname) if [ "$OSNAME" = "AIX" ] then - - tar -cvf perl-xCAT-2.0.tar perl-xCAT-2.0 - gzip perl-xCAT-2.0.tar - cp perl-xCAT-2.0.tar.gz /opt/freeware/src/packages/SOURCES + + echo '.svn' > /tmp/xcat-excludes + tar -X /tmp/xcat-excludes -cvf /opt/freeware/src/packages/SOURCES/perl-xCAT-2.0.tar perl-xCAT-2.0 + gzip /opt/freeware/src/packages/SOURCES/perl-xCAT-2.0.tar cd ./perl-xCAT-2.0 - rm /opt/freeware/src/packages/RPMS/ppc/perl-xCAT-2.0*rpm + rm -f /opt/freeware/src/packages/SRPMS/perl-xCAT-2.0*rpm /opt/freeware/src/packages/RPMS/ppc/perl-xCAT-2.0*rpm rpm -ba perl-xCAT.spec #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/perl-xCAT-2.0*rpm @@ -21,8 +21,8 @@ else pkg="packages" fi - tar --exclude .svn -czvf perl-xCAT-2.0.tar.gz perl-xCAT-2.0/; - rm /usr/src/$pkg/RPMS/noarch/perl-xCAT-2.0*rpm - rpmbuild -ta perl-xCAT-2.0.tar.gz ; + tar --exclude .svn -czvf /usr/src/$pkg/SOURCES/perl-xCAT-2.0.tar.gz perl-xCAT-2.0/; + rm -f /usr/src/$pkg/SRPMS/perl-xCAT-2.0*rpm /usr/src/$pkg/RPMS/noarch/perl-xCAT-2.0*rpm + rpmbuild -ta /usr/src/$pkg/SOURCES/perl-xCAT-2.0.tar.gz ; #rpm -Uvh /usr/src/$pkg/RPMS/noarch/perl-xCAT-2.0*rpm fi diff --git a/makeserverrpm b/makeserverrpm index 9cff079cf..ff4d023fc 100755 --- a/makeserverrpm +++ b/makeserverrpm @@ -4,13 +4,14 @@ OSNAME=$(uname) if [ "$OSNAME" = "AIX" ] then - tar -cvf xCAT-server-2.0.tar xCAT-server-2.0 - gzip xCAT-server-2.0.tar - cp xCAT-server-2.0.tar.gz /opt/freeware/src/packages/SOURCES - cd ./xCAT-server-2.0 - rm /opt/freeware/src/packages/RPMS/ppc/xCAT-server-2.0*rpm - rpm -ba xCAT-server.spec - #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-server-2.0*rpm + + echo '.svn' > /tmp/xcat-excludes + tar -X /tmp/xcat-excludes -cvf /opt/freeware/src/packages/SOURCES/xCAT-server-2.0.tar xCAT-server-2.0 + gzip /opt/freeware/src/packages/SOURCES/xCAT-server-2.0.tar + cd ./xCAT-server-2.0 + rm -f /opt/freeware/src/packages/SRPMS/xCAT-server-2.0*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-server-2.0*rpm + rpm -ba xCAT-server.spec + #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-server-2.0*rpm else @@ -21,8 +22,8 @@ else pkg="packages" fi - tar --exclude .svn -czvf xCAT-server-2.0.tar.gz xCAT-server-2.0; - rm /usr/src/$pkg/RPMS/noarch/xCAT-server-2.0*rpm - rpmbuild -ta xCAT-server-2.0.tar.gz ; + tar --exclude .svn -czvf /usr/src/$pkg/SOURCES/xCAT-server-2.0.tar.gz xCAT-server-2.0; + rm -f /usr/src/$pkg/SRPMS/xCAT-server-2.0*rpm /usr/src/$pkg/RPMS/noarch/xCAT-server-2.0*rpm + rpmbuild -ta /usr/src/$pkg/SOURCES/xCAT-server-2.0.tar.gz ; #rpm -Uvh /usr/src/$pkg/RPMS/noarch/xCAT-server-2.0*rpm fi diff --git a/makewebrpm b/makewebrpm new file mode 100644 index 000000000..73a77945f --- /dev/null +++ b/makewebrpm @@ -0,0 +1,34 @@ +#!/bin/ksh + +OSNAME=$(uname) +version='2.0' + +if [ "$OSNAME" = "AIX" ] +then + echo '.svn' > /tmp/xcat-excludes + tar -X /tmp/xcat-excludes -cvf /opt/freeware/src/packages/SOURCES/xCAT-web.tar xCAT-web + gzip /opt/freeware/src/packages/SOURCES/xCAT-web.tar + cd ./xCAT-web + rm -f /opt/freeware/src/packages/SRPMS/xCAT-web*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-web*rpm + rpm -ba xCAT-web.spec + #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-web*rpm + +else + if [ -f /etc/redhat-release ] + then + pkg="redhat" + else + pkg="packages" + fi + source=$PWD + + # Trying to avoid having the version # (2.0) on the xCAT-web dir name in svn + set -x + cd /usr/src/$pkg/SOURCES + rm -f xCAT-web-$version; ln -s $source/xCAT-web xCAT-web-$version # have to make tar think it is in xCAT-web-2.0 + rm -f xCAT-web-$version.tar.gz + tar -czhf xCAT-web-$version.tar.gz --exclude=.svn --exclude=.project xCAT-web-$version + rm -f /usr/src/$pkg/SRPMS/xCAT-web-$version*rpm /usr/src/$pkg/RPMS/noarch/xCAT-web-$version*rpm + rpmbuild -ta xCAT-web-$version.tar.gz + #rpm -Uvh /usr/src/$pkg/RPMS/noarch/xCAT-web-$version*rpm +fi diff --git a/xCAT-web/manage/dsh.php b/xCAT-web/manage/dsh.php index 51171a1c3..41e9704da 100644 --- a/xCAT-web/manage/dsh.php +++ b/xCAT-web/manage/dsh.php @@ -71,55 +71,55 @@ if (!isset($_REQUEST['noderange'])) { to /tmp on the nodes and executed from there.)