From 190e92584fa7eabe942900cdf6bd204d7984c6f67eb1d924b92b8be3e882c8b4 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 8 Nov 2016 08:08:18 +0000
Subject: [PATCH] - Ignore /etc/hosts

- Ignore .gnu_debugdata section when comparing ELF files.

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=224
---
 build-compare.changes | 10 ++++++++++
 build-compare.spec    |  2 +-
 pkg-diff.sh           | 11 ++++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/build-compare.changes b/build-compare.changes
index 8eba5c9..bc3bfd3 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov  8 08:06:30 UTC 2016 - olaf@aepfle.de
+
+- Ignore /etc/hosts
+
+-------------------------------------------------------------------
+Mon Nov  7 03:54:00 UTC 2016 - ol@infoserver.lv
+
+- Ignore .gnu_debugdata section when comparing ELF files.
+
 -------------------------------------------------------------------
 Wed Oct 12 16:40:24 CEST 2016 - ro@suse.de
 
diff --git a/build-compare.spec b/build-compare.spec
index 7f92716..e15f274 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:        20161012T163739.10c9ac7
+Version:        20161108T090706.0636a93
 Release:        0
 Source1:        COPYING
 Source2:        same-build-result.sh
diff --git a/pkg-diff.sh b/pkg-diff.sh
index 4404967..298040a 100644
--- a/pkg-diff.sh
+++ b/pkg-diff.sh
@@ -735,6 +735,11 @@ check_single_file()
         sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "old/$file"
         sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "new/$file"
       ;;
+      */etc/hosts)
+        # packaged by libguestfs
+        sed -i '/^127.0.0.1[[:blank:]].*/127.0.0.1 hst/' "old/$file"
+        sed -i '/^127.0.0.1[[:blank:]].*/127.0.0.1 hst/' "new/$file"
+      ;;
   esac
 
   ftype=`/usr/bin/file old/$file | sed -e 's@^[^:]\+:[[:blank:]]*@@' -e 's@[[:blank:]]*$@@'`
@@ -777,8 +782,8 @@ check_single_file()
        fi
        echo "" >$file1
        echo "" >$file2
-       # Don't compare .build-id and .gnu_debuglink sections
-       sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" " ")"
+       # Don't compare .build-id, .gnu_debuglink and .gnu_debugdata sections
+       sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" -e "\.gnu_debugdata" | tr "\n" " ")"
        for section in $sections; do
           $OBJDUMP -s -j $section old/$file | sed "s,^old/,," > $file1
           $OBJDUMP -s -j $section new/$file | sed "s,^new/,," > $file2
@@ -789,7 +794,7 @@ check_single_file()
           fi
        done
        if test -z "$elfdiff"; then
-          echo "$file: only difference was in build-id or gnu_debuglink, GOOD."
+          echo "$file: only difference was in build-id, gnu_debuglink or gnu_debugdata, GOOD."
           return 0
        fi
        return 1