pool/build-compare
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Ignore /etc/hosts

Browse Source 
- Ignore .gnu_debugdata section when comparing ELF files.

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=224
This commit is contained in:
Olaf Hering 2016-11-08 08:08:18 +00:00 committed by Git OBS Bridge
parent ffacc63bab
commit 190e92584f
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-compare.changes
View File

@ -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 Wed Oct 12 16:40:24 CEST 2016 - ro@suse.de

2
build-compare.spec
View File

@ -21,7 +21,7 @@ Summary: Build Result Compare Script
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Tools/Building Group: Development/Tools/Building
Url: https://github.com/openSUSE/build-compare Url: https://github.com/openSUSE/build-compare
Version: 20161012T163739.10c9ac7 Version: 20161108T090706.0636a93
Release: 0 Release: 0
Source1: COPYING Source1: COPYING
Source2: same-build-result.sh Source2: same-build-result.sh

11
pkg-diff.sh
View File

@ -735,6 +735,11 @@ check_single_file()
sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "old/$file" sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "old/$file"
sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "new/$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 esac
ftype=`/usr/bin/file old/$file | sed -e 's@^[^:]\+:[[:blank:]]*@@' -e 's@[[:blank:]]*$@@'` ftype=`/usr/bin/file old/$file | sed -e 's@^[^:]\+:[[:blank:]]*@@' -e 's@[[:blank:]]*$@@'`
@ -777,8 +782,8 @@ check_single_file()
fi fi
echo "" >$file1 echo "" >$file1
echo "" >$file2 echo "" >$file2
# Don't compare .build-id and .gnu_debuglink sections # 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" | tr "\n" " ")" 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 for section in $sections; do
$OBJDUMP -s -j $section old/$file | sed "s,^old/,," > $file1 $OBJDUMP -s -j $section old/$file | sed "s,^old/,," > $file1
$OBJDUMP -s -j $section new/$file | sed "s,^new/,," > $file2 $OBJDUMP -s -j $section new/$file | sed "s,^new/,," > $file2
@ -789,7 +794,7 @@ check_single_file()
fi fi
done done
if test -z "$elfdiff"; then 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 return 0
fi fi
return 1 return 1