summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-05 15:01:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-07 12:16:00 +0100
commit622b3f851ec5521375c84fb2719684391ac9e6e7 (patch)
tree81d0d1afa05355650e653983c67e377bff9320c1
parent3e4dd4c8fd5f4c4cbbc1a83b73d12c10ab616f4a (diff)
downloadpoky-622b3f851ec5521375c84fb2719684391ac9e6e7.tar.gz
build-compare: update to latest revision
Drop the patch as upstream has refactored the code, and recent reproducible builds work has likely rendered it unnecessary. (From OE-Core rev: fb26d418fdf556dc28df8304d9856fedcb586041) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/build-compare/build-compare_git.bb8
-rw-r--r--meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch37
2 files changed, 3 insertions, 42 deletions
diff --git a/meta/recipes-devtools/build-compare/build-compare_git.bb b/meta/recipes-devtools/build-compare/build-compare_git.bb
index b0560cc277..d2a4b5444d 100644
--- a/meta/recipes-devtools/build-compare/build-compare_git.bb
+++ b/meta/recipes-devtools/build-compare/build-compare_git.bb
@@ -5,15 +5,13 @@ HOMEPAGE = "https://github.com/openSUSE/build-compare"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
7 7
8SRC_URI = "git://github.com/openSUSE/build-compare.git \ 8SRC_URI = "git://github.com/openSUSE/build-compare.git"
9 file://Ignore-DWARF-sections.patch;striplevel=1 \
10 "
11 9
12# Date matches entry in build-compare.changes and date of SRCREV. 10# Date matches entry in build-compare.changes and date of SRCREV.
13# 11#
14SRCREV = "4dfa207660776cae120afa4353aec7f1f2a998d2" 12SRCREV = "28bf642fcfdab94adb9b847329338005be6f73c7"
15PE = "1" 13PE = "1"
16PV = "2019.08.14+git${SRCPV}" 14PV = "2020.03.31+git${SRCPV}"
17UPSTREAM_CHECK_COMMITS = "1" 15UPSTREAM_CHECK_COMMITS = "1"
18 16
19S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch b/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
deleted file mode 100644
index 2fb62ae8ce..0000000000
--- a/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 015715694eadd714b903f30ade876e0738d44974 Mon Sep 17 00:00:00 2001
2From: Randy Witt <randy.e.witt@linux.intel.com>
3Date: Mon, 5 Jan 2015 15:09:20 -0800
4Subject: [PATCH] Ignore DWARF sections.
5
6Assume for now that we don't care about the DWARF sections due to path
7differences. However, in the case the tool is ran on a "debug" package
8it will most likely falsely say the packages have no differences.
9
10Upstream-Status: Inappropriate [other]
11
12The package difference tool is correctly labelling the packages as different
13when the DWARF sections don't match due to paths. The paths in the debug info
14should actually be made to be the same using compile flags or some other
15mechanism.
16
17However, to make the tool more useful to Yocto until the work can be done
18to ensure identical paths in debug sections, this patch is being applied.
19
20Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
21---
22 pkg-diff.sh | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/pkg-diff.sh b/pkg-diff.sh
26index 9c2125e..b0d77c8 100755
27--- a/pkg-diff.sh
28+++ b/pkg-diff.sh
29@@ -851,7 +851,7 @@ check_single_file()
30 echo "" >$file1
31 echo "" >$file2
32 # Don't compare .build-id, .gnu_debuglink and .gnu_debugdata sections
33- 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" " ")"
34+ 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" -e "\.debug_abbrev" -e "\.debug_aranges" -e "\.debug_frame" -e "\.debug_info" -e "\.debug_line" -e "\.debug_loc" -e "\.debug_macinfo" -e "\.debug_pubnames" -e "\.debug_pubtypes" -e "\.debug_ranges" -e "\.debug_str" | tr "\n" " ")"
35 for section in $sections; do
36 $OBJDUMP -s -j $section old/$file | sed "s,^old/,," > $file1
37 $OBJDUMP -s -j $section new/$file | sed "s,^new/,," > $file2