From c84527123dcbbfab3913864a10ebea117f96411a1a3088ead46048abc29d43fa Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 20 May 2010 08:47:32 +0000 Subject: [PATCH 1/3] Accepting request 40420 from home:a_jaeger:branches:build-compare-test Copy from home:a_jaeger:branches:build-compare-test/build-compare via accept of submit request 40420 revision 27. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40420 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=69 --- build-compare.changes | 6 ++++++ same-build-result.sh | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 2d7844c..38b70b8 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -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 diff --git a/same-build-result.sh b/same-build-result.sh index 8706d29..8607ba0 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -49,14 +49,15 @@ fi echo "compare $osrpm $nsrpm" bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 -# technically we should not all exclude all -32bit but filter for different archs, but it would be better -# if this script ran earlier in the build +# technically we should not all exclude all -32bit but filter for different archs, +# 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 # 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 # 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)) -NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort --field-separator=/ --key=7|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-.*\.ia64\.rpm')) rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature ' for opac in ${OLDRPMS[*]}; do From b3e42e25eabb8e6d9986dbcae0c62e82ecc06c643ff817d901569cb2733e1413 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 21 May 2010 21:30:08 +0000 Subject: [PATCH 2/3] Accepting request 40421 from openSUSE:Tools checked in (request 40421) OBS-URL: https://build.opensuse.org/request/show/40421 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=70 --- build-compare.changes | 6 ------ same-build-result.sh | 9 ++++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 38b70b8..2d7844c 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/same-build-result.sh b/same-build-result.sh index 8607ba0..8706d29 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -49,15 +49,14 @@ fi echo "compare $osrpm $nsrpm" bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 -# technically we should not all exclude all -32bit but filter for different archs, -# like done with -x86 -# but it would be better if this script ran earlier in the build +# technically we should not all exclude all -32bit but filter for different archs, but it would be better +# if this script ran earlier in the build # 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 # 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. -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-.*\.ia64\.rpm')) +OLDRPMS=($(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm|sort|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)) rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature ' for opac in ${OLDRPMS[*]}; do From 94fc6ede57261e8f757a3c1a7bbe2ca15c4d13edd93ca08c73039a147abbec7b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 21 May 2010 21:30:12 +0000 Subject: [PATCH 3/3] 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 --- build-compare.changes | 6 ++++++ build-compare.spec | 2 +- same-build-result.sh | 9 +++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 2d7844c..38b70b8 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -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 diff --git a/build-compare.spec b/build-compare.spec index c82df4c..a813131 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script Version: 2009.10.14 -Release: 12 +Release: 13 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING diff --git a/same-build-result.sh b/same-build-result.sh index 8706d29..8607ba0 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -49,14 +49,15 @@ fi echo "compare $osrpm $nsrpm" bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 -# technically we should not all exclude all -32bit but filter for different archs, but it would be better -# if this script ran earlier in the build +# technically we should not all exclude all -32bit but filter for different archs, +# 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 # 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 # 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)) -NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort --field-separator=/ --key=7|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-.*\.ia64\.rpm')) rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature ' for opac in ${OLDRPMS[*]}; do