# 4 - some source, patch or icon files not stored in repo
# 5 - package build failed
+# Notes (todo):
+# - builder -u fetches current version first
+# - tries to get new version from distfiles without new md5
+# - after fetching new version doesn't update md5
+# - doesn't get sources for specs with %include /usr/lib/rpm/macros.python
+# when there's no rpm-pythonprov (rpm's fault, but it's ugly anyway)
+
VERSION="\
Build package utility from PLD CVS repository
V 0.11 (C) 1999-2003 Free Penguins".
LOGDIRFAIL=""
LASTLOG_FILE=""
LTAG=""
-CHMOD="yes"
+CHMOD="no"
CHMOD_MODE="0444"
RPMOPTS=""
BCOND=""
"
}
+rpm_dump () {
+ case "$RPMBUILD" in
+ rpm )
+ rpm -bp --define 'prep %dump' $BCOND $SPECFILE 2>&1
+ ;;
+ rpmbuild )
+ rpmbuild --define 'prep %dump' $BCOND $SPECFILE 2>&1
+ ;;
+ esac
+}
+
parse_spec()
{
if [ -n "$DEBUG" ]; then
cd $SPECS_DIR
if [ "$NOSRCS" != "yes" ]; then
- SOURCES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/SOURCEURL[0-9]+/ {print $3}'`"
+ SOURCES="`rpm_dump | awk '/SOURCEURL[0-9]+/ {print $3}'`"
fi
- if ($RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | grep -qEi ":.*nosource.*1"); then
+ if (rpm_dump | grep -qEi ":.*nosource.*1"); then
FAIL_IF_NO_SOURCES="no"
fi
- PATCHES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/PATCHURL[0-9]+/ {print $3}'`"
+ PATCHES="`rpm_dump | awk '/PATCHURL[0-9]+/ {print $3}'`"
ICONS="`awk '/^Icon:/ {print $2}' ${SPECFILE}`"
PACKAGE_NAME="`$RPM -q --qf '%{NAME}\n' --specfile ${SPECFILE} 2> /dev/null | head -1`"
PACKAGE_VERSION="`$RPM -q --qf '%{VERSION}\n' --specfile ${SPECFILE} 2> /dev/null| head -1`"
Exit_error()
{
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
init_builder()
{
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
get_spec()
{
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
OPTIONS="$OPTIONS -A"
else
if [ -n "$CVSDATE" ]; then
- OPTIONS="$OPTIONS -D $CVSDATE"
+ OPTIONS="$OPTIONS -D $CVSDATE"
fi
if [ -n "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -r $CVSTAG"
+ OPTIONS="$OPTIONS -r $CVSTAG"
fi
fi
echo "Trying again [$SPECFILE]... ($retries_counter)"
sleep 2
continue
- fi
- Exit_error err_no_spec_in_repo;
+ fi
+ Exit_error err_no_spec_in_repo;
fi
done
fi
cd "$SPECS_DIR"
url="$1"
- if [ ! -f "mirrors" ] ; then
+ if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
cvs update mirrors >&2
fi
src_no ()
{
cd $SPECS_DIR
- $RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | \
- grep "SOURCEURL[0-9]*[ ]*$1""[ ]*$" | \
- sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
- head -1 | xargs
+ rpm_dump | \
+ grep "SOURCEURL[0-9]*[ ]*$1""[ ]*$" | \
+ sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
+ head -1 | xargs
}
src_md5 ()
no=$(src_no "$1")
[ -z "$no" ] && return
cd $SPECS_DIR
- spec="$SPECFILE,$(head -1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')"
- md5=$(grep -v '^#' additional-md5sums | \
- grep -E "[ ]$(basename "$1")[ ]*[ ]${spec}([ ]|\$)" | \
- sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
- grep -E '^[0-9a-f]{32}$')
+ spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::)
+ if [ -z "$spec_rev" ]; then
+ spec_rev="$(head -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
- grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://' | xargs
+ grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://' | xargs
else
- if [ $(echo "$md5" | wc -l) != 1 ] ; then
- echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
- fi
- echo "$md5" | tail -1
+ if [ $(echo "$md5" | wc -l) != 1 ] ; then
+ echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
+ fi
+ echo "$md5" | tail -1
fi
}
GET_FILES="$@"
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
NOCVS="yes"
fi
fi
- if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -A"
- else
- if [ -n "$CVSDATE" ]; then
- OPTIONS="$OPTIONS -D $CVSDATE"
- fi
- if [ -n "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -r $CVSTAG"
- fi
- fi
+ if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
+ OPTIONS="$OPTIONS -A"
+ else
+ if [ -n "$CVSDATE" ]; then
+ OPTIONS="$OPTIONS -D $CVSDATE"
+ fi
+ if [ -n "$CVSTAG" ]; then
+ OPTIONS="$OPTIONS -r $CVSTAG"
+ fi
+ fi
for i in $GET_FILES; do
if [ ! -f `nourl $i` ] || [ $ALWAYS_CVSUP = "yes" ]; then
if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
elif [ -z "$(src_md5 "$i")" ] && \
( [ -z "$NOCVS" ] || echo $i | grep -qvE '(ftp|http|https)://' ); then
result=1
- retries_counter=0
- while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
- retries_counter=$(( $retries_counter + 1 ))
+ retries_counter=0
+ while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
+ retries_counter=$(( $retries_counter + 1 ))
output=$(LC_ALL=C cvs $OPTIONS `nourl $i` 2>&1)
- result=$?
+ 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
echo "Trying again [`nourl $i`]... ($retries_counter)"
if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
if [ -z "$NOMIRRORS" ] ; then
- i="`find_mirror "$i"`"
+ im="`find_mirror "$i"`"
+ else
+ im="$i"
fi
- ${GETURI} "$i" || \
- if [ `echo $i | grep -E 'ftp://'` ]; then ${GETURI2} "$i" ; fi
+ ${GETURI} "$im" || \
+ if [ `echo $im | grep -E 'ftp://'` ]; then ${GETURI2} "$im" ; fi
fi
- srcno=$(src_no $i)
- if [ ! -f "`nourl $i`" -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 `nourl $i` | cut -f1 -d' ')
- perl -i -ne 'print "# Source'$srcno'-md5:\t'$md5'\n"
- if /^Source'$srcno'\s*:\s+/;
- print unless /^\s*#\s*Source'$srcno'-md5\s*:/i' \
- $SPECS_DIR/$SPECFILE
- fi
-
- if good_md5 "$i"; then
- :
- else
- echo "MD5 sum mismatch. 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
+ fi
+ srcno=$(src_no $i)
+ if [ ! -f "`nourl $i`" -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 `nourl $i` | 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
+
+ if good_md5 "$i"; then
+ :
+ else
+ echo "MD5 sum mismatch. 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
TAG_FILES="$@"
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
- echo $PACKAGE_VERSION
- echo $PACKAGE_RELEASE
+ echo "Version: $PACKAGE_VERSION"
+ echo "Release: $PACKAGE_RELEASE"
TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
if [ "$TAG_VERSION" = "yes" ]; then
echo "CVS tag: $TAGVER"
RETVAL=`cat $RES_FILE`
rm $RES_FILE
if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
- if [ "$RETVAL" -eq "0" ]; then
+ if [ "$RETVAL" -eq "0" ]; then
mv $LOG $LOGDIROK
- else
- mv $LOG $LOGDIRFAIL
+ else
+ mv $LOG $LOGDIRFAIL
fi
fi
else
fi
if [ -n "$ICONS" ]; then
- get_files $ICONS;
- parse_spec;
+ get_files $ICONS;
+ parse_spec;
fi
if [ -n "$NOSOURCE0" ] ; then
SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'`
fi
;;
"branch" )
- init_builder;
+ init_builder;
if [ -n "$SPECFILE" ]; then
get_spec;
parse_spec;
else
Exit_error err_no_spec_in_cmdl;
fi
- ;;
+ ;;
"get" )
init_builder;
if [ -n "$SPECFILE" ]; then
projects / packages / rpm-build-tools.git / blobdiff