- check for upper-case alpha|beta|pre|rc too

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 20cfb43e183b47674f8bcff58627d76e9034fa59..0c5d02e050a04f72ba1aca4e883baafdbfe1fed4 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -77,8 +77,11 @@ DEF_NICE_LEVEL=0
 
 FAIL_IF_NO_SOURCES="yes"
 
-GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES --inet"
-GETURI2="wget -c -nd -t$WGET_RETRIES --inet"
+wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet"
+wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused"
+
+GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS"
+GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS"
 GETLOCAL="cp -a"
 
 if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then
@@ -136,6 +139,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
                        - setup \$CVSROOT,
        --define <macro> <value>
                        - define a macro <macro> with value <value>,
+       --nodeps        - rpm won't check any dependences
        -g, --get       - get <package>.spec and all related files from
                          CVS repo or HTTP/FTP,
        -h, --help      - this message,
@@ -207,7 +211,7 @@ cache_rpm_dump () {
 
 rpm_dump () {
     if [ -z "$rpm_dump_cache" ] ; then
-        echo "internal error: cache_rpm_dump not called!" 1>&2
+       echo "internal error: cache_rpm_dump not called!" 1>&2
     fi
     echo "$rpm_dump_cache"
 }
@@ -332,7 +336,7 @@ get_spec()
            result=$?
            [ -n "$output" ] && echo "$output"
            if [ "$result" -ne "0" ]; then
-               if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out)") && [ "$retries_counter" -le "$CVS_RETRIES" ]; then
+               if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out|Unknown host)") && [ "$retries_counter" -le "$CVS_RETRIES" ]; then
                    echo "Trying again [$SPECFILE]... ($retries_counter)"
                    sleep 2
                    continue
@@ -496,7 +500,7 @@ get_files()
                        output=$(LC_ALL=C cvs $OPTIONS `nourl $i` 2>&1)
                        result=$?
                        [ -n "$output" ] && echo "$output"
-                       if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out)") && [ "$result" -ne "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; then
+                       if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out|Unknown host)") && [ "$result" -ne "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; then
                                echo "Trying again [`nourl $i`]... ($retries_counter)"
                                sleep 2
                                continue
@@ -582,7 +586,14 @@ tag_files()
     if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
        echo "Version: $PACKAGE_VERSION"
        echo "Release: $PACKAGE_RELEASE"
+       # Check whether first character of PACKAGE_NAME is legal for tag name
+       if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then
+           TAG_PREFIX=tag_
+       fi
        TAGVER=$TAG_PREFIX$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
+       # Remove #kernel.version_release from TAGVER because tagging sources
+       # could occur with different kernel-headers than kernel-headers used at build time.
+       TAGVER=$(echo "$TAGVER" | sed -e 's/#.*//g')
        if [ "$TAG_VERSION" = "yes" ]; then
            echo "CVS tag: $TAGVER"
        fi
@@ -597,7 +608,9 @@ tag_files()
 
        cd $SOURCE_DIR
        for i in $TAG_FILES; do
-           if [ -f `nourl $i` ]; then
+           # don't tag non cvs files (ie. stored on distfiles)
+           [ "`nourl $i`" != "$i" ] && continue
+           if [ -f "`nourl $i`" ]; then
                if [ "$TAG_VERSION" = "yes" ]; then
                    cvs $OPTIONS $TAGVER `nourl $i`
                fi
@@ -668,7 +681,7 @@ build_package()
 
     if [ -n "$TRY_UPGRADE" ]; then
 
-       if [ -n "FLOAT_VERSION" ]; then
+       if [ -n "$FLOAT_VERSION" ]; then
            TNOTIFY=`./pldnotify.awk $SPECFILE -n`
        else
            TNOTIFY=`./pldnotify.awk $SPECFILE`
@@ -715,7 +728,7 @@ build_package()
            echo "LASTLOG=$LOG" > $LASTLOG_FILE
        fi
        RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
-       (nice -n ${DEF_NICE_LEVEL} time $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+       (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
        RETVAL=`cat $RES_FILE`
        rm $RES_FILE
        if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -880,6 +893,10 @@ while test $# -gt 0 ; do
            shift 2
            RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
            ;;
+       --nodeps)
+           shift
+           RPMOPTS="${RPMOPTS} --nodeps"
+           ;;
        * )
            SPECFILE="`basename ${1} .spec`.spec"; shift ;;
     esac
@@ -961,6 +978,13 @@ case "$COMMAND" in
                get_files $ICONS
                parse_spec;
            fi
+           # don't fetch sources from remote locations
+           new_SOURCES=""
+           for file in $SOURCES; do
+               [ "`nourl $file`" != "$file" ] && continue
+               new_SOURCES="$new_SOURCES $file"
+           done
+           SOURCES="$new_SOURCES"
            get_files $SOURCES $PATCHES;
            tag_files "$SOURCES $PATCHES $ICONS";
        else