3
0
forked from pool/build-compare

Updating link to change in openSUSE:Factory/build-compare revision 31.0

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=3c006d800b36962f9c91e7d2fc2fb0e3
This commit is contained in:
OBS User buildservice-autocommit 2010-05-21 21:30:12 +00:00 committed by Git OBS Bridge
parent b3e42e25ea
commit 94fc6ede57
3 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 20 08:23:52 UTC 2010 - aj@suse.de
- Don't skip cross-x86_64-gcc-icecream-backend binary rpms: tighten
the checks for -32bit packages.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 16 12:55:43 UTC 2010 - aj@suse.de Sun May 16 12:55:43 UTC 2010 - aj@suse.de

View File

@ -24,7 +24,7 @@ Group: Development/Tools/Building
AutoReqProv: on AutoReqProv: on
Summary: Build Result Compare Script Summary: Build Result Compare Script
Version: 2009.10.14 Version: 2009.10.14
Release: 12 Release: 13
Source: same-build-result.sh Source: same-build-result.sh
Source1: rpm-check.sh Source1: rpm-check.sh
Source2: COPYING Source2: COPYING

View File

@ -49,14 +49,15 @@ fi
echo "compare $osrpm $nsrpm" echo "compare $osrpm $nsrpm"
bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1
# technically we should not all exclude all -32bit but filter for different archs, but it would be better # technically we should not all exclude all -32bit but filter for different archs,
# if this script ran earlier in the build # like done with -x86
# but it would be better if this script ran earlier in the build
# sort the rpms so that both lists have the same order # sort the rpms so that both lists have the same order
# problem: a package can contain both noarch and arch subpackages, so we have to # problem: a package can contain both noarch and arch subpackages, so we have to
# take care of proper sorting of NEWRPMS, e.g. noarch/x.rpm and x86_64/w.rpm since OLDRPMS # take care of proper sorting of NEWRPMS, e.g. noarch/x.rpm and x86_64/w.rpm since OLDRPMS
# has all the packages in a single directory and would sort this as w.rpm, x.rpm. # has all the packages in a single directory and would sort this as w.rpm, x.rpm.
OLDRPMS=($(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm|sort|grep -v -- -32bit|grep -v -- -64bit|grep -v -- -x86)) OLDRPMS=($(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm|sort|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm'))
NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit|grep -v -- -64bit|grep -v -- -x86)) NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm'))
rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature ' rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature '
for opac in ${OLDRPMS[*]}; do for opac in ${OLDRPMS[*]}; do