aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-04-07 09:52:04 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-07 00:51:12 +0100
commitf0d7ab259d8ef95643e7229474b7850608aa4426 (patch)
treede51a71d346c00406b450f57e7ee6706ab0bf01c /bin
parentc87764b9147792a10efad3ed5378f36f0a055bc6 (diff)
downloadbitbake-f0d7ab259d8ef95643e7229474b7850608aa4426.tar.gz
bitbake-diffsigs: drop naive logic for removing duplicate files
This logic doesn't work in practice, certainly not with current versions where sigdata files are preserved in the stamps directory and therefore there will often be multiple sigdata files - you can now easily get files for the same signature from sstate and the stamps directory with the result that bitbake-diffsigs reports nothing has changed. Instead, let's change the find_siginfo function in OE-Core to simply not return duplicates so we don't have to filter them out here. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/bitbake-diffsigs16
1 files changed, 0 insertions, 16 deletions
diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs
index f84188d57..5400e5b92 100755
--- a/bin/bitbake-diffsigs
+++ b/bin/bitbake-diffsigs
@@ -37,12 +37,6 @@ logger = bb.msg.logger_create('bitbake-diffsigs')
def find_compare_task(bbhandler, pn, taskname):
""" Find the most recent signature files for the specified PN/task and compare them """
- def get_hashval(siginfo):
- if siginfo.endswith('.siginfo'):
- return siginfo.rpartition(':')[2].partition('_')[0]
- else:
- return siginfo.rpartition('.')[2]
-
if not hasattr(bb.siggen, 'find_siginfo'):
logger.error('Metadata does not support finding signature data files')
sys.exit(1)
@@ -59,16 +53,6 @@ def find_compare_task(bbhandler, pn, taskname):
logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (pn, taskname))
sys.exit(1)
else:
- # It's possible that latestfiles contain 3 elements and the first two have the same hash value.
- # In this case, we delete the second element.
- # The above case is actually the most common one. Because we may have sigdata file and siginfo
- # file having the same hash value. Comparing such two files makes no sense.
- if len(latestfiles) == 3:
- hash0 = get_hashval(latestfiles[0])
- hash1 = get_hashval(latestfiles[1])
- if hash0 == hash1:
- latestfiles.pop(1)
-
# Define recursion callback
def recursecb(key, hash1, hash2):
hashes = [hash1, hash2]