diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-21 16:16:40 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-18 23:01:48 +0000 |
commit | 36f99e5a3955837e9f8283f03512a02c19c6db8f (patch) | |
tree | 31da193525e73932aceb08a679feb11e9a3b52a3 /meta/lib | |
parent | 5f107f8cc4adfb3da17224c3f3639d450b133b54 (diff) | |
download | poky-36f99e5a3955837e9f8283f03512a02c19c6db8f.tar.gz |
uninative: Don't use single sstate for pseudo-native
pseudo-native is a bit special. It conditionally compiles in support for
xattr, statx and statvfs amongst other options. If a pseudo-native binary is
used on a system where these functions are present but it wasn't compiled in
we see hard to debug permissions problems.
An example is the devtool.DevtoolExtractTests.test_devtool_deploy_target
oe-selftest which shows a cryptic error:
File "/home/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/selftest/cases/devtool.py", line 1388, in test_devtool_deploy_target
self.assertEqual(filelist1, filelist2)
File "/usr/lib64/python3.9/unittest/case.py", line 831, in assertEqual
assertion_func(first, second, msg=msg)
File "/usr/lib64/python3.9/unittest/case.py", line 1037, in assertListEqual
self.assertSequenceEqual(list1, list2, msg, seq_type=list)
File "/usr/lib64/python3.9/unittest/case.py", line 1019, in assertSequenceEqual
self.fail(msg)
File "/usr/lib64/python3.9/unittest/case.py", line 670, in fail
raise self.failureException(msg)
AssertionError: Lists differ: ['-rwxr-xr-x 6000 6000 /etc/init.d/mdmonitor', '-rw-r-[10124 chars]n.8'] != ['-rwxr-xr-x root root /etc/init.d/mdmonitor', '-rw-r-[10124 chars]n.8']
First differing element 0:
'-rwxr-xr-x 6000 6000 /etc/init.d/mdmonitor'
'-rwxr-xr-x root root /etc/init.d/mdmonitor'
This is due to a version of pseudo without statx being used on a system where
ls uses statx, hence the files are displayed as 6000.6000 instead of root.root.
Avoid this by always building pseudo-native for the specific distro in question rather
than using a universal sstate feed.
This hopefully fixes one of the mysterious AB-INT issues.
(From OE-Core rev: d3ec2ecdf8915a9fb1c4ea36a29b05090abf089c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6e3785a3f1f3cf68f5fe101cd6bebe91db165973)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/sstatesig.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 64fb84ec92..34558a6672 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: |