Accepting request 239818 from openSUSE:Tools

1

OBS-URL: https://build.opensuse.org/request/show/239818
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=77

build-compare.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jul  7 08:28:45 UTC 2014 - aj@suse.com
+
+- Fix last patch to not use non-existant file (bnc#877078).
+
+-------------------------------------------------------------------
+Fri May  9 18:30:26 UTC 2014 - johannesobermayr@gmx.de
+
+- Don't compare .note.gnu.build-id and .gnu_debuglink sections in ELF
+  binaries (bnc#877078).
+- Don't compare debuginfo packages.
+
 -------------------------------------------------------------------
 Thu Oct 17 12:44:19 UTC 2013 - schwab@suse.de
 

build-compare.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package build-compare
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

rpm-check.sh

@@ -460,10 +460,14 @@ check_single_file()
           head -n 200 $dfile
           return 1
        fi
-       objdump -s old/$file > $file1
+       echo "" >$file1
-       sed -i -e "s,old/,," $file1
+       echo "" >$file2
-       objdump -s new/$file > $file2
+       # Don't compare .build-id and .gnu_debuglink sections
-       sed -i -e "s,new/,," $file2
+       for section in $(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (\..*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr
+"\n" " "); do
+          objdump -s -j $section old/$file | sed "s,old/,," >> $file1
+          objdump -s -j $section new/$file | sed "s,new/,," >> $file2
+       done
        if ! diff -u $file1 $file2 > $dfile; then
           echo "$file differs in ELF sections"
           head -n 200 $dfile

same-build-result.sh

@@ -79,9 +79,13 @@ for opac in ${OLDRPMS[*]}; do
      echo "names differ: $oname $nname"
      exit 1
   fi
-  bash $CMPSCRIPT "$opac" "$npac" || SUCCESS=0
+  if [ $(echo "$opac" | grep -e "debuginfo") ]; then
-  if test $SUCCESS -eq 0 -a -z "$check_all"; then
+     echo "skipping -debuginfo package"
-     exit 1
+  else
+     bash $CMPSCRIPT "$opac" "$npac" || SUCCESS=0
+     if test $SUCCESS -eq 0 -a -z "$check_all"; then
+        exit 1
+     fi
   fi
 done