From c6e09479e79d2048eac6ab5eb87bf88e9571693c Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Sun, 23 Aug 2015 23:26:50 -0400 Subject: [PATCH] remove some old code --- builddep.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/builddep.sh b/builddep.sh index 353f32655..90269963e 100755 --- a/builddep.sh +++ b/builddep.sh @@ -5,11 +5,7 @@ # all relevant architectures from the src & spec files in svn. # When running this script to package xcat-dep: -# - You need to install gsa-client on the build machine. -# - You probably want to put root's pub key from the build machine onto sourceforge for -# the upload user listed below, so you don't have to keep entering pw's. You can do this -# at https://xcat.org/setting/ssh -# - Also make sure createrepo is installed on the build machine +# - Make sure createrepo is installed on the build machine # Usage: builddep.sh [attr=value attr=value ...] # DESTDIR= - the dir to place the dep tarball in. The default is ../../../xcat-dep, relative @@ -19,7 +15,6 @@ # VERBOSE=1 - to see lots of verbose output # you can change this if you need to -UPLOADUSER=litingt USER=xcat TARGET_MACHINE=xcat.org @@ -45,9 +40,7 @@ else fi # this is needed only when we are transitioning the yum over to frs -#YUMREPOURL1="http://xcat.sourceforge.net/yum" YUMREPOURL1="http://xcat.org/yum" -#YUMREPOURL2="https://sourceforge.net/projects/xcat/files/yum" YUMREPOURL2="http://xcat.org/files/yum" if [ "$FRSYUM" != 0 ]; then YUMDIR=$FRS @@ -256,16 +249,12 @@ else links="-l" fi echo "Uploading RPMs from xcat-dep to $YUMDIR/$YUM/ ..." -#while [ $((i+=1)) -le 5 ] && ! rsync $links -ruv --delete xcat-dep $UPLOADUSER,xcat@web.sourceforge.net:$YUMDIR/$YUM/ -#while [ $((i+=1)) -le 5 ] && ! rsync $links -ruv --delete xcat-dep xcat@xcat.org:$YUMDIR/$YUM/ while [ $((i+=1)) -le 5 ] && ! rsync $links -ruv --delete xcat-dep $USER@$TARGET_MACHINE:$YUMDIR/$YUM/ do : ; done # Upload the tarball to the SF FRS Area i=0 echo "Uploading $DFNAME to $FRS/xcat-dep/$FRSDIR/ ..." -#while [ $((i+=1)) -le 5 ] && ! rsync -v $DFNAME $UPLOADUSER,xcat@web.sourceforge.net:$FRS/xcat-dep/$FRSDIR/ -#while [ $((i+=1)) -le 5 ] && ! rsync -v $DFNAME xcat@xcat.org:$FRS/xcat-dep/$FRSDIR/ while [ $((i+=1)) -le 5 ] && ! rsync -v $DFNAME $USER@$TARGET_MACHINE:$FRS/xcat-dep/$FRSDIR/ do : ; done @@ -276,8 +265,6 @@ sed "6 iThe latest xcat-dep tar ball is ${DFNAME}" -i README i=0 echo "Uploading README to $FRS/xcat-dep/$FRSDIR/ ..." -#while [ $((i+=1)) -le 5 ] && ! rsync -v README $UPLOADUSER,xcat@web.sourceforge.net:$FRS/xcat-dep/$FRSDIR/ -#while [ $((i+=1)) -le 5 ] && ! rsync -v README xcat@xcat.org:$FRS/xcat-dep/$FRSDIR/ while [ $((i+=1)) -le 5 ] && ! rsync -v README $USER@$TARGET_MACHINE:$FRS/xcat-dep/$FRSDIR/ do : ; done