diff --git a/buildcore.sh b/buildcore.sh index bab8ce3b0..1b41b4b1c 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -70,7 +70,7 @@ if [ -z "$UP" ]; then fi # These are the rpms that should be built for each kind of xcat build -ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm" +ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm xCAT-openbmc-py" ZVMBUILD="perl-xCAT xCAT-server xCAT-UI" ZVMLINK="xCAT-client xCAT xCATsn" # xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat @@ -323,7 +323,7 @@ if [ "$OSNAME" = "AIX" ]; then fi # Build the rest of the noarch rpms -for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm; do +for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm xCAT-openbmc-py; do if [[ " $EMBEDBUILD " != *\ $rpmname\ * ]]; then continue; fi if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi # do not build xCAT-buildkit on aix if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-SoftLayer" ]; then continue; fi # do not build xCAT-softlayer on aix diff --git a/makerpm-python b/makerpm-python deleted file mode 100755 index 8718e7ae5..000000000 --- a/makerpm-python +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html - -function makepythonrpm { - RPMNAME="$1" - SPEC_FILE="$RPMNAME/$RPMNAME.spec" - RPMROOT=`rpmbuild --eval '%_topdir' ${SPEC_FILE}` - mkdir -p $RPMROOT/SOURCES - tar --exclude .svn -czvf $RPMROOT/SOURCES/$RPMNAME-${VER}.tar.gz $RPMNAME - rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm - echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..." - rpmbuild --quiet -ta $RPMROOT/SOURCES/$RPMNAME-${VER}.tar.gz --define "version $VER" $REL "$EASE" - if [ $? -eq 0 ]; then - exit 0 - else - exit 1 - fi -} - -# Main code.... -OSNAME=$(uname) -VER=`cat Version` -REL="--define" -EASE='usedate 1' -rpmbuild --version > /dev/null -if [ $? -gt 0 ]; then - echo "Error: rpmbuild does not appear to be installed or working." - exit 2 -fi - -if [ -n "$1" -a "$1" = "xCAT-openbmc-py" ]; then - makepythonrpm $1 -else - echo 'Usage: makepythonrpm xCAT-openbmc-py' - exit 1 -fi -