X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=builder.sh;h=bb08a3d9dfc7af6f43bd2be23a3fb413b8203bf8;hb=c514f1f6ae2d7bcd3d121249c794b51a912d6df2;hp=c56ca4a6014d509a0615fb3782d95e6c7456375c;hpb=4ee82499412a9dca27a5fc2401161dce660f6471;p=packages%2Frpm-build-tools.git diff --git a/builder.sh b/builder.sh index c56ca4a..bb08a3d 100644 --- a/builder.sh +++ b/builder.sh @@ -19,22 +19,32 @@ # 100 - Unknown error (should not happen) # Notes (todo/bugs): -# - builder -u fetches current version first (well that's okay, how you compare versions if you have no old spec?) # - when Icon: field is present, -5 and -a5 doesn't work # - builder -R skips installing BR if spec is not present before builder invocation (need to run builder twice) +# - does not respect NoSource: X, and tries to cvs up such files [ example: VirtualBox-bin.spec and its Source0 ] # TODO: # - ability to do ./builder -bb foo.spec foo2.spec foo3.spec - -RCSID='$Id$' -r=${RCSID#* * } -rev=${r%% *} +# - funny bug, if source-md5 is set then builder will download from distfiles even if there is no url present: +# Source10: forwardfix.pl +# # Source10-md5: 8bf85f7368933a4e0cb4f875bac28733 +# - builder --help: +# basename: missing operand +# Try `basename --help' for more information. +# -- and the normal usage info -- + +PROGRAM=${0##*/} +APPDIR=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d") +RCSID='$Id$' r=${RCSID#* * } rev=${r%% *} VERSION="v0.35/$rev" VERSIONSTRING="\ -Build package utility from PLD Linux CVS repository -$VERSION (C) 1999-2009 Free Penguins". +Build package utility from PLD Linux Packages repository +$VERSION (C) 1999-2011 Free Penguins". PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin" +# required rpm-build-macros +RPM_MACROS_VER=1.534 + COMMAND="build" TARGET="" @@ -86,7 +96,7 @@ BCOND="" GROUP_BCONDS="no" # create symlinks for tools in PACKAGE_DIR, see get_spec() -SYMLINK_TOOLS="yes" +SYMLINK_TOOLS="no" PATCHES="" SOURCES="" @@ -95,7 +105,7 @@ PACKAGE_RELEASE="" PACKAGE_VERSION="" PACKAGE_NAME="" ASSUMED_NAME="" -PROTOCOL="ftp" +PROTOCOL="http" WGET_RETRIES=${MAX_WGET_RETRIES:-0} CVS_COMMAND=${CVS_COMMAND:-cvs} @@ -201,6 +211,15 @@ else RPMBUILD="rpmbuild" fi +# +# sanity checks +# +if [ -d $HOME/rpm/SOURCES ]; then + echo "ERROR: ~/rpm/{SPECS,SOURCES} structure is obsolete" >&2 + echo "ERROR: get rid of your ~/rpm/SOURCES" >&2 + exit 1 +fi + # # are we using cvs-nserver ? # @@ -212,7 +231,7 @@ POLDEK_INDEX_DIR="$($RPM --eval %_rpmdir)/" POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask" run_poldek() { - RES_FILE=$(mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM) + RES_FILE=$(tempfile) if [ -n "$LOGFILE" ]; then LOG=`eval echo $LOGFILE` if [ -n "$LASTLOG_FILE" ]; then @@ -233,10 +252,10 @@ run_poldek() { usage() { if [ -n "$DEBUG" ]; then set -xv; fi echo "\ -Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|-ba|--build] +Usage: builder [-D|--debug] [-V|--version] [--short-version] [--as_anon] [-a|--add_cvs] [-b|-ba|--build] [-bb|--build-binary] [-bs|--build-source] [-bc] [-bi] [-bl] [-u|--try-upgrade] [{-cf|--cvs-force}] [{-B|--branch} ] [{-d|--cvsroot} ] -[-g|--get] [-h|--help] [--http] [{-l|--logtofile} ] [-m|--mr-proper] +[-g|--get] [-h|--help] [--ftp] [--http] [{-l|--logtofile} ] [-m|--mr-proper] [-q|--quiet] [--date [-r ] [{-T|--tag ] [-Tvs|--tag-version-stable] [-Ts|--tag-stable] [-Tv|--tag-version] [{-Tp|--tag-prefix} ] [{-tt|--test-tag}] [--use-greed-sources] @@ -244,14 +263,17 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b| [--show-bconds] [--with/--without ] [--define ] [.spec][:cvstag] +-4 - force ipv4 when transferring files -5, --update-md5 - update md5 comments in spec, implies -nd -ncs +-6 - force ipv6 when transferring files -a5, --add-md5 - add md5 comments to URL sources, implies -nc -nd -ncs -n5, --no-md5 - ignore md5 comments in spec -D, --debug - enable builder script debugging mode, -debug - produce rpm debug package (same as --opts -debug) -V, --version - output builder version string --short-version - output builder short version --a, --as_anon - get files via pserver as cvs@$CVS_SERVER, +--as_anon - get files via pserver as cvs@$CVS_SERVER, +-a, --add_cvs - try add new package to CVS. -b, -ba, --build - get all files from CVS repo or HTTP/FTP and build package from .spec, -bb, --build-binary - get all files from CVS repo or HTTP/FTP and build binary @@ -259,33 +281,29 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b| -bp, --build-prep - execute the %prep phase of .spec, -bc - execute the %build phase of .spec, -bi - execute the %install phase of .spec --bl - execute the %files phase of .spec +-bl - execute the %files phase of .spec -bs, --build-source - get all files from CVS repo or HTTP/FTP and only pack them into src.rpm, --short-circuit - short-circuit build -B, --branch - add branch --c, --clean - clean all temporarily created files (in BUILD, SOURCES, - SPECS and \$RPM_BUILD_ROOT and CVS/Entries) after rpmbuild commands. --m, --mr-proper - clean all temporarily created files (in BUILD, SOURCES, - SPECS and \$RPM_BUILD_ROOT and CVS/Entries). Doesn't run - any rpm building. --cf, --cvs-force - use -F when tagging (useful when moving branches) +-c, --clean - clean all temporarily created files (in BUILD\$RPM_BUILD_ROOT) after rpmbuild commands. + may be used with building process. +-m, --mr-proper - clean all temporarily created files (in BUILD, SOURCES, SPECS and \$RPM_BUILD_ROOT + and CVS/Entries). Doesn't run any rpm building. +-cf, --cvs-force - use -F when tagging (useful when moving branches) -d , --cvsroot - setup \$CVSROOT, ---define - - define a macro with value , ---alt_kernel - - same as --define 'alt_kernel ' +--define - define a macro with value , +--alt_kernel - same as --define 'alt_kernel ' --nodeps - rpm won't check any dependences --g, --get - get .spec and all related files from CVS repo - or HTTP/FTP, --h, --help - this message, ---http - use http instead of ftp, +-g, --get - get .spec and all related files from CVS repo or HTTP/FTP +-h, --help - this message +-jN, -j N - set %_smp_mflags to propagate concurrent jobs +--ftp, --http - use ftp or http protocol to access distfiles server -l , --logtofile - log all to file, -nc, --no-cvs - don't download sources from CVS, if source URL is given, --ncs, --no-cvs-specs - - don't check specs in CVS +-ncs, --no-cvs-specs - don't check specs in CVS -nd, --no-distfiles - don't download from distfiles -nm, --no-mirrors - don't download from mirror, if source URL is given, -nu, --no-urls - don't try to download from FTP/HTTP location, @@ -313,7 +331,7 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b| -sd, --source-distfiles - list sources available from distfiles (intended for offline operations; does not work when Icon field is present but icon file is absent), --sc, --source-cvs - list sources available from CVS +-sc, --source-cvs - list sources available from CVS -sdp, --source-distfiles-paths - list sources available from distfiles - paths relative to distfiles directory (intended for offline operations; does not work when Icon field is present @@ -321,7 +339,7 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b| -sf, --source-files - list sources - bare filenames (intended for offline operations; does not work when Icon field is present but icon file is absent), --sp, --source-paths - list sources - filenames with full local paths (intended for +-lsp, --source-paths - list sources - filenames with full local paths (intended for offline operations; does not work when Icon field is present but icon file is absent), -su, --source-urls - list urls - urls to sources and patches @@ -330,10 +348,8 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b| - add cvs tag for files, -Tvs, --tag-version-stable - add cvs tags STABLE and NAME-VERSION-RELEASE for files, --Ts, --tag-stable - - add cvs tag STABLE for files, --Tv, --tag-version - - add cvs tag NAME-VERSION-RELEASE for files, +-Ts, --tag-stable - add cvs tag STABLE for files, +-Tv, --tag-version - add cvs tag NAME-VERSION-RELEASE for files, -Tp, --tag-prefix - add to NAME-VERSION-RELEASE tags, -tt, --test-tag @@ -344,50 +360,59 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b| -u, --try-upgrade - check version, and try to upgrade package -un, --try-upgrade-with-float-version - as above, but allow float version + php-pear-Services_Digg/ +--upgrade-version - upgrade to specified version in try-upgrade --use-greed-sources - try download source from tag head if don't find it in current tag -U, --update - refetch sources, don't use distfiles, and update md5 comments -Upi, --update-poldek-indexes - refresh or make poldek package index files. +-sp, --skip-patch + - don't apply . may be repeated. -np, --nopatch - - don't apply + - abort instead of applying patch --show-bconds - show available conditional builds, which can be used - with --with and/or --without switches. ---show-bcond-args - show active bconds, from ~/.bcondrc. this is used by - ./repackage.sh script. in other words, the output is - parseable by scripts. +--show-bcond-args - show active bconds, from ~/.bcondrc. this is used by ./repackage.sh script. + In other words, the output is parseable by scripts. +--show-avail-bconds - show available bconds --with/--without - conditional build package depending on %_with_/ %_without_ macro switch. You may now use --with feat1 feat2 feat3 --without feat4 feat5 --with feat6 constructions. Set GROUP_BCONDS to yes to make use of it. --target , --target= - - build for platform . ---init-rpm-dir - initialize ~/rpm directory structure + - build for platform . +--init-rpm-dir - initialize ~/rpm directory structure " } +# create tempfile. as secure as possible +tempfile() { + mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM.$$ +} + # change dependency to specname # common changes: # - perl(Package::Name) -> perl-Package-Name depspecname() { local package="$1" - package=$(echo "$package" | sed -e '/perl(.*)/{s,perl(\(.*\)),perl-\1,;s,::,-,g}') + package=$(echo "$package" | sed -e '/perl(.*)/{s,perl(\(.*\)),perl-\1,;s,::,-,g};' -e 's/-\(devel\|static\)$//' ) echo "$package" } update_shell_title() { [ -t 1 ] || return local len=${COLUMNS:-80} - local msg=$(echo "$*" | cut -c-$len) + local msg="$(echo "$*" | cut -c-$len)" if [ -n "$BE_VERBOSE" ]; then echo >&2 "$(date +%s.%N) $*" fi - if [ "x$TITLECHANGE" == "xyes" -o "x$TITLECHANGE" == "x" ]; then + if [ "x$TITLECHANGE" = "xyes" -o "x$TITLECHANGE" = "x" ]; then local pkg if [ -n "$PACKAGE_NAME" ]; then pkg=${PACKAGE_NAME}-${PACKAGE_VERSION}-${PACKAGE_RELEASE} @@ -411,7 +436,7 @@ update_shell_title() { # set TARGET from BuildArch: from SPECFILE set_spec_target() { if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then - tmp=$(awk '/^BuildArch:/ { print $NF}' $ASSUMED_NAME/$SPECFILE) + tmp=$(awk '/^BuildArch:/ { print $NF; exit }' $ASSUMED_NAME/$SPECFILE) if [ "$tmp" ]; then target_platform=$(rpm -E '%{_target_vendor}-%{_target_os}%{?_gnu}') TARGET="$tmp" @@ -437,16 +462,20 @@ minirpm() { %x8664 x86_64 amd64 ia32e %alt_kernel %{nil} %_alt_kernel %{nil} -%requires_releq_kernel_up %{nil} -%requires_releq_kernel_smp %{nil} -%requires_releq_kernel %{nil} +%bootstrap_release() %{1} +%requires_releq_kernel_up(s:n:) %{nil} +%requires_releq_kernel_smp(s:n:) %{nil} +%requires_releq_kernel(s:n:) %{nil} %requires_releq() %{nil} %pyrequires_eq() %{nil} %requires_eq() %{nil} %requires_eq_to() %{nil} -%releq_kernel_up ERROR -%releq_kernel_smp ERROR -%releq_kernel ERROR +%requires_ge() %{nil} +%requires_ge_to() %{nil} +%requires_ge() %{nil} +%releq_kernel_up(n:) ERROR +%releq_kernel_smp(n:) ERROR +%releq_kernel(n:) ERROR %kgcc_package ERROR %_fontsdir ERROR %ruby_version ERROR @@ -479,6 +508,9 @@ minirpm() { %remove_etc_shells(p) %{p:} %lua_add_etc_shells() %{nil} %lua_remove_etc_shells() %{nil} +%required_jdk %{nil} +%buildrequires_jdk %{nil} +%pear_package_print_optionalpackages %{nil} EOF if [ "$NOINIT" = "yes" ] ; then cat >> $BUILDER_MACROS <<'EOF' @@ -541,7 +573,7 @@ rpm_dump() { get_icons() { update_shell_title "get icons" - ICONS=$(awk '/^Icon:/ {print $2}' ${ASSUMED_NAME}/${SPECFILE}) + ICONS=$(awk '/^Icon:/ {print $2}' $PACKAGE_DIR/${SPECFILE}) if [ -z "$ICONS" ]; then return fi @@ -624,6 +656,9 @@ Exit_error() { remove_build_requires echo >&2 "Error: some source, patch or icon files not stored in CVS repo. ($2)" exit 4 ;; + "err_cvs_add_failed" ) + echo >&2 "Error: failed to add package to CVS repo." + exit 4 ;; "err_build_fail" ) remove_build_requires echo >&2 "Error: package build failed. (${2:-no more info})" @@ -661,9 +696,19 @@ init_builder() { if [ "$NOINIT" != "yes" ] ; then TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}') - REPO_DIR=$TOP_DIR/packages - PACKAGE_DIR=$TOP_DIR/packages/$ASSUMED_NAME - [ ! -d "$REPO_DIR" ] && install -d "$REPO_DIR" + + local macros_ver=$(rpm -E %?rpm_build_macros) + if [ -z "$macros_ver" ]; then + REPO_DIR=$TOP_DIR/packages + PACKAGE_DIR=$TOP_DIR/packages/$ASSUMED_NAME + else + if awk "BEGIN{exit($macros_ver>=$RPM_MACROS_VER)}"; then + echo >&2 "builder requires rpm-build-macros >= $RPM_MACROS_VER" + exit 1 + fi + REPO_DIR=$TOP_DIR + PACKAGE_DIR=$REPO_DIR/$ASSUMED_NAME + fi else REPO_DIR="." PACKAGE_DIR="." @@ -683,33 +728,62 @@ get_spec() { cd "$REPO_DIR" if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then - SPECFILE="$(basename $SPECFILE .spec).spec" + # XXX: still needed? + SPECFILE=$(basename $SPECFILE) fi - if [ "$NOCVSSPEC" != "yes" ]; then + if [ "$NOCVSSPEC" != "yes" ]; then if [ ! -s CVS/Root -a "$NOCVSSPEC" != "yes" ]; then echo "Warning: No CVS access defined - using local .spec file" NOCVSSPEC="yes" fi - if [ -d "$ASSUMED_NAME" ]; then + if [ -d "$ASSUMED_NAME" -a -s "$ASSUMED_NAME/CVS/Root" ]; then cvsup "$ASSUMED_NAME/$SPECFILE" || Exit_error err_no_spec_in_repo + elif [ "$ADD_PACKAGE_CVS" = "yes" ]; then + if [ ! -r "$ASSUMED_NAME/$SPECFILE" ]; then + echo "ERROR: No package to add ($ASSUMED_NAME/$SPECFILE)" >&2 + exit 101 + fi + if [ ! -s "$ASSUMED_NAME/CVS/Root" ]; then + cvsup -a $ASSUMED_NAME || Exit_error err_cvs_add_failed + fi + cvsup -a "$ASSUMED_NAME/$SPECFILE" || Exit_error err_cvs_add_failed else - cvsup -c -d $ASSUMED_NAME "packages/$ASSUMED_NAME/$SPECFILE" || Exit_error err_no_spec_in_repo + cvsup -c -d $ASSUMED_NAME "packages/$ASSUMED_NAME/$SPECFILE" || { + # softfail if new package, i.e not yet added to cvs + [ ! -f "$ASSUMED_NAME/$SPECFILE" ] && Exit_error err_no_spec_in_repo + echo "Warning: package not in CVS - assuming new package" + NOCVSSPEC="yes" + NOCVS="yes" + } # remove Entries.Static -- so 'cvs up' would update all files in a repo - rm "$ASSUMED_NAME/CVS/Entries.Static" - cvsignore_df .cvsignore - - # create symlinks for tools - if [ "$SYMLINK_TOOLS" != "no" ]; then - for a in dropin md5 adapter builder {relup,compile,repackage,rsync}.sh; do - [ -f $a ] || continue - ln -s ../$a $ASSUMED_NAME - cvsignore_df $a - done + rm -f "$ASSUMED_NAME/CVS/Entries.Static" + fi + + cvsignore_df .cvsignore + + # add default log format to .cvsignore if it is relative to package dir + if [ -n "$LOGFILE" -a "$LOGFILE" = "${LOGFILE##*/}" ]; then + # substitute known "macros" to glob + local logfile=$(echo "$LOGFILE" | sed -e 's,\$\(PACKAGE_NAME\|DATE\),*,g') + if [ "$logfile" ]; then + cvsignore_df "$logfile" fi fi + + # create symlinks for tools + if [ "$SYMLINK_TOOLS" != "no" ]; then + for a in dropin md5 adapter builder {relup,compile,repackage,rsync,pearize}.sh pldnotify.awk; do + # skip tools that don't exist in top dir + [ -f $a ] || continue + # skip tools that already exist + [ -f $ASSUMED_NAME/$a ] && continue + ln -s ../$a $ASSUMED_NAME + cvsignore_df $a + done + fi fi if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then @@ -736,7 +810,7 @@ find_mirror() { local origin mirror name rest ol prefix while read origin mirror name rest; do # skip comments and empty lines - if [ -z "$origin" ] || [[ $origin == \#* ]]; then + if [ -z "$origin" ] || [ "${origin#\#}" != "$origin" ]; then continue fi ol=$(echo -n "$origin" | wc -c) @@ -752,11 +826,14 @@ find_mirror() { # Warning: unpredictable results if same URL used twice src_no() { + local file="$1" + # escape some regexp characters if part of file name + file=$(echo "$file" | sed -e 's#\([\+\*\.\&\#\?]\)#\\\1#g') cd $PACKAGE_DIR rpm_dump | \ - grep "SOURCEURL[0-9]*[ ]*$1""[ ]*$" | \ - sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \ - head -n 1 | xargs + grep -E "(SOURCE|PATCH)URL[0-9]*[ ]*${file}""[ ]*$" | \ + sed -e 's/.*\(SOURCE\|PATCH\)URL\([0-9][0-9]*\).*/\1\2/' | \ + head -n 1 | tr OURCEATH ourceath | xargs } src_md5() { @@ -786,7 +863,7 @@ src_md5() { fi fi - source_md5=`grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + source_md5=`grep -i "^#[ ]*$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` if [ -n "$source_md5" ]; then echo $source_md5 else @@ -796,7 +873,7 @@ src_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/.*://'` + nosource_md5=`grep -i "^#[ ]*No$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` if [ -n "$nosource_md5" -a -n "`grep -i "^NoSource:[ ]*$no$" $SPECFILE`" ] ; then echo $nosource_md5 fi @@ -841,24 +918,36 @@ cvsignore_df() { cvsup() { update_shell_title "cvsup" - local OPTIONS="up " + local OPTIONS="" ACTION="up" + # checkout if [ "$1" = "-c" ]; then - OPTIONS="co " + ACTION="co" + shift + fi + # add + if [ "$1" = "-a" ]; then + ACTION="add" shift fi + + OPTIONS="$ACTION " + if [ -n "$CVSROOT" ]; then OPTIONS="-d $CVSROOT $OPTIONS" 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" + if [ "$ACTION" != "add" ]; then + if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then + OPTIONS="$OPTIONS -A" + else + if [ -n "$CVSDATE" ]; then + OPTIONS="$OPTIONS -D $CVSDATE" + fi + if [ -n "$CVSTAG" ]; then + # FIXME: cvs add actually works with -r ? + OPTIONS="$OPTIONS -r $CVSTAG" + fi fi fi @@ -874,7 +963,8 @@ cvsup() { output=$(LC_ALL=C $CVS_COMMAND $OPTIONS "$@" 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|Unknown host)") && [ "$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 [$*]... ($retries_counter)" update_shell_title "cvsup: retry #$retries_counter" sleep 2 @@ -918,10 +1008,10 @@ update_md5() { local srcno=$(src_no "$i") if [ -n "$ADD5" ]; then [ "$fp" = "$i" ] && continue # FIXME what is this check doing? - grep -qiE '^#[ ]*Source'$srcno'-md5[ ]*:' $PACKAGE_DIR/$SPECFILE && continue + grep -qiE '^#[ ]*'$srcno'-md5[ ]*:' $PACKAGE_DIR/$SPECFILE && continue grep -qiE '^BuildRequires:[ ]*digest[(]%SOURCE'$srcno'[)][ ]*=' $PACKAGE_DIR/$SPECFILE && continue else - grep -qiE '^#[ ]*Source'$srcno'-md5[ ]*:' $PACKAGE_DIR/$SPECFILE || grep -qiE '^BuildRequires:[ ]*digest[(]%SOURCE'$srcno'[)][ ]*=' $PACKAGE_DIR/$SPECFILE || continue + grep -qiE '^#[ ]*'$srcno'-md5[ ]*:' $PACKAGE_DIR/$SPECFILE || grep -qiE '^BuildRequires:[ ]*digest[(]%SOURCE'$srcno'[)][ ]*=' $PACKAGE_DIR/$SPECFILE || continue fi if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then need_files="$need_files $i" @@ -937,22 +1027,22 @@ update_md5() { for i in "$@"; do local fp=$(nourl "$i") local srcno=$(src_no "$i") - local md5=$(grep -iE '^#[ ]*(No)?Source'$srcno'-md5[ ]*:' $PACKAGE_DIR/$SPECFILE ) + local md5=$(grep -iE '^#[ ]*(No)?'$srcno'-md5[ ]*:' $PACKAGE_DIR/$SPECFILE ) if [ -z "$md5" ]; then md5=$(grep -iE '^[ ]*BuildRequires:[ ]*digest[(]%SOURCE'$srcno'[)][ ]*=' $PACKAGE_DIR/$SPECFILE ) fi if [ -n "$ADD5" ] && is_url $i || [ -n "$md5" ]; then - local tag="# Source$srcno-md5:\t" + local tag="# $srcno-md5:\t" if [[ "$md5" == *NoSource* ]]; then tag="# NoSource$srcno-md5:\t" elif [ -n "$USEDIGEST" ]; then tag="BuildRequires:\tdigest(%SOURCE$srcno) = " fi md5=$(md5sum "$fp" | cut -f1 -d' ') - echo "Updating Source$srcno ($md5: $fp)." + echo "Updating $srcno ($md5: $fp)." perl -i -ne ' - print unless (/^\s*#\s*(No)?Source'$srcno'-md5\s*:/i or /^\s*BuildRequires:\s*digest\(%SOURCE'$srcno'\)/i); - print "'"$tag$md5"'\n" if /^Source'$srcno'\s*:\s+/; + print unless (/^\s*#\s*(No)?'$srcno'-md5\s*:/i or /^\s*BuildRequires:\s*digest\(%SOURCE'$srcno'\)/i); + print "'"$tag$md5"'\n" if /^'$srcno'\s*:\s+/i; ' \ $PACKAGE_DIR/$SPECFILE fi @@ -960,18 +1050,27 @@ update_md5() { } check_md5() { + local bad [ "$NO5" = "yes" ] && return update_shell_title "check md5" for i in "$@"; do - if good_md5 "$i" && good_size "$i"; then - continue + bad=0 + if ! good_md5 "$i"; then + echo -n "MD5 sum mismatch." + bad=1 + fi + if ! good_size "$i"; then + echo -n "0 sized file." + bad=1 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 + if [ $bad -eq 1 ]; then + echo " 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 } @@ -1015,13 +1114,13 @@ get_files() { if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then echo "Warning: no URL given for $i" fi + target="$fp" if [ -z "$NODIST" ] && [ -n "$srcmd5" ]; then if good_md5 "$i" && good_size "$i"; then echo "$fp having proper md5sum already exists" continue fi - target="$fp" # optionally prefer mirror over distfiles if there's mirror # TODO: build url list and then try each url from the list @@ -1073,6 +1172,7 @@ get_files() { update_shell_title "${GETURI2%% *}: $url_attic" ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic" fi + test -s "$target" || rm -f "$target" fi fi @@ -1099,11 +1199,12 @@ get_files() { im="$i" fi update_shell_title "${GETURI%% *}: $im" - ${GETURI} "$im" || \ + ${GETURI} "$im" ${OUTFILEOPT} "$target" || \ if [ "`echo $im | grep -E 'ftp://'`" ]; then update_shell_title "${GETURI2%% *}: $im" - ${GETURI2} "$im" + ${GETURI2} "$im" ${OUTFILEOPT} "$target" fi + test -s "$target" || rm -f "$target" fi if [ "$cvsup" = 1 ]; then @@ -1202,6 +1303,9 @@ is_tag_a_branch() { fi TAG=$1 + # escape some regexp characters if part of TAG + TAG=$(echo "$TAG" | sed -e 's#\([\+\*\.]\)#\\\1#g') + cd "$PACKAGE_DIR" $CVS_COMMAND status -v $SPECFILE | grep -Eiq "${TAG}.+(branch: [0-9.]+)" @@ -1345,41 +1449,89 @@ check_buildarch() { fi } -build_package() { - update_shell_title "build_package" - if [ -n "$DEBUG" ]; then - set -x - set -v - fi +# from relup.sh +set_release() { + local specfile="$1" + local rel="$2" + local newrel="$3" + sed -i -e " + s/^\(%define[ \t]\+_\?rel[ \t]\+\)$rel\$/\1$newrel/ + s/^\(Release:[ \t]\+\)$rel\$/\1$newrel/ + " $specfile +} - cd "$PACKAGE_DIR" +set_version() { + local specfile="$1" + local ver="$2" subver=$ver + local newver="$3" newsubver=$newver + + # try handling subver, everything that's not numeric-dotted in version + if grep -Eq '%define\s+subver' $specfile; then + subver=$(echo "$ver" | sed -re 's,^[0-9.]+,,') + ver=${ver%$subver} + newsubver=$(echo "$newver" | sed -re 's,^[0-9.]+,,') + newver=${newver%$newsubver} + fi + sed -i -e " + s/^\(%define[ \t]\+_\?ver[ \t]\+\)$ver\$/\1$newver/ + s/^\(%define[ \t]\+subver[ \t]\+\)$subver\$/\1$newsubver/ + s/^\(Version:[ \t]\+\)$ver\$/\1$newver/ + " $specfile +} +try_upgrade() { if [ -n "$TRY_UPGRADE" ]; then + local TNOTIFY TNEWVER TOLDVER update_shell_title "build_package: try_upgrade" - if [ -n "$FLOAT_VERSION" ]; then - TNOTIFY=$(./pldnotify.awk $SPECFILE -n) || exit 1 + + cd "$PACKAGE_DIR" + + if [ "$UPGRADE_VERSION" ]; then + TNEWVER=$UPGRADE_VERSION else - TNOTIFY=$(./pldnotify.awk $SPECFILE) || exit 1 - fi + if [ -n "$FLOAT_VERSION" ]; then + TNOTIFY=$($APPDIR/pldnotify.awk ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE -n) || exit 1 + else + TNOTIFY=$($APPDIR/pldnotify.awk ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE) || exit 1 + fi + + # pldnotify.awk does not set exit codes, but it has match for ERROR + # in output which means so. + if [[ "$TNOTIFY" = *ERROR* ]]; then + echo >&2 "$TNOTIFY" + exit 1 + fi - TNEWVER=$(echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }') + TNEWVER=$(echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }') + fi if [ -n "$TNEWVER" ]; then TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'` - echo "New version found, updating spec file to version " $TNEWVER + echo "New version found, updating spec file from $TOLDVER to version $TNEWVER" 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" + set_release $SPECFILE $PACKAGE_RELEASE 1 + set_version $SPECFILE $PACKAGE_VERSION $TNEWVER parse_spec - NODIST="yes" get_files $SOURCES $PATCHES - update_md5 $SOURCES - - unset TOLDVER TNEWVER TNOTIFY + if [ "$PACKAGE_VERSION" != "$TNEWVER" ]; then + echo >&2 "Upgrading version failed, you need to update spec yourself" + exit 1 + fi + return 1 fi fi + return 0 +} + +build_package() { + update_shell_title "build_package" + if [ -n "$DEBUG" ]; then + set -x + set -v + fi + cd "$PACKAGE_DIR" case "$COMMAND" in @@ -1411,7 +1563,7 @@ build_package() { if [ -n "$LASTLOG_FILE" ]; then echo "LASTLOG=$LOG" > $LASTLOG_FILE fi - RES_FILE=$(mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM) + RES_FILE=$(tempfile) (time eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG RETVAL=`cat $RES_FILE` @@ -1429,10 +1581,12 @@ build_package() { fi if [ "$RETVAL" -ne "0" ]; then if [ -n "$TRY_UPGRADE" ]; then - echo "\n!!! Package with new version cannot be built automagically\n" + echo "\nUpgrade package to new version failed." if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then + echo "Restoring old spec file." mv -f $SPECFILE.bak $SPECFILE fi + echo "" fi Exit_error err_build_fail fi @@ -1515,7 +1669,7 @@ set_bconds_values() { AVAIL_BCONDS_WITHOUT="" AVAIL_BCONDS_WITH="" - if egrep -q '^# *_with' ${SPECFILE}; then + if grep -Eq '^# *_with' ${SPECFILE}; then echo >&2 "ERROR: This spec has old style bconds." exit 1 fi @@ -1534,19 +1688,25 @@ set_bconds_values() { case "$opt" in without_*) bcond=${opt#without_} - if [[ "$BCOND" = *--without?${bcond}* ]]; then + case "$BCOND" in + *--without?${bcond}*) AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$bcond>" - else + ;; + *) AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $bcond" - fi + ;; + esac ;; with_*) bcond=${opt#with_} - if [[ "$BCOND" = *--with?${bcond}* ]]; then + case "$BCOND" in + *--with?${bcond}*) AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$bcond>" - else + ;; + *) AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH $bcond" - fi + ;; + esac ;; *) echo >&2 "ERROR: unexpected '$opt' in set_bconds_values" @@ -1596,15 +1756,15 @@ spawn_sub_builder() { update_shell_title "spawn_sub_builder $package_name" sub_builder_opts='' - if [ "${FETCH_BUILD_REQUIRES}" == "yes" ]; then + if [ "${FETCH_BUILD_REQUIRES}" = "yes" ]; then sub_builder_opts="${sub_builder_opts} -R" fi - if [ "${REMOVE_BUILD_REQUIRES}" == "nice" ]; then + if [ "${REMOVE_BUILD_REQUIRES}" = "nice" ]; then sub_builder_opts="${sub_builder_opts} -RB" - elif [ "${REMOVE_BUILD_REQUIRES}" == "force" ]; then + elif [ "${REMOVE_BUILD_REQUIRES}" = "force" ]; then sub_builder_opts="${sub_builder_opts} -FRB" fi - if [ "${UPDATE_POLDEK_INDEXES}" == "yes" ]; then + if [ "${UPDATE_POLDEK_INDEXES}" = "yes" ]; then sub_builder_opts="${sub_builder_opts} -Upi" fi @@ -1633,19 +1793,24 @@ remove_build_requires() { display_bconds() { if [ "$AVAIL_BCONDS_WITH" -o "$AVAIL_BCONDS_WITHOUT" ]; then if [ "$BCOND" ]; then - echo -ne "\nBuilding $SPECFILE with the following conditional flags:\n" - echo -ne "$BCOND" + echo "" + echo "Building $SPECFILE with the following conditional flags:" + echo -n "$BCOND" else - echo -ne "\nNo conditional flags passed" + echo "" + echo "No conditional flags passed" fi - echo -ne "\n\nfrom available:\n" - echo -ne "--with :\t$AVAIL_BCONDS_WITH\n--without:\t$AVAIL_BCONDS_WITHOUT\n\n" + echo "" + echo "from available:" + echo "--with :\t$AVAIL_BCONDS_WITH" + echo "--without:\t$AVAIL_BCONDS_WITHOUT" + echo "" fi } display_branches() { if [ "$NOCVSSPEC" != "yes" ]; then - echo -ne "Available branches: " + echo -n "Available branches: " $CVS_COMMAND status -v "${SPECFILE}" | awk '!/Sticky Tag:/ && /\(branch:/ { print $1 } ' | xargs fi } @@ -1741,10 +1906,12 @@ fetch_build_requires() fi # XXX is this ugliest code written in human history still needed? - echo -ne "\nAll packages installed by fetch_build_requires() are written to:\n" - echo -ne "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES\n" - echo -ne "\nIf anything fails, you may get rid of them by executing:\n" - echo "poldek -e \`cat `pwd`/.${SPECFILE}_INSTALLED_PACKAGES\`\n\n" + echo "All packages installed by fetch_build_requires() are written to:" + echo "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES" + echo "" + echo "If anything fails, you may get rid of them by executing:" + echo "poldek -e \`cat `pwd`/.${SPECFILE}_INSTALLED_PACKAGES\`" + echo "" echo > `pwd`/.${SPECFILE}_INSTALLED_PACKAGES for package_item in $(cat $SPECFILE | grep -B100000 ^%changelog|grep -v ^#|grep BuildRequires|grep -v ^-|sed -e "s/^.*BuildRequires://g"|awk '{print $1}'|sed -e s,perl\(,perl-,g -e s,::,-,g -e s,\(.*\),,g -e s,%{,,g -e s,},,g|grep -v OpenGL-devel|sed -e s,sh-utils,coreutils,g -e s,fileutils,coreutils,g -e s,textutils,coreutils,g -e s,kgcc_package,gcc,g -e s,\),,g) do @@ -1817,11 +1984,11 @@ fetch_build_requires() for package_name in `cat ".$package-req.txt"|grep -v ^#` do if [ "$package_name" = "$package" ]; then - echo -ne "Installing BuildRequired package:\t$package_name\n" + echo "Installing BuildRequired package:\t$package_name" update_shell_title "Installing BuildRequired package: ${package_name}" install_required_packages $package else - echo -ne "Installing (sub)Required package:\t$package_name\n" + echo "Installing (sub)Required package:\t$package_name" update_shell_title "Installing (sub)Required package: ${package_name}" install_required_packages $package_name fi @@ -1832,7 +1999,7 @@ fetch_build_requires() ;; *) echo "Attempting to run spawn sub - builder..." - echo -ne "Package installation failed:\t$package_name\n" + echo "Package installation failed:\t$package_name" run_sub_builder $package_name if [ $? -eq 0 ]; then install_required_packages $package_name @@ -1852,7 +2019,7 @@ fetch_build_requires() rm -f ".$package-req.txt" else echo "Attempting to run spawn sub - builder..." - echo -ne "Package installation failed:\t$package\n" + echo "Package installation failed:\t$package" run_sub_builder $package if [ $? -eq 0 ]; then install_required_packages $package @@ -1884,13 +2051,23 @@ fetch_build_requires() } init_rpm_dir() { - TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}') - CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot" - - echo "Initialising rpm directories to $TOP_DIR from $CVSROOT" - mkdir -p $TOP_DIR/{RPMS,BUILD,SRPMS} - cd $TOP_DIR - $CVS_COMMAND -d $CVSROOT co packages/{.cvsignore,rpm.groups,dropin,mirrors,md5,adapter{,.awk},fetchsrc_request,builder,{relup,compile,repackage}.sh} + local CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot" + local TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}') + local rpmdir=$(eval $RPM $RPMOPTS --eval '%{_rpmdir}') + local buildir=$(eval $RPM $RPMOPTS --eval '%{_builddir}') + local srpmdir=$(eval $RPM $RPMOPTS --eval '%{_srcrpmdir}') + local tmp + + echo "Initializing rpm directories to $TOP_DIR from $CVSROOT" + mkdir -p $TOP_DIR $rpmdir $buildir $srpmdir + + # need to checkout to tmp dir or we can't name our topdir + tmp=$(TMPDIR= TEMPDIR= mktemp -p $TOP_DIR -d) || exit 1 + cd $tmp + $CVS_COMMAND -d $CVSROOT co packages/{.cvsignore,rpm.groups,dropin,mirrors,md5,adapter{,.awk},fetchsrc_request,builder,{relup,compile,repackage}.sh,ci,civim} + cd - + mv $tmp/packages/* $TOP_DIR + rm -rf $tmp init_builder @@ -1898,11 +2075,11 @@ init_rpm_dir() { echo "- run cvs co SPECS" echo "To checkout *all* packages:" - echo "- run cvs up -dP in $TOP_DIR/packages dir" + echo "- run cvs up -dP in $TOP_DIR dir" echo "" echo "To commit with your developer account:" - echo "- edit $TOP_DIR/packages/CVS/Root" + echo "- edit $TOP_DIR/CVS/Root" } get_greed_sources() { @@ -1940,11 +2117,13 @@ mr_proper() { get_spec parse_spec + local builddir=$(eval $RPM $RPMOPTS --eval '%{_builddir}') + # remove from CVS/Entries cvs_entry_remove $PACKAGE_DIR $SPECFILE $SOURCES $PATCHES # remove spec and sources - $RPMBUILD --clean --rmsource --rmspec --nodeps --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE + $RPMBUILD --clean --rmsource --rmspec --nodeps --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" --define "_builddir $builddir" $SPECFILE } #--------------------------------------------- @@ -1957,6 +2136,12 @@ fi while [ $# -gt 0 ]; do case "${1}" in + -4|-6) + # NOTE: we should be fetcher specific, like fille WGET_OPTS, but + # unfortunately $GETURI is already formed + GETURI="$GETURI $1" + shift + ;; -5 | --update-md5) COMMAND="update_md5" NODIST="yes" @@ -1978,8 +2163,11 @@ while [ $# -gt 0 ]; do COMMAND="version"; shift ;; --short-version ) COMMAND="short-version"; shift ;; - -a | --as_anon ) + --as_anon ) CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"; shift ;; + -a | --add_cvs) + COMMAND="add_cvs"; + shift ;; -b | -ba | --build ) COMMAND="build"; shift ;; -bb | --build-binary ) @@ -1997,7 +2185,7 @@ while [ $# -gt 0 ]; do -B | --branch ) COMMAND="branch"; shift; TAG="${1}"; shift;; -c | --clean ) - CLEAN="--clean --rmspec --rmsource"; shift ;; + CLEAN="--clean"; shift ;; -cf | --cvs-force ) CVS_FORCE="-F"; shift;; -d | --cvsroot ) @@ -2006,8 +2194,18 @@ while [ $# -gt 0 ]; do COMMAND="get"; shift ;; -h | --help ) COMMAND="usage"; shift ;; + --ftp ) + PROTOCOL="ftp"; shift ;; --http ) PROTOCOL="http"; shift ;; + -j) + RPMOPTS="${RPMOPTS} --define \"_smp_mflags -j$2\"" + shift 2 + ;; + -j[0-9]*) + RPMOPTS="${RPMOPTS} --define \"_smp_mflags $1\"" + shift + ;; -l | --logtofile ) shift; LOGFILE="${1}"; shift ;; -ni| --nice ) @@ -2049,6 +2247,8 @@ while [ $# -gt 0 ]; do shift; RPMOPTS="${RPMOPTS} ${1}"; shift ;; --nopatch | -np ) shift; RPMOPTS="${RPMOPTS} --define \"patch${1} : ignoring patch${1}; exit 1; \""; shift ;; + --skip-patch | -sp ) + shift; RPMOPTS="${RPMOPTS} --define \"patch${1} : skiping patch${1}\""; shift ;; --topdir) RPMOPTS="${RPMOPTS} --define \"_topdir $2\"" shift 2 @@ -2104,19 +2304,19 @@ while [ $# -gt 0 ]; do -sc | --sources-cvs) COMMAND="list-sources-cvs" shift ;; - -sd | --sources-distfiles) + -sd | --source-distfiles) COMMAND="list-sources-distfiles" shift ;; - -sdp | --sources-distfiles-paths) + -sdp | --source-distfiles-paths) COMMAND="list-sources-distfiles-paths" shift ;; - -sf | --sources-files) + -sf | --source-files) COMMAND="list-sources-files" shift ;; - -sp | --sources-paths) + -lsp | --source-paths) COMMAND="list-sources-local-paths" shift ;; - -su | --sources-urls) + -su | --source-urls) COMMAND="list-sources-urls" shift ;; -Tvs | --tag-version-stable ) @@ -2166,6 +2366,8 @@ while [ $# -gt 0 ]; do shift;; -u | --try-upgrade ) TRY_UPGRADE="1"; shift ;; + --upgrade-version ) + shift; UPGRADE_VERSION="$1"; shift;; -un | --try-upgrade-with-float-version ) TRY_UPGRADE="1"; FLOAT_VERSION="1"; shift ;; -v | --verbose ) @@ -2199,6 +2401,10 @@ while [ $# -gt 0 ]; do COMMAND="show_bcond_args" shift ;; + --show-avail-bconds) + COMMAND="show_avail_bconds" + shift + ;; --nodeps) shift RPMOPTS="${RPMOPTS} --nodeps" @@ -2210,20 +2416,21 @@ while [ $# -gt 0 ]; do Exit_error err_invalid_cmdline "$1" ;; *) - SPECFILE="${1}" + SPECFILE=${1%/}; shift # check if specname was passed as specname:cvstag if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then CVSTAG="${SPECFILE##*:}" SPECFILE="${SPECFILE%%:*}" fi + # always have SPECFILE ending with .spec extension + SPECFILE=${SPECFILE%%.spec}.spec ASSUMED_NAME=$(basename ${SPECFILE%%.spec}) - shift esac done [ -d "$ASSUMED_NAME" ] && CVS_ENTRIES="$ASSUMED_NAME/CVS/Entries" || CVS_ENTRIES="CVS/Entries" if [ -f "$CVS_ENTRIES" ] && [ -z "$CVSTAG" ]; then - CVSTAG=$(awk -vSPECFILE=$(basename ${SPECFILE%.spec}.spec) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' ${CVS_ENTRIES}) + CVSTAG=$(awk -vSPECFILE=$(basename $SPECFILE) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' ${CVS_ENTRIES}) if [ "$CVSTAG" ]; then echo >&2 "builder: Sticky tag $CVSTAG active. Use -r TAGNAME to override." fi @@ -2261,151 +2468,208 @@ update_shell_title "$COMMAND" case "$COMMAND" in "show_bconds") init_builder - if [ -n "$SPECFILE" ]; then - get_spec > /dev/null - parse_spec - set_bconds_values - display_bconds + if [ -z "$SPECFILE" ]; then + Exit_error err_no_spec_in_cmdl fi + get_spec > /dev/null + parse_spec + set_bconds_values + display_bconds ;; "show_bcond_args") init_builder - if [ -n "$SPECFILE" ]; then - get_spec > /dev/null - parse_spec - set_bconds_values - echo "$BCOND" + if [ -z "$SPECFILE" ]; then + Exit_error err_no_spec_in_cmdl fi + get_spec > /dev/null + parse_spec + set_bconds_values + echo "$BCOND" ;; - "build" | "build-binary" | "build-source" | "build-prep" | "build-build" | "build-install" | "build-list") + "show_avail_bconds") init_builder - if [ -n "$SPECFILE" ]; then - # display SMP make flags if set - smp_mflags=$(rpm -E %{?_smp_mflags}) - if [ "$smp_mflags" ]; then - echo >&2 "builder: SMP make flags are set to $smp_mflags" - fi + if [ -z "$SPECFILE" ]; then + Exit_error err_no_spec_in_cmdl + fi - get_spec - parse_spec - set_bconds_values - display_bconds - display_branches - if [ "$COMMAND" != "build-source" ]; then - check_buildarch - fi - fetch_build_requires - if [ "$INTEGER_RELEASE" = "yes" ]; then - echo "Checking release $PACKAGE_RELEASE..." - if echo $PACKAGE_RELEASE | grep -q '^[^.]*\.[^.]*$' 2>/dev/null ; then - Exit_error err_fract_rel "$PACKAGE_RELEASE" - fi - fi + get_spec > /dev/null + parse_spec + local bcond_avail=$(find_spec_bcond $SPECFILE) + local opt bcond bconds + for opt in $bcond_avail; do + case "$opt" in + without_*) + bcond=${opt#without_} + bconds="$bconds $bcond" + ;; + with_*) + bcond=${opt#with_} + bconds="$bconds $bcond" + ;; + *) + echo >&2 "ERROR: unexpected '$opt' in show_avail_bconds" + exit 1 + ;; + esac + done + echo $bconds - # ./builder -bs test.spec -r AC-branch -Tp auto-ac- -tt - if [ -n "$TEST_TAG" ]; then - local TAGVER=`make_tagver` - echo "Searching for tag $TAGVER..." - TAGREL=$($CVS_COMMAND status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g') - if [ -n "$TAGREL" ]; then - Exit_error err_tag_exists "$TAGVER" "$TAGREL" - fi + ;; + "build" | "build-binary" | "build-source" | "build-prep" | "build-build" | "build-install" | "build-list") + init_builder + if [ -z "$SPECFILE" ]; then + Exit_error err_no_spec_in_cmdl + fi - # - do not allow to build from HEAD when XX-branch exists - TREE_PREFIX=$(echo "$TAG_PREFIX" | sed -e 's#^auto-\([a-zA-Z]\+\)-.*#\1#g') - if [ "$TREE_PREFIX" != "$TAG_PREFIX" ]; then - TAG_BRANCH="${TREE_PREFIX}-branch" - TAG_STATUS=$($CVS_COMMAND status -v $SPECFILE | grep -Ei "${TAG_BRANCH}.+(branch: [0-9.]+)") - if [ -n "$TAG_STATUS" -a "$CVSTAG" = "HEAD" ]; then - Exit_error err_branch_exists "$TAG_STATUS" - fi - fi + # display SMP make flags if set + smp_mflags=$(rpm -E %{?_smp_mflags}) + if [ "$smp_mflags" ]; then + echo "builder: SMP make flags are set to $smp_mflags" + fi + get_spec + parse_spec + set_bconds_values + display_bconds + display_branches + if [ "$COMMAND" != "build-source" ]; then + check_buildarch + fi + fetch_build_requires + if [ "$INTEGER_RELEASE" = "yes" ]; then + echo "Checking release $PACKAGE_RELEASE..." + if echo $PACKAGE_RELEASE | grep -q '^[^.]*\.[^.]*$' 2>/dev/null ; then + Exit_error err_fract_rel "$PACKAGE_RELEASE" fi + fi - if [ -n "$NOSOURCE0" ] ; then - SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` + # ./builder -bs test.spec -r AC-branch -Tp auto-ac- -tt + if [ -n "$TEST_TAG" ]; then + local TAGVER=`make_tagver` + # escape some regexp characters if part of TAGVER + TAGVER=$(echo "$TAGVER" | sed -e 's#\([\+\*\.]\)#\\\1#g') + echo "Searching for tag $TAGVER..." + TAGREL=$($CVS_COMMAND status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g') + if [ -n "$TAGREL" ]; then + Exit_error err_tag_exists "$TAGVER" "$TAGREL" fi - 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 + + # - do not allow to build from HEAD when XX-branch exists + TREE_PREFIX=$(echo "$TAG_PREFIX" | sed -e 's#^auto-\([a-zA-Z]\+\)-.*#\1#g') + if [ "$TREE_PREFIX" != "$TAG_PREFIX" ]; then + TAG_BRANCH="${TREE_PREFIX}-branch" + TAG_STATUS=$($CVS_COMMAND status -v $SPECFILE | grep -Ei "${TAG_BRANCH}.+(branch: [0-9.]+)") + if [ -n "$TAG_STATUS" -a "$CVSTAG" = "HEAD" ]; then + Exit_error err_branch_exists "$TAG_STATUS" + fi fi - remove_build_requires - else - Exit_error err_no_spec_in_cmdl + + fi + + if [ -n "$NOSOURCE0" ] ; then + SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` + fi + try_upgrade + case $? in + 0) + get_files $SOURCES $PATCHES + check_md5 $SOURCES + ;; + *) + NODIST="yes" get_files $SOURCES $PATCHES + update_md5 $SOURCES $PATCHES + ;; + esac + build_package + if [ "$UPDATE_POLDEK_INDEXES" = "yes" -a "$COMMAND" != "build-prep" ]; then + run_poldek --sdir="${POLDEK_INDEX_DIR}" --mkidxz fi + remove_build_requires ;; "branch" ) init_builder - if [ -n "$SPECFILE" ]; then - get_spec - parse_spec - # 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 + if [ -z "$SPECFILE" ]; then Exit_error err_no_spec_in_cmdl fi + + get_spec + parse_spec + # 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 ;; - "get" ) + "add_cvs" ) init_builder - if [ -n "$SPECFILE" ]; then - get_spec - parse_spec + if [ -z "$SPECFILE" ]; then + Exit_error err_no_spec_in_cmdl + fi - if [ -n "$NOSOURCE0" ] ; then - SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` - fi - get_files $SOURCES $PATCHES - check_md5 $SOURCES - else + ADD_PACKAGE_CVS=yes get_spec + parse_spec + + if [ -n "$NOSOURCE0" ] ; then + SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` + fi + get_files $SOURCES $PATCHES + check_md5 $SOURCES + ;; + "get" ) + init_builder + if [ -z "$SPECFILE" ]; then Exit_error err_no_spec_in_cmdl fi + + get_spec + parse_spec + + if [ -n "$NOSOURCE0" ] ; then + SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` + fi + get_files $SOURCES $PATCHES + check_md5 $SOURCES ;; "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 + if [ -z "$SPECFILE" ]; then Exit_error err_no_spec_in_cmdl fi + + get_spec + parse_spec + + if [ -n "$NOSOURCE0" ] ; then + SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'` + fi + update_md5 $SOURCES $PATCHES ;; "tag" ) NOURLS=1 NODIST="yes" init_builder - if [ -n "$SPECFILE" ]; then - get_spec - parse_spec - - # 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 - tag_files $SOURCES $PATCHES $ICONS - else + if [ -z "$SPECFILE" ]; then Exit_error err_no_spec_in_cmdl fi + + get_spec + parse_spec + + # 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 + tag_files $SOURCES $PATCHES $ICONS ;; "mr-proper" ) mr_proper