diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-21 16:16:40 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-03 14:13:53 +0000 |
commit | 65eb39ebf471e6daa3a6481493cdf57a267669e9 (patch) | |
tree | db05c9ba3458e60eb860edf6143e9ef3cb3e2b6a /meta/lib/oe/sstatesig.py | |
parent | 5c5b3f8f85b8ad5de243694e1516f3daba385975 (diff) | |
download | poky-65eb39ebf471e6daa3a6481493cdf57a267669e9.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: 7c5881cf9baa7ea9fcfed382f24334cf8f96f9c2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6e3785a3f1f3cf68f5fe101cd6bebe91db165973)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/sstatesig.py')
-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 beaccdc909..f98543cc46 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -434,7 +434,7 @@ def find_sstate_manifest(taskdata, taskdata2, taskname, d, multilibcache): | |||
434 | d2 = multilibcache[variant] | 434 | d2 = multilibcache[variant] |
435 | 435 | ||
436 | if taskdata.endswith("-native"): | 436 | if taskdata.endswith("-native"): |
437 | pkgarchs = ["${BUILD_ARCH}"] | 437 | pkgarchs = ["${BUILD_ARCH}", "${BUILD_ARCH}_${ORIGNATIVELSBSTRING}"] |
438 | elif taskdata.startswith("nativesdk-"): | 438 | elif taskdata.startswith("nativesdk-"): |
439 | pkgarchs = ["${SDK_ARCH}_${SDK_OS}", "allarch"] | 439 | pkgarchs = ["${SDK_ARCH}_${SDK_OS}", "allarch"] |
440 | elif "-cross-canadian" in taskdata: | 440 | elif "-cross-canadian" in taskdata: |