diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-30 14:54:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 07:43:36 +0100 |
commit | d8ab563a2dcfbc726407f3b690988eb51bd88784 (patch) | |
tree | ac808b9de89cad8d7b3b1fff4adf504215ff5cdb /meta/classes | |
parent | a0d6322374815a9945e3960809f0d0bef2f6126a (diff) | |
download | poky-d8ab563a2dcfbc726407f3b690988eb51bd88784.tar.gz |
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.
(From OE-Core rev: be4e6ea8a92bd90f354f8c04eade39ccce8b73d5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/distutils3.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
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() { | |||
21 | build ${DISTUTILS_BUILD_ARGS} || \ | 21 | build ${DISTUTILS_BUILD_ARGS} || \ |
22 | bbfatal "${PYTHON_PN} setup.py build_ext execution failed." | 22 | bbfatal "${PYTHON_PN} setup.py build_ext execution failed." |
23 | } | 23 | } |
24 | distutils3_do_compile[vardepsexclude] = "MACHINE" | ||
24 | 25 | ||
25 | distutils3_stage_headers() { | 26 | distutils3_stage_headers() { |
26 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} | 27 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} |
@@ -33,6 +34,7 @@ distutils3_stage_headers() { | |||
33 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ | 34 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ |
34 | bbfatal "${PYTHON_PN} setup.py install_headers execution failed." | 35 | bbfatal "${PYTHON_PN} setup.py install_headers execution failed." |
35 | } | 36 | } |
37 | distutils3_stage_headers[vardepsexclude] = "MACHINE" | ||
36 | 38 | ||
37 | distutils3_stage_all() { | 39 | distutils3_stage_all() { |
38 | if [ ${BUILD_SYS} != ${HOST_SYS} ]; then | 40 | if [ ${BUILD_SYS} != ${HOST_SYS} ]; then |
@@ -48,6 +50,7 @@ distutils3_stage_all() { | |||
48 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ | 50 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ |
49 | bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." | 51 | bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." |
50 | } | 52 | } |
53 | distutils3_stage_all[vardepsexclude] = "MACHINE" | ||
51 | 54 | ||
52 | distutils3_do_install() { | 55 | distutils3_do_install() { |
53 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | 56 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} |
@@ -90,6 +93,7 @@ distutils3_do_install() { | |||
90 | rmdir ${D}${datadir}/share | 93 | rmdir ${D}${datadir}/share |
91 | fi | 94 | fi |
92 | } | 95 | } |
96 | distutils3_do_install[vardepsexclude] = "MACHINE" | ||
93 | 97 | ||
94 | EXPORT_FUNCTIONS do_compile do_install | 98 | EXPORT_FUNCTIONS do_compile do_install |
95 | 99 | ||