From patchwork Wed Dec 19 23:26:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel] fetch2: Sort file checksums by value, not path Date: Wed, 19 Dec 2012 23:26:50 -0000 From: Tyler Hall X-Patchwork-Id: 41603 Message-Id: <1355959610-29470-1-git-send-email-tylerwhall@gmail.com> To: bitbake-devel@lists.openembedded.org Changing the path to a file could change the task hash even if the file still has the same checksum. This occurs when the task depends on multiple files and the sort order of their paths changes. Usually the sorting is consistent because layers tend to have the same relative paths, but this should take care of other configuations. The problem arose when using a .bbappend to add files to a recipe in another layer. If the layer is located alongside the other layers and their parent directory is moved, the hash does not change. However, moving the .bbappend layer outside of the common directory can change the path sort order and the task hash. Signed-off-by: Tyler Hall --- lib/bb/fetch2/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 150dc3c..4746356 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -30,6 +30,7 @@ from __future__ import print_function import os, re import logging import urllib +import operator import bb.persist_data, bb.utils import bb.checksum from bb import data @@ -729,7 +730,7 @@ def get_file_checksums(filelist, pn): if checksum: checksums.append((pth, checksum)) - checksums.sort() + checksums.sort(key=operator.itemgetter(1)) return checksums