diff options
| author |   Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-03-29 16:04:19 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-30 12:01:29 +0100 |
| commit | 292c3e82e3452710a238db6312c9c71ba5416915 (patch) | |
| tree | eeb4d9d4c2ea77f956900a2698ce1799cbaecd6e | |
| parent | 326fc2916eacfbd5ae2508cdcf7cb486d16cb861 (diff) | |
| download | openembedded-core-contrib-292c3e82e3452710a238db6312c9c71ba5416915.tar.gz | |
bitbake: checksum: In FileChecksumCache don't follow directory symlinks
Before this patch, directory symlinks mathcing filename pattern (either
a file name or a glob pattern) were followed. However, directory
symlinks deeper in the search chain were omitted by os.walk(). Now
directory traversal behaves consistently, ignoring syminks on all
levels.
One reason for choosing not to "walk into" directory symlinks is that
dir symlinks in externalsrc.bbclass in oe-core are causing problems in
source tree checksumming.
[YOCTO #8853]
(Bitbake rev: 66dff37ebcd1dd14ebd6933d727df9cf0a641866)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/checksum.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/checksum.py b/bitbake/lib/bb/checksum.py index 7fb46d8db5..2ec964d73b 100644 --- a/bitbake/lib/bb/checksum.py +++ b/bitbake/lib/bb/checksum.py @@ -123,12 +123,14 @@ class FileChecksumCache(MultiProcessCache): # Handle globs for f in glob.glob(pth): if os.path.isdir(f): - checksums.extend(checksum_dir(f)) + if not os.path.islink(f): + checksums.extend(checksum_dir(f)) else: checksum = checksum_file(f) checksums.append((f, checksum)) elif os.path.isdir(pth): - checksums.extend(checksum_dir(pth)) + if not os.path.islink(pth): + checksums.extend(checksum_dir(pth)) else: checksum = checksum_file(pth) checksums.append((pth, checksum)) |