From 838f0f6c6bb39c38fd495672d91ffb32399a9a3fb89456684dbd2a277693e9ba Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 7 Oct 2009 15:03:35 +0000 Subject: [PATCH 1/3] Accepting request 20987 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/build-compare via accept of submit request 20987 revision 14. OBS-URL: https://build.opensuse.org/request/show/20987 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=38 --- build-compare.changes | 5 +++++ same-build-result.sh | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/build-compare.changes b/build-compare.changes index dddd201..97b96dc 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 24 06:47:22 UTC 2009 - aj@suse.de + +- Add comments. + ------------------------------------------------------------------- Wed Sep 23 15:17:49 UTC 2009 - aj@suse.de diff --git a/same-build-result.sh b/same-build-result.sh index ce2125d..aab2e5d 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -7,6 +7,8 @@ # # The script decides if the new build differes from the former one, # using rpm-check.sh. +# The script is called as part of the build process as: +# /usr/lib/build/same-build-result.sh /.build.oldpackages /usr/src/packages/RPMS /usr/src/packages/SRPMS CMPSCRIPT=${0%/*}/rpm-check.sh @@ -50,6 +52,10 @@ 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 +# 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)) From d3fa151c4298461caf538bbe8483af9052a54f370ec7013f8bc9e91da12d2822 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 8 Oct 2009 02:01:39 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=39 --- build-compare.changes | 5 ----- same-build-result.sh | 6 ------ 2 files changed, 11 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 97b96dc..dddd201 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 24 06:47:22 UTC 2009 - aj@suse.de - -- Add comments. - ------------------------------------------------------------------- Wed Sep 23 15:17:49 UTC 2009 - aj@suse.de diff --git a/same-build-result.sh b/same-build-result.sh index aab2e5d..ce2125d 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -7,8 +7,6 @@ # # The script decides if the new build differes from the former one, # using rpm-check.sh. -# The script is called as part of the build process as: -# /usr/lib/build/same-build-result.sh /.build.oldpackages /usr/src/packages/RPMS /usr/src/packages/SRPMS CMPSCRIPT=${0%/*}/rpm-check.sh @@ -52,10 +50,6 @@ 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 -# 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)) From 686f819b327814eb95c3f3dba107fba0c251e1633f33e63829763b82fcfdb82f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 8 Oct 2009 02:01:40 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/build-compare revision 16.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=de00196ae4f956a4900c74bac264569e --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- same-build-result.sh | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index dddd201..97b96dc 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 24 06:47:22 UTC 2009 - aj@suse.de + +- Add comments. + ------------------------------------------------------------------- Wed Sep 23 15:17:49 UTC 2009 - aj@suse.de diff --git a/build-compare.spec b/build-compare.spec index bf3558a..2aab2df 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.08.20 -Release: 2 +Release: 3 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING diff --git a/same-build-result.sh b/same-build-result.sh index ce2125d..aab2e5d 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -7,6 +7,8 @@ # # The script decides if the new build differes from the former one, # using rpm-check.sh. +# The script is called as part of the build process as: +# /usr/lib/build/same-build-result.sh /.build.oldpackages /usr/src/packages/RPMS /usr/src/packages/SRPMS CMPSCRIPT=${0%/*}/rpm-check.sh @@ -50,6 +52,10 @@ 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 +# 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))