rpm/build-compare
SHA256
1
0
Fork 0
forked from pool/build-compare
Code Pull Requests Activity

Accepting request 440551 from openSUSE:Tools

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/440551
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=100
This commit is contained in:
Dominique Leuenberger 2016-11-19 11:48:41 +00:00 committed by Git OBS Bridge
commit 712158cd25
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build-compare.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Nov 9 06:48:22 UTC 2016 - olaf@aepfle.de
- Ignore /etc/ld.so.cache
- Ignore /etc/machine-id
-------------------------------------------------------------------
Tue Nov 8 08:06:30 UTC 2016 - olaf@aepfle.de
- Ignore /etc/hosts
- Handle every path matching /share/man/ as man page
-------------------------------------------------------------------
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

2
build-compare.spec
View File

@ -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: 20161109T075305.eed6e97
Release: 0
Source1: COPYING
Source2: same-build-result.sh

17
pkg-diff.sh
View File

@ -636,7 +636,7 @@ check_single_file()
trim_man_first_line $f
done
;;
/usr/share/man/*/man*|/usr/share/man/man*|/usr/lib/texmf/doc/man/*/*)
*/share/man/*|/usr/lib/texmf/doc/man/*/*)
for f in old/$file new/$file; do
trim_man_TH $f
@ -735,6 +735,15 @@ check_single_file()
sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "old/$file"
sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "new/$file"
;;
*/ld.so.cache|*/etc/machine-id)
# packaged by libguestfs
return 0
;;
*/etc/hosts)
# packaged by libguestfs
sed -i 's/^127.0.0.1[[:blank:]].*/127.0.0.1 hst/' "old/$file"
sed -i 's/^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 +786,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 +798,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