The meson determinism issue is the same frozenset issue we encountered with python itself. Remove the problematic pyc file until upstream work out the best way to address the issue (as with core python).
Signed-off-by: Richard Purdie <[email protected]> --- meta/lib/oeqa/selftest/cases/reproducible.py | 1 - meta/recipes-devtools/meson/meson.inc | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index d301c8dd888..1945a12c319 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -33,7 +33,6 @@ exclude_packages = [ 'go-runtime', 'go_', 'go-', - 'meson', 'ovmf-shell-efi', 'ruby-ri-docs' ] diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index 8454d18c284..fc3ca85faeb 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -23,6 +23,10 @@ SRC_URI_append_class-native = " \ file://0002-Support-building-allarch-recipes-again.patch \ " +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" + UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"; UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar" @@ -31,3 +35,13 @@ inherit setuptools3 RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources" FILES_${PN} += "${datadir}/polkit-1" + +do_install_append () { + # As per the same issue in the python recipe itself: + # Unfortunately the following pyc files are non-deterministc due to 'frozenset' + # being written without strict ordering, even with PYTHONHASHSEED = 0 + # Upstream is discussing ways to solve the issue properly, until then let's + # just not install the problematic files. + # More info: http://benno.id.au/blog/2013/01/15/python-determinism + rm ${D}${libdir}/python*/site-packages/mesonbuild/dependencies/__pycache__/mpi.cpython* +} -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149545): https://lists.openembedded.org/g/openembedded-core/message/149545 Mute This Topic: https://lists.openembedded.org/mt/81364976/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
