From 990e418064440478b18f0bafbeb2fbacb424fd4e37617fcfbf028739574631e6 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 24 Aug 2015 16:09:07 +0000 Subject: [PATCH] _service OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=189 --- build-compare.changes | 6 ++++++ build-compare.spec | 2 +- same-build-result.sh | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index 4f00ec7..ac59918 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 21 12:57:57 UTC 2015 - seife+obs@b1-systems.com + +- avoid -kmp packages with "filename-too-long-for-joliet" + triggering constant republishing + ------------------------------------------------------------------- Wed Jul 15 09:50:58 UTC 2015 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index f964790..3f61fb8 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -21,7 +21,7 @@ Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 2015.07.15 +Version: 20150821T175907.9b8c0be Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/same-build-result.sh b/same-build-result.sh index ed122c2..817817c 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -117,6 +117,13 @@ if test -n "$OTHERDIR"; then # Remove release from files sort -u $OLDDIR/rpmlint.log|sed -e "s,$ver_rel1,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file1 sort -u $OTHERDIR/rpmlint.log|sed -e "s,$ver_rel2,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file2 + ### kmp's are strange: + # the correct way would be to find the versions of -kmp- packages and ignore them, but this will do, too. + # example: this one leads to constant republishing of virtualbox for every build. + # -virtualbox-guest-kmp-default.x86_64: W: filename-too-long-for-joliet virtualbox-guest-kmp-default-5.0.2_k3.16.7_24-177.d_l_ocaml.2.x86_64.rpm + # +virtualbox-guest-kmp-default.x86_64: W: filename-too-long-for-joliet virtualbox-guest-kmp-default-5.0.2_k3.16.7_24-178.d_l_ocaml.1.x86_64.rpm + sed -i -e "/W: filename-too-long-for-joliet/s,\(^.*-kmp-.*-kmp-\).*$,\1," $file1 + sed -i -e "/W: filename-too-long-for-joliet/s,\(^.*-kmp-.*-kmp-\).*$,\1," $file2 if ! cmp -s $file1 $file2; then echo "rpmlint.log files differ:" diff -u $file1 $file2 |head -n 20