python3: Fix build arch reproducibility issues
PATCH 1/1 python3: Fix build arch reproducibility issues
The build arch leaks into some of the installed python files. This tweaks/adds some sed expressions to resolve those references for the target and improves reproducibility between architectures.
--- meta/recipes-devtools/python/python3_3.14.7.bb | 11 +++++++++++ 1 file changed, 11 insertions(+)
meta/recipes-devtools/python/python3_3.14.7.bb +11 -0
@@ -227,6 +227,9 @@ do_install:append() { -e "s,^ 'CONFINCLUDEDIR'.*, 'CONFINCLUDEDIR': '${STAGING_INCDIR}'\,,g" \ -e "s,^ 'INCLUDEPY'.*, 'INCLUDEPY': '${STAGING_INCDIR}/python${PYTHON_MAJMIN}'\,,g" \ -e "s,^ 'CONFINCLUDEPY'.*, 'CONFINCLUDEPY': '${STAGING_INCDIR}/python${PYTHON_MAJMIN}'\,,g" \ + -e "s,^ 'BUILD_GNU_TYPE'.*, 'BUILD_GNU_TYPE': '${HOST_SYS}'\,,g" \ + -e "s,--build=${BUILD_ARCH},--build=${HOST_ARCH},g" \ + -e "s,build_alias=${BUILD_ARCH},build_alias=${HOST_ARCH},g" \ -e "s,${B},/build/path/unavailable/,g" \ $sysconfigfile cp $sysconfigfile ${D}${libdir}/python-sysconfigdata/_sysconfigdata.py
@@ -402,6 +405,9 @@ py_package_preprocess () { -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${RECIPE_SYSROOT}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -e 's:BUILD_GNU_TYPE\(.*\)=\(.*\)[a-z\-]*:BUILD_GNU_TYPE\1=\2${HOST_SYS}:g' \ + -e 's:build_alias=${BUILD_ARCH}:build_alias=${HOST_ARCH}:g' \ + -e 's:--build=${BUILD_ARCH}:--build=${HOST_ARCH}:g' \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \ ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config
@@ -435,8 +441,13 @@ py_package_preprocess () { -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${RECIPE_SYSROOT}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -e 's:build_alias=${BUILD_ARCH}:build_alias=${HOST_ARCH}:g' \ + -e 's:--build=${BUILD_ARCH}:--build=${HOST_ARCH}:g' \ -e 's|"userbase": ".*"|"userbase": ""|g' \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfig_vars*.json + + # Fix extensions in build-details.json + sed -i -e 's:${BUILD_ARCH}-${BUILD_OS}:${HOST_ARCH}-${HOST_OS}:g' ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/build-details.json } # We want bytecode precompiled .py files (.pyc's) by default
Quoted 6 lines · Richard Purdie via lists.openembedded.org
The build arch leaks into some of the installed python files. This tweaks/adds some sed expressions to resolve those references for the target and improves reproducibility between architectures.
Signed-off-by Richard Purdie <[email protected]>---
Hi Richard,
It looks like this is breaking a ptest with musl:
Failed ptests:
{'python3': ['test_implementation', 'python3']}
https://autobuilder.yoctoproject.org/valkyrie/#/builders/110/builds/1405
https://autobuilder.yoctoproject.org/valkyrie/#/builders/109/builds/1416
Any clue about the issue?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com