Skip to contentSkip to conversation

distutils3: Avoid MACHINE specific checksums

PATCH In review Richard Purdie 3 participants 4 messages Sep 30, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

meta/classes/distutils3.bbclass +4 -0
index e909ef4..443bf3a 100644
@@ -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
 
#1 lore raw
Quoted 7 lines · Richard Purdie

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.

There was some short discussion about this long time ago:
http://patchwork.openembedded.org/patch/74129/

I'm still using that patch and still haven't found any issues caused by that, but I'm not using python3 recipes (except building them in world), so it's possible I've just overlooked them.

Quoted 45 lines
meta/classes/distutils3.bbclass +4 -0
index e909ef4..443bf3a 100644
@@ -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
 
Signature · 5 lines
-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 4 lines · Martin Jansa

I'm still using that patch and still haven't found any issues caused by that, but I'm not using python3 recipes (except building them in world), so it's possible I've just overlooked them.

It's possible that you're installing eg python3-pip into a totally wrong directory though, but I'm having a look at this right now and have a funny feeling that a lot of this can actually be deleted.

Ross

#3 lore raw
Quoted 11 lines · Ross

On 30 September 2015 at 15:43, Martin Jansa <[email protected]> wrote:
I'm still using that patch and still haven't found any issues caused by
that, but I'm not using python3 recipes (except building them in world),
so it's possible I've just overlooked them.

It's possible that you're installing eg python3-pip into a totally wrong directory though, but I'm having a look at this right now and have a funny feeling that a lot of this can actually be deleted.

Agreed. I will likely take the patch I've proposed, since it deals with a real issue but if we can then clean all this up I'd be all in favour.

At the back of my mind was a plan to figure out the various python module types that maximally stress distutils.bbclass and setuptools.bbclass and then make sure we have an example of each in OE-Core so we can put some better regression testing around this too.

Cheers,

Richard