X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=builder.sh;h=58e90656872e663fd5d82079db481a6693df20e9;hb=80222d62805027b5ce6b79151b9b6a03df846d9b;hp=67e0215549addc98cde7ef5a98986fcfc8b1a8f9;hpb=0a302b4e7231833b0303bd0f7422035d9dd2a61c;p=packages%2Frpm-build-tools.git diff --git a/builder.sh b/builder.sh index 67e0215..58e9065 100644 --- a/builder.sh +++ b/builder.sh @@ -79,6 +79,7 @@ CVS_RETRIES=${MAX_CVS_RETRIES:-1000} CVSTAG="" RES_FILE="" +CVS_FORCE="" CVS_SERVER="cvs.pld-linux.org" DISTFILES_SERVER="://distfiles.pld-linux.org" @@ -92,6 +93,10 @@ FAIL_IF_NO_SOURCES="yes" # let get_files skip over files which are present to get those damn files fetched SKIP_EXISTING_FILES="no" +TRY_UPGRADE="" +# should the specfile be restored if upgrade failed? +REVERT_BROKEN_UPGRADE="yes" + if [ -x /usr/bin/rpm-getdeps ]; then FETCH_BUILD_REQUIRES_RPMGETDEPS="yes" else @@ -189,13 +194,11 @@ usage() if [ -n "$DEBUG" ]; then set -xv; fi echo "\ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build] - [-bb|--build-binary] [-bs|--build-source] [-u|--try-upgrade] -[{-B|--branch} ] [{-d|--cvsroot} ] [-g|--get] -[-h|--help] [--http] [{-l,--logtofile} ] [-m|--mr-proper] +[{-cf|--cvs-force}] [{-B|--branch} ] [{-d|--cvsroot} ] +[-g|--get] [-h|--help] [--http] [{-l,--logtofile} ] [-m|--mr-proper] [-q|--quiet] [--date [-r ] [{-T--tag ] -[-Tvs|--tag-version-stable] [-Tvn|--tag-version-nest] -[-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version] +[-Tvs|--tag-version-stable] [-Ts|--tag-stable] [-Tv|--tag-version] [{-Tp|--tag-prefix} ] [{-tt|--test-tag}] [-nu|--no-urls] [-v|--verbose] [--opts ] [--show-bconds] [--with/--without ] [--define ] [.spec][:cvstag] @@ -220,6 +223,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build] -B, --branch - add branch -c, --clean - clean all temporarily created files (in BUILD, SOURCES, SPECS and \$RPM_BUILD_ROOT), +-cf, --cvs-force - use -F when tagging (useful when moving branches) -d , --cvsroot - setup \$CVSROOT, --define @@ -277,12 +281,8 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build] - add cvs tag for files, -Tvs, --tag-version-stable - add cvs tags STABLE and NAME-VERSION-RELEASE for files, --Tvn, --tag-version-nest - - add cvs tags NEST and NAME-VERSION-RELEASE for files, -Ts, --tag-stable - add cvs tag STABLE for files, --Tn, --tag-nest - - add cvs tag NEST for files, -Tv, --tag-version - add cvs tag NAME-VERSION-RELEASE for files, -Tp, --tag-prefix @@ -360,10 +360,10 @@ set_spec_target() { } cache_rpm_dump () { - if [ -n "$DEBUG" ]; then - set -x; - set -v; - fi + if [ -n "$DEBUG" ]; then + set -x; + set -v; + fi update_shell_title "cache_rpm_dump" local rpm_dump @@ -432,7 +432,7 @@ EOF 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! (missing %prep?)" 1>&2 fi echo "$rpm_dump_cache" } @@ -445,7 +445,7 @@ get_icons() return fi - rpm_dump_cache="kalasaba" NODIST="yes" UPDATE5= get_files $ICONS + rpm_dump_cache="kalasaba" NODIST="yes" get_files $ICONS } parse_spec() @@ -540,8 +540,8 @@ Exit_error() exit 11 ;; esac - echo "Unknown error." - exit 100 + echo "Unknown error." + exit 100 } init_builder() @@ -625,6 +625,7 @@ find_mirror() echo "$url" } +# Warning: unpredictable results if same URL used twice src_no () { cd $SPECS_DIR @@ -634,38 +635,44 @@ src_no () head -n 1 | xargs } -src_md5 () +src_md5() { - [ X"$NO5" = X"yes" ] && return + [ "$NO5" = "yes" ] && return no=$(src_no "$1") [ -z "$no" ] && return cd $SPECS_DIR - spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::) - if [ -z "$spec_rev" ]; then - spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')" - fi - spec="$SPECFILE[0-9.,]*,$(echo $spec_rev | sed 's/\./\\./g')" - md5=$(grep -s -v '^#' additional-md5sums | \ - grep -E "[ ]$(basename "$1")[ ]+${spec}([ ,]|\$)" | \ - sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \ - grep -E '^[0-9a-f]{32}$') - if [ X"$md5" = X"" ] ; then - source_md5=`grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` - if [ ! -z "$source_md5" ] ; then - echo $source_md5; - else - # we have empty SourceX-md5, but it is still possible - # that we have NoSourceX-md5 AND NoSource: X - nosource_md5=`grep -i "#[ ]*NoSource$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` - if [ ! -z "$nosource_md5" -a ! X"`grep -i "^NoSource:[ ]*$no$" $SPECFILE`" = X"" ] ; then - echo $nosource_md5; - fi; - fi; + local md5 + + if [ -f additional-md5sums ]; then + local spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::) + if [ -z "$spec_rev" ]; then + spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')" + fi + local spec="$SPECFILE[0-9.,]*,$(echo $spec_rev | sed 's/\./\\./g')" + md5=$(grep -s -v '^#' additional-md5sums | \ + grep -E "[ ]$(basename "$1")[ ]+${spec}([ ,]|\$)" | \ + sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \ + grep -E '^[0-9a-f]{32}$') + + if [ "$md5" ]; then + if [ $(echo "$md5" | wc -l) != 1 ] ; then + echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2 + fi + echo "$md5" | tail -n 1 + return + fi + fi + + source_md5=`grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + if [ -n "$source_md5" ]; then + echo $source_md5 else - if [ $(echo "$md5" | wc -l) != 1 ] ; then - echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2 + # we have empty SourceX-md5, but it is still possible + # that we have NoSourceX-md5 AND NoSource: X + nosource_md5=`grep -i "#[ ]*NoSource$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + if [ -n "$nosource_md5" -a -n "`grep -i "^NoSource:[ ]*$no$" $SPECFILE`" ] ; then + echo $nosource_md5 fi - echo "$md5" | tail -n 1 fi } @@ -752,6 +759,80 @@ cvsup() return $result } +update_md5() +{ + if [ $# -eq 0 ]; then + return + fi + + update_shell_title "update md5" + if [ -n "$DEBUG" ]; then + set -x; + set -v; + fi + + cd "$SOURCE_DIR" + + # pass 1: check files to be fetched + local todo + local need_files + for i in "$@"; do + local fp=$(nourl "$i") + local srcno=$(src_no "$i") + if [ -n "$UPDATE5" ]; then + if [ -n "$ADD5" ]; then + [ "$fp" = "$i" ] && continue # FIXME what is this check doing? + grep -qiE '^#[ ]*Source'$srcno'-md5[ ]*:' $SPECS_DIR/$SPECFILE && continue + else + grep -qiE '^#[ ]*Source'$srcno'-md5[ ]*:' $SPECS_DIR/$SPECFILE || continue + fi + fi + if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then + need_files="$need_files $i" + fi + done + + # pass 1a: get needed files + if [ "$need_files" ]; then + get_files $need_files + fi + + # pass 2: proceed with md5 adding or updating + for i in "$@"; do + local fp=$(nourl "$i") + local srcno=$(src_no "$i") + if [ -n "$UPDATE5" ] && \ + ( ( [ -n "$ADD5" ] && echo $i | grep -q -E 'ftp://|http://|https://' && \ + [ -z "$(grep -E -i '^NoSource[ ]*:[ ]*'$i'([ ]|$)' $SPECS_DIR/$SPECFILE)" ] ) || \ + grep -q -i -E '^#[ ]*source'$srcno'-md5[ ]*:' $SPECS_DIR/$SPECFILE ) + then + echo "Updating source-$srcno md5." + md5=$(md5sum "$fp" | cut -f1 -d' ') + perl -i -ne ' + print unless /^\s*#\s*Source'$srcno'-md5\s*:/i; + print "# Source'$srcno'-md5:\t'$md5'\n" + if /^Source'$srcno'\s*:\s+/; + ' \ + $SPECS_DIR/$SPECFILE + fi + done +} + +check_md5() +{ + update_shell_title "check md5" + + for i in "$@"; do + if good_md5 "$i" && good_size "$i"; then + continue + fi + + echo "MD5 sum mismatch or 0 size. Use -U to refetch sources," + echo "or -5 to update md5 sums, if you're sure files are correct." + Exit_error err_no_source_in_repo $i + done +} + get_files() { update_shell_title "get_files" @@ -777,33 +858,34 @@ get_files() SHELL_TITLE_PREFIX="get_files[$nc/$#]" update_shell_title "$i" local fp=`nourl "$i"` - if [ -f "$fp" ] && [ "$SKIP_EXISTING_FILES" = "yes" ]; then + if [ "$SKIP_EXISTING_FILES" = "yes" ] && [ -f "$fp" ]; then continue fi - if [ -n "$UPDATE5" ]; then - if [ -n "$ADD5" ]; then - [ "$fp" = "$i" ] && continue - grep -qiE '^#[ ]*Source'$(src_no $i)'-md5[ ]*:' $SPECS_DIR/$SPECFILE && continue - else - grep -qiE '^#[ ]*Source'$(src_no $i)'-md5[ ]*:' $SPECS_DIR/$SPECFILE || continue - fi - fi + FROM_DISTFILES=0 + local srcmd5=$(src_md5 "$i") + + # we know if source/patch is present in cvs/distfiles + # - has md5 (in distfiles) + # - in cvs... ideas? + + # CHECK: local file didn't exist or always cvs up (first) requested. if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then echo "Warning: no URL given for $i" fi - if [ -z "$NODIST" ] && [ -n "$(src_md5 "$i")" ]; then + if [ -z "$NODIST" ] && [ -n "$srcmd5" ]; then if good_md5 "$i" && good_size "$i"; then - echo "$(nourl "$i") having proper md5sum already exists" + echo "$fp having proper md5sum already exists" continue fi target="$fp" url=$(distfiles_url "$i") url_attic=$(distfiles_attic_url "$i") FROM_DISTFILES=1 - if [ "`echo $url | grep -E '^(\.|/)'`" ]; then + # is $url local file? + if [[ "$url" = [./]* ]]; then update_shell_title "${GETLOCAL%% *}: $url" ${GETLOCAL} $url $target else @@ -817,7 +899,9 @@ get_files() ${GETURI2} ${OUTFILEOPT} "$target" "$url" fi fi - if ! test -s "$target"; then + + # is it empty file? + if [ ! -s "$target" ]; then rm -f "$target" if [ `echo $url_attic | grep -E '^(\.|/)'` ]; then update_shell_title "${GETLOCAL%% *}: $url_attic" @@ -834,13 +918,14 @@ get_files() fi fi fi - if test -s "$target"; then + + if [ -s "$target" ]; then cvsignore_df $target else rm -f "$target" FROM_DISTFILES=0 fi - elif [ "$NOCVS" != "yes" -a -z "$(src_md5 "$i")" ]; then + elif [ "$NOCVS" != "yes" -a -z "$srcmd5" ]; then if [ $# -gt 1 ]; then get_files_cvs="$get_files_cvs $fp" update_shell_title "$fp (will cvs up later)" @@ -869,24 +954,13 @@ get_files() fi fi - srcno=$(src_no $i) + + # the md5 check must be moved elsewhere as if we've called from update_md5 the md5 is wrong. if [ ! -f "$fp" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then Exit_error err_no_source_in_repo $i; - elif [ -n "$UPDATE5" ] && \ - ( ( [ -n "$ADD5" ] && echo $i | grep -q -E 'ftp://|http://|https://' && \ - [ -z "$(grep -E -i '^NoSource[ ]*:[ ]*'$i'([ ]|$)' $SPECS_DIR/$SPECFILE)" ] ) || \ - grep -q -i -E '^#[ ]*source'$(src_no $i)'-md5[ ]*:' $SPECS_DIR/$SPECFILE ) - then - echo "Updating source-$srcno md5." - md5=$(md5sum "$fp" | cut -f1 -d' ') - perl -i -ne ' - print unless /^\s*#\s*Source'$srcno'-md5\s*:/i; - print "# Source'$srcno'-md5:\t'$md5'\n" - if /^Source'$srcno'\s*:\s+/; - ' \ - $SPECS_DIR/$SPECFILE fi + # we check md5 here just only to refetch immediately if good_md5 "$i" && good_size "$i"; then : elif [ "$FROM_DISTFILES" = 1 ]; then @@ -901,7 +975,7 @@ get_files() update_shell_title "${GETURI2%% *}: $url" ${GETURI2} ${OUTFILEOPT} "$target" "$url" fi - if ! test -s "$target"; then + if [ ! -s "$target" ]; then rm -f "$target" update_shell_title "${GETURI%% *}: $url_attic" ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \ @@ -912,14 +986,6 @@ get_files() fi test -s "$target" || rm -f "$target" fi - - if good_md5 "$i" && good_size "$i" ; then - : - else - echo "MD5 sum mismatch or 0 size. Use -U to refetch sources," - echo "or -5 to update md5 sums, if you're sure files are correct." - Exit_error err_no_source_in_repo $i - fi done SHELL_TITLE_PREFIX="" @@ -962,50 +1028,55 @@ tag_files() set -v; fi - if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then - echo "Version: $PACKAGE_VERSION" - echo "Release: $PACKAGE_RELEASE" + echo "Version: $PACKAGE_VERSION" + echo "Release: $PACKAGE_RELEASE" - TAGVER=`make_tagver` + TAGVER=`make_tagver` - if [ "$TAG_VERSION" = "yes" ]; then - echo "CVS tag: $TAGVER" - fi - if [ -n "$TAG" ]; then - echo "CVS tag: $TAG" - fi + if [ "$TAG_VERSION" = "yes" ]; then + echo "CVS tag: $TAGVER" + fi + if [ -n "$TAG" ]; then + echo "CVS tag: $TAG" + fi - OPTIONS="tag -F" - if [ -n "$CVSROOT" ]; then - OPTIONS="-d $CVSROOT $OPTIONS" - fi + local OPTIONS="tag $CVS_FORCE" + if [ -n "$CVSROOT" ]; then + OPTIONS="-d $CVSROOT $OPTIONS" + fi - cd "$SOURCE_DIR" - for i in $TAG_FILES - do - # don't tag files stored on distfiles - [ -n "`src_md5 $i`" ] && continue - if [ -f "`nourl $i`" ]; then - if [ "$TAG_VERSION" = "yes" ]; then - cvs $OPTIONS $TAGVER `nourl $i` - fi - if [ -n "$TAG" ]; then - cvs $OPTIONS $TAG `nourl $i` - fi - else - Exit_error err_no_source_in_repo $i - fi - done + cd "$SOURCE_DIR" + local tag_files + for i in $TAG_FILES; do + # don't tag files stored on distfiles + [ -n "`src_md5 $i`" ] && continue + local fp=`nourl "$i"` + if [ -f "$fp" ]; then + tag_files="$tag_files $fp" + else + Exit_error err_no_source_in_repo $i + fi + done - cd "$SPECS_DIR" + if [ "$tag_files" ]; then if [ "$TAG_VERSION" = "yes" ]; then - cvs $OPTIONS $TAGVER $SPECFILE + update_shell_title "tag sources: $TAGVER" + cvs $OPTIONS $TAGVER $tag_files fi if [ -n "$TAG" ]; then - cvs $OPTIONS $TAG $SPECFILE + update_shell_title "tag sources: $TAG" + cvs $OPTIONS $TAG $tag_files fi + fi - unset OPTIONS + cd "$SPECS_DIR" + if [ "$TAG_VERSION" = "yes" ]; then + update_shell_title "tag spec: $TAGVER" + cvs $OPTIONS $TAGVER $SPECFILE + fi + if [ -n "$TAG" ]; then + update_shell_title "tag spec: $TAG" + cvs $OPTIONS $TAG $SPECFILE fi } @@ -1022,26 +1093,26 @@ branch_files() set -v; fi - if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then - - OPTIONS="tag -b" - if [ -n "$CVSROOT" ]; then - OPTIONS="-d $CVSROOT $OPTIONS" + local OPTIONS="tag $CVS_FORCE -b" + if [ -n "$CVSROOT" ]; then + OPTIONS="-d $CVSROOT $OPTIONS" + fi + cd "$SOURCE_DIR" + local tag_files + for i in $TAG_FILES; do + local fp=`nourl "$i"` + if [ -f "$fp" ]; then + tag_files="$tag_files $fp" + else + Exit_error err_no_source_in_repo $i fi - cd "$SOURCE_DIR" - for i in $TAG_FILES - do - if [ -f `nourl $i` ]; then - cvs $OPTIONS $TAG `nourl $i` - else - Exit_error err_no_source_in_repo $i - fi - done - cd "$SPECS_DIR" - cvs $OPTIONS $TAG $SPECFILE - - unset OPTIONS + done + if [ "$tag_files" ]; then + cvs $OPTIONS $TAG $tag_files fi + + cd "$SPECS_DIR" + cvs $OPTIONS $TAG $SPECFILE } @@ -1069,12 +1140,16 @@ build_package() if [ -n "$TNEWVER" ]; then TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'` echo "New version found, updating spec file to version " $TNEWVER - cp -f $SPECFILE $SPECFILE.bak + if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then + cp -f $SPECFILE $SPECFILE.bak + fi chmod +w $SPECFILE eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE" eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t0.1/' $SPECFILE" parse_spec; - NODIST="yes" UPDATE5="yes" get_files $SOURCES $PATCHES; + NODIST="yes" get_files $SOURCES $PATCHES; + UPDATE5="yes" update_md5 $SOURCES + unset TOLDVER TNEWVER TNOTIFY fi fi @@ -1120,7 +1195,9 @@ build_package() if [ "$RETVAL" -ne "0" ]; then if [ -n "$TRY_UPGRADE" ]; then echo "\n!!! Package with new version cannot be built automagically\n" - mv -f $SPECFILE.bak $SPECFILE + if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then + mv -f $SPECFILE.bak $SPECFILE + fi fi Exit_error err_build_fail; fi @@ -1198,9 +1275,13 @@ set_bconds_values() # use only flags which are in this package. if [[ $bcond_avail = *${opt}* ]]; then if [[ $flag = -* ]]; then - BCOND="$BCOND --without $opt" + if [[ $BCOND != *--with?${opt}* ]]; then + BCOND="$BCOND --without $opt" + fi else - BCOND="$BCOND --with $opt" + if [[ $BCOND != *--without?${opt}* ]]; then + BCOND="$BCOND --with $opt" + fi fi fi done @@ -1621,13 +1702,13 @@ init_rpm_dir() { init_builder echo "To checkout *all* .spec files:" - echo "- remove $SPECS_DIR/CVS/Entries.Static" - echo "- run cvs up in $SPECS_DIR dir" + echo "- remove $SPECS_DIR/CVS/Entries.Static" + echo "- run cvs up in $SPECS_DIR dir" echo "" echo "To commit with your developer account:" - echo "- edit $SPECS_DIR/CVS/Root" - echo "- edit $SOURCE_DIR/CVS/Root" + echo "- edit $SPECS_DIR/CVS/Root" + echo "- edit $SOURCE_DIR/CVS/Root" } #--------------------------------------------- @@ -1642,13 +1723,13 @@ while test $# -gt 0 do case "${1}" in -5 | --update-md5 ) - COMMAND="get"; + COMMAND="update_md5"; NODIST="yes" NOCVSSPEC="yes" UPDATE5="yes" shift ;; -a5 | --add-md5 ) - COMMAND="get"; + COMMAND="update_md5"; NODIST="yes" NOCVS="yes" NOCVSSPEC="yes" @@ -1676,6 +1757,8 @@ do COMMAND="branch"; shift; TAG="${1}"; shift;; -c | --clean ) CLEAN="--clean --rmspec --rmsource"; shift ;; + -cf | --cvs-force ) + CVS_FORCE="-F"; shift;; -d | --cvsroot ) shift; CVSROOT="${1}"; shift ;; -g | --get ) @@ -1783,21 +1866,11 @@ do TAG="STABLE" TAG_VERSION="yes" shift;; - -Tvn | --tag-version-nest ) - COMMAND="tag"; - TAG="NEST" - TAG_VERSION="yes" - shift;; -Ts | --tag-stable ) COMMAND="tag"; TAG="STABLE" TAG_VERSION="no" shift;; - -Tn | --tag-nest ) - COMMAND="tag"; - TAG="NEST" - TAG_VERSION="no" - shift;; -Tv | --tag-version ) COMMAND="tag"; TAG="" @@ -1819,7 +1892,7 @@ do INTEGER_RELEASE="yes" shift;; -U | --update ) - COMMAND="get" + COMMAND="update_md5" UPDATE="yes" NOCVSSPEC="yes" NODIST="yes" @@ -1840,9 +1913,14 @@ do --define) shift MACRO="${1}" - VALUE="${2}" - shift 2 - RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\"" + shift + if echo "${MACRO}" | grep -q '\W'; then + RPMOPTS="${RPMOPTS} --define \"${MACRO}\"" + else + VALUE="${1}" + shift + RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\"" + fi ;; --show-bconds | -show-bconds | -print-bconds | --print-bconds | -display-bconds | --display-bconds ) SHOW_BCONDS="yes" @@ -1861,10 +1939,20 @@ do CVSTAG="${SPECFILE##*:}"; SPECFILE="${SPECFILE%%:*}"; fi - shift ;; + shift esac done +if [ -z "$CVSTAG" ]; then + CVSTAG=$(awk -vSPECFILE="${SPECFILE%.spec}.spec" -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries) + if [ "$CVSTAG" ]; then + echo "builder: Stick tag $CVSTAG active. Use -r TAGNAME to override." + fi +elif [ "$CVSTAG" = "HEAD" ]; then + # assume -r HEAD is same as -A + CVSTAG="" +fi + if [ -n "$DEBUG" ]; then set -x; set -v; @@ -1926,7 +2014,8 @@ case "$COMMAND" in if [ -n "$NOSOURCE0" ] ; then SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` fi - get_files $SOURCES $PATCHES; + get_files $SOURCES $PATCHES + check_md5 $SOURCES build_package; if [ "$UPDATE_POLDEK_INDEXES" = "yes" -a "$COMMAND" != "build-prep" ]; then run_poldek --sdir="${POLDEK_INDEX_DIR}" --mkidxz @@ -1941,8 +2030,16 @@ case "$COMMAND" in if [ -n "$SPECFILE" ]; then get_spec; parse_spec; - get_files $SOURCES $PATCHES; - branch_files $TAG "$SOURCES $PATCHES $ICONS"; + # don't fetch sources from remote locations + new_SOURCES="" + for file in $SOURCES; do + [ -n "`src_md5 $file`" ] && continue + new_SOURCES="$new_SOURCES $file" + done + SOURCES="$new_SOURCES" + get_files $SOURCES $PATCHES + check_md5 $SOURCES + branch_files $TAG $SOURCES $PATCHES $ICONS else Exit_error err_no_spec_in_cmdl; fi @@ -1957,6 +2054,21 @@ case "$COMMAND" in SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` fi get_files $SOURCES $PATCHES + check_md5 $SOURCES + else + Exit_error err_no_spec_in_cmdl; + fi + ;; + "update_md5" ) + init_builder; + if [ -n "$SPECFILE" ]; then + get_spec; + parse_spec + + if [ -n "$NOSOURCE0" ] ; then + SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` + fi + update_md5 $SOURCES else Exit_error err_no_spec_in_cmdl; fi @@ -1971,14 +2083,14 @@ case "$COMMAND" in # don't fetch sources from remote locations new_SOURCES="" - for file in $SOURCES - do + for file in $SOURCES; do [ -n "`src_md5 $file`" ] && continue new_SOURCES="$new_SOURCES $file" done SOURCES="$new_SOURCES" - get_files $SOURCES $PATCHES; - tag_files "$SOURCES $PATCHES $ICONS"; + get_files $SOURCES $PATCHES + check_md5 $SOURCES + tag_files $SOURCES $PATCHES $ICONS else Exit_error err_no_spec_in_cmdl; fi @@ -1992,8 +2104,7 @@ case "$COMMAND" in DONT_PRINT_REVISION="yes" get_spec parse_spec - SAPS="$SOURCES $PATCHES" - for SAP in $SAPS ; do + for SAP in $SOURCES $PATCHES; do echo $SAP | awk '{gsub(/.*\//,"") ; print}' done ;; @@ -2014,8 +2125,7 @@ case "$COMMAND" in DONT_PRINT_REVISION="yes" get_spec parse_spec - SAPS="$SOURCES $PATCHES" - for SAP in $SAPS ; do + for SAP in $SOURCES $PATCHES; do echo $SOURCE_DIR/$(echo $SAP | awk '{gsub(/.*\//,"") ; print }') done ;; @@ -2025,8 +2135,7 @@ case "$COMMAND" in DONT_PRINT_REVISION="yes" get_spec parse_spec - SAPS="$SOURCES $PATCHES" - for SAP in $SAPS ; do + for SAP in $SOURCES $PATCHES; do if [ -n "$(src_md5 "$SAP")" ]; then distfiles_path "$SAP" fi @@ -2038,8 +2147,7 @@ case "$COMMAND" in DONT_PRINT_REVISION="yes" get_spec parse_spec - SAPS="$SOURCES $PATCHES" - for SAP in $SAPS ; do + for SAP in $SOURCES $PATCHES; do if [ -n "$(src_md5 "$SAP")" ]; then distfiles_url "$SAP" fi @@ -2058,4 +2166,4 @@ if [ -f "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES" -a "$REMOVE_BUILD_REQUIRES" != " fi cd "$__PWD" -# vi:syntax=sh:ts=4:sw=4 +# vi:syntax=sh:ts=4:sw=4:noet