diff options
Diffstat (limited to 'meta/lib/oe/sstatesig.py')
-rw-r--r-- | meta/lib/oe/sstatesig.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 64fb84ec92..31a6140984 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -439,7 +439,7 @@ def find_sstate_manifest(taskdata, taskdata2, taskname, d, multilibcache): | |||
439 | d2 = multilibcache[variant] | 439 | d2 = multilibcache[variant] |
440 | 440 | ||
441 | if taskdata.endswith("-native"): | 441 | if taskdata.endswith("-native"): |
442 | pkgarchs = ["${BUILD_ARCH}"] | 442 | pkgarchs = ["${BUILD_ARCH}", "${BUILD_ARCH}_${ORIGNATIVELSBSTRING}"] |
443 | elif taskdata.startswith("nativesdk-"): | 443 | elif taskdata.startswith("nativesdk-"): |
444 | pkgarchs = ["${SDK_ARCH}_${SDK_OS}", "allarch"] | 444 | pkgarchs = ["${SDK_ARCH}_${SDK_OS}", "allarch"] |
445 | elif "-cross-canadian" in taskdata: | 445 | elif "-cross-canadian" in taskdata: |
@@ -557,9 +557,11 @@ def OEOuthashBasic(path, sigfile, task, d): | |||
557 | try: | 557 | try: |
558 | update_hash(" %10s" % pwd.getpwuid(s.st_uid).pw_name) | 558 | update_hash(" %10s" % pwd.getpwuid(s.st_uid).pw_name) |
559 | update_hash(" %10s" % grp.getgrgid(s.st_gid).gr_name) | 559 | update_hash(" %10s" % grp.getgrgid(s.st_gid).gr_name) |
560 | except KeyError: | 560 | except KeyError as e: |
561 | bb.warn("KeyError in %s" % path) | 561 | bb.warn("KeyError in %s" % path) |
562 | raise | 562 | msg = ("KeyError: %s\nPath %s is owned by uid %d, gid %d, which doesn't match " |
563 | "any user/group on target. This may be due to host contamination." % (e, path, s.st_uid, s.st_gid)) | ||
564 | raise Exception(msg).with_traceback(e.__traceback__) | ||
563 | 565 | ||
564 | if include_timestamps: | 566 | if include_timestamps: |
565 | update_hash(" %10d" % s.st_mtime) | 567 | update_hash(" %10d" % s.st_mtime) |