From: Richard Purdie Date: Wed, 30 Sep 2015 13:54:35 +0000 (+0100) Subject: distutils3: Avoid MACHINE specific checksums X-Git-Tag: 2015-10~185 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=be4e6ea8a92bd90f354f8c04eade39ccce8b73d5;p=openembedded-core.git distutils3: Avoid MACHINE specific checksums The MACHINE variable is used to handle sysroot paths within one of the patches to python3-native. In this context, it is relocation safe and the resulting packages should not have MACHINE specific checksums, therefore excluding MACHINE in this context is safe. This whole setup is ugly and ideally we should come up with a better way of handling this but at least allow a stop gap solution for now. Signed-off-by: Richard Purdie --- diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass index e909ef41b6..443bf3ac4b 100644 --- a/meta/classes/distutils3.bbclass +++ b/meta/classes/distutils3.bbclass @@ -21,6 +21,7 @@ distutils3_do_compile() { build ${DISTUTILS_BUILD_ARGS} || \ bbfatal "${PYTHON_PN} setup.py build_ext execution failed." } +distutils3_do_compile[vardepsexclude] = "MACHINE" distutils3_stage_headers() { install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} @@ -33,6 +34,7 @@ distutils3_stage_headers() { ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ bbfatal "${PYTHON_PN} setup.py install_headers execution failed." } +distutils3_stage_headers[vardepsexclude] = "MACHINE" distutils3_stage_all() { if [ ${BUILD_SYS} != ${HOST_SYS} ]; then @@ -48,6 +50,7 @@ distutils3_stage_all() { ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." } +distutils3_stage_all[vardepsexclude] = "MACHINE" distutils3_do_install() { install -d ${D}${PYTHON_SITEPACKAGES_DIR} @@ -90,6 +93,7 @@ distutils3_do_install() { rmdir ${D}${datadir}/share fi } +distutils3_do_install[vardepsexclude] = "MACHINE" EXPORT_FUNCTIONS do_compile do_install