python3-dtc: fix packaging by using setuptools
PATCH 1/1 python3-dtc: fix packaging by using setuptools
Inheriting setuptools3-base doesn't actually define any tasks, so commit 1ef6050 to drop distutils3 had the side-effect of not building any code.
Backport a commit from upstream to switch to setuptools, inherit setuptool3, and change DISTUTILS_SETUP_PATH to SETUPTOOLS_SETUP_PATH.
--- recipes-kernel/dtc/files/setuptools.patch | 34 +++++++++++++++++++++++ recipes-kernel/dtc/python3-dtc_1.6.1.bb | 7 +++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 recipes-kernel/dtc/files/setuptools.patch
recipes-kernel/dtc/files/setuptools.patch new file +34 -0
@@ -0,0 +1,34 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From c691776ddb26acbd3674722caafacaf7b6e3e807 Mon Sep 17 00:00:00 2001 +From: Rob Herring <[email protected]> +Date: Wed, 10 Nov 2021 19:11:32 -0600 +Subject: [PATCH] pylibfdt: Use setuptools instead of distutils + +The use of setuptools is favored over distutils. setuptools is needed to +support building Python 'wheels' and for pip support. + +Signed-off-by: Rob Herring <[email protected]> +Message-Id: <[email protected]> +Signed-off-by: David Gibson <[email protected]> +--- + pylibfdt/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py +index ef40f15..f065a59 100755 +--- a/pylibfdt/setup.py ++++ b/pylibfdt/setup.py +@@ -10,7 +10,7 @@ Copyright (C) 2017 Google, Inc. + Written by Simon Glass <[email protected]> + """ + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import os + import re + import sys +-- +2.25.1 +
recipes-kernel/dtc/python3-dtc_1.6.1.bb +4 -3
@@ -7,6 +7,7 @@ LICENSE = "GPLv2 | BSD-2-Clause" DEPENDS = "flex-native bison-native swig-native libyaml dtc" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ + file://setuptools.patch \ file://ssize.patch" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
@@ -17,13 +18,13 @@ SRCREV = "ecaeb97fec013973360e94888a7de645f084345c" S = "${WORKDIR}/git" -inherit setuptools3-base pkgconfig +inherit setuptools3 pkgconfig -DISTUTILS_SETUP_PATH = "${S}/pylibfdt" +SETUPTOOLS_SETUP_PATH = "${S}/pylibfdt" do_configure:prepend() { oe_runmake -C "${S}" version_gen.h - mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/" + mv "${S}/version_gen.h" "${SETUPTOOLS_SETUP_PATH}/" } BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
Quoted 7 lines · Ross Burton
Inheriting setuptools3-base doesn't actually define any tasks, so commit 1ef6050 to drop distutils3 had the side-effect of not building any code.
Backport a commit from upstream to switch to setuptools, inherit setuptool3, and change
DISTUTILS_SETUP_PATHtoSETUPTOOLS_SETUP_PATH.
I have a SRCREV bump ready to go for dtc, so I've applied this and then the bump on top.
Bruce
Quoted 88 lines
Signed-off-by Ross Burton <[email protected]>--- recipes-kernel/dtc/files/setuptools.patch | 34 +++++++++++++++++++++++ recipes-kernel/dtc/python3-dtc_1.6.1.bb | 7 +++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 recipes-kernel/dtc/files/setuptools.patchrecipes-kernel/dtc/files/setuptools.patch new file +34
-0@@ -0,0 +1,34 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From c691776ddb26acbd3674722caafacaf7b6e3e807 Mon Sep 17 00:00:00 2001 +From: Rob Herring <[email protected]> +Date: Wed, 10 Nov 2021 19:11:32 -0600 +Subject: [PATCH] pylibfdt: Use setuptools instead of distutils + +The use of setuptools is favored over distutils. setuptools is needed to +support building Python 'wheels' and for pip support. + +Signed-off-by: Rob Herring <[email protected]> +Message-Id: <[email protected]> +Signed-off-by: David Gibson <[email protected]> +--- + pylibfdt/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py +index ef40f15..f065a59 100755 +--- a/pylibfdt/setup.py ++++ b/pylibfdt/setup.py +@@ -10,7 +10,7 @@ Copyright (C) 2017 Google, Inc. + Written by Simon Glass <[email protected]> + """ + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import os + import re + import sys +-- +2.25.1 +recipes-kernel/dtc/python3-dtc_1.6.1.bb +4
-4@@ -7,6 +7,7 @@ LICENSE = "GPLv2 | BSD-2-Clause" DEPENDS = "flex-native bison-native swig-native libyaml dtc" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ + file://setuptools.patch \ file://ssize.patch" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"@@ -17,13 +18,13 @@ SRCREV = "ecaeb97fec013973360e94888a7de645f084345c" S = "${WORKDIR}/git" -inherit setuptools3-base pkgconfig +inherit setuptools3 pkgconfig -DISTUTILS_SETUP_PATH = "${S}/pylibfdt" +SETUPTOOLS_SETUP_PATH = "${S}/pylibfdt" do_configure:prepend() { oe_runmake -C "${S}" version_gen.h - mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/" + mv "${S}/version_gen.h" "${SETUPTOOLS_SETUP_PATH}/" } BBCLASSEXTEND = "native nativesdk" --2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7007): https://lists.yoctoproject.org/g/meta-virtualization/message/7007
Mute This Topic: https://lists.yoctoproject.org/mt/88482921/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 6 lines · Bruce Ashfield via lists.yoctoproject.org
Quoted 4 lines · Ross Burton
Inheriting setuptools3-base doesn't actually define any tasks, so commit 1ef6050 to drop distutils3 had the side-effect of not building any code.
Quoted 6 lines
Quoted 3 lines
Backport a commit from upstream to switch to setuptools, inherit setuptool3, and change
DISTUTILS_SETUP_PATHtoSETUPTOOLS_SETUP_PATH.I have a SRCREV bump ready to go for dtc, so I've applied this and then the bump on top.
Your change + my update are now queued:
If you have any cycles for test build, that would be great .. since somehow my own build didn't notice the empty package, so I can't say I fully trust it.
Bruce
Quoted 100 lines
Bruce
Quoted 77 lines
Signed-off-by Ross Burton <[email protected]>--- recipes-kernel/dtc/files/setuptools.patch | 34 +++++++++++++++++++++++ recipes-kernel/dtc/python3-dtc_1.6.1.bb | 7 +++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 recipes-kernel/dtc/files/setuptools.patchrecipes-kernel/dtc/files/setuptools.patch new file +34
-0@@ -0,0 +1,34 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From c691776ddb26acbd3674722caafacaf7b6e3e807 Mon Sep 17 00:00:00 2001 +From: Rob Herring <[email protected]> +Date: Wed, 10 Nov 2021 19:11:32 -0600 +Subject: [PATCH] pylibfdt: Use setuptools instead of distutils + +The use of setuptools is favored over distutils. setuptools is needed to +support building Python 'wheels' and for pip support. + +Signed-off-by: Rob Herring <[email protected]> +Message-Id: <[email protected]> +Signed-off-by: David Gibson <[email protected]> +--- + pylibfdt/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py +index ef40f15..f065a59 100755 +--- a/pylibfdt/setup.py ++++ b/pylibfdt/setup.py +@@ -10,7 +10,7 @@ Copyright (C) 2017 Google, Inc. + Written by Simon Glass <[email protected]> + """ + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import os + import re + import sys +-- +2.25.1 +recipes-kernel/dtc/python3-dtc_1.6.1.bb +4
-4@@ -7,6 +7,7 @@ LICENSE = "GPLv2 | BSD-2-Clause" DEPENDS = "flex-native bison-native swig-native libyaml dtc" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ + file://setuptools.patch \ file://ssize.patch" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"@@ -17,13 +18,13 @@ SRCREV = "ecaeb97fec013973360e94888a7de645f084345c" S = "${WORKDIR}/git" -inherit setuptools3-base pkgconfig +inherit setuptools3 pkgconfig -DISTUTILS_SETUP_PATH = "${S}/pylibfdt" +SETUPTOOLS_SETUP_PATH = "${S}/pylibfdt" do_configure:prepend() { oe_runmake -C "${S}" version_gen.h - mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/" + mv "${S}/version_gen.h" "${SETUPTOOLS_SETUP_PATH}/" } BBCLASSEXTEND = "native nativesdk" --Quoted 5 lines
2.25.1
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7008): https://lists.yoctoproject.org/g/meta-virtualization/message/7008
Mute This Topic: https://lists.yoctoproject.org/mt/88482921/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
Quoted 7 lines · Bruce Ashfield
Your change + my update are now queued:
If you have any cycles for test build, that would be great .. since somehow my own build didn't notice the empty package, so I can't say I fully trust it.
SETUPTOOLS_SETUP_PATH defaults to S, so you can remove the assignment entirely.
Ross
Quoted 4 lines · Ross Burton
Quoted 2 lines · Bruce Ashfield
Your change + my update are now queued:
Quoted 8 lines
Quoted 5 lines
If you have any cycles for test build, that would be great .. since somehow my own build didn't notice the empty package, so I can't say I fully trust it.
SETUPTOOLS_SETUP_PATHdefaults to S, so you can remove the assignment entirely.
done. And pushed to master.
Bruce
Quoted 1 line
Ross
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
Quoted 6 lines · Bruce Ashfield via lists.yoctoproject.org
Quoted 5 lines · Ross Burton
Quoted 4 lines · Bruce Ashfield
Your change + my update are now queued:
Quoted 11 lines
Quoted 5 lines
Quoted 3 lines
If you have any cycles for test build, that would be great .. since somehow my own build didn't notice the empty package, so I can't say I fully trust it.
SETUPTOOLS_SETUP_PATHdefaults to S, so you can remove the assignment entirely.done. And pushed to master.
Bruce
Quoted 1 line
Ross
Hi Bruce,
I am now seeing the following failure on our build when attempting to use python3-dtc:
usr/lib/python3.10/site-packages/_libfdt.cpython-310-x86_64-linux-gnu.so: undefined symbol: fdt_overlay_target_offset
I think this is because the updated SRCREV includes 45f3d1a which requires libfdt to export the symbol above, but poky/dtc is still on an older revision. Maybe its necessary to roll back the SRCREV patch until poky updates?
Cheers,
Peter
Quoted 24 lines · Peter Hoyes
Quoted 6 lines · Bruce Ashfield via lists.yoctoproject.org
Quoted 5 lines · Ross Burton
Quoted 4 lines · Bruce Ashfield
Your change + my update are now queued:
Quoted 11 lines
Quoted 5 lines
Quoted 3 lines
If you have any cycles for test build, that would be great .. since somehow my own build didn't notice the empty package, so I can't say I fully trust it.
SETUPTOOLS_SETUP_PATHdefaults to S, so you can remove the assignment entirely.done. And pushed to master.
Bruce
Quoted 1 line
Ross
Hi Bruce,
I am now seeing the following failure on our build when attempting to use python3-dtc:
Quoted 7 lines
usr/lib/python3.10/site-packages/_libfdt.cpython-310-x86_64-linux-gnu.so:
undefined symbol:fdt_overlay_target_offsetI think this is because the updated SRCREV includes 45f3d1a which requires libfdt to export the symbol above, but poky/dtc is still on an older revision. Maybe its necessary to roll back the SRCREV patch until poky updates?
Hmm. That's a last resort, thrashing around the SRCREVs is never a good idea.
I'll temporarily carry a newer dtc in meta-virt to get things working.
Bruce
Quoted 5 lines
Cheers,
Peter
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 34 lines · Bruce Ashfield via lists.yoctoproject.org
Quoted 24 lines · Peter Hoyes
Quoted 6 lines · Bruce Ashfield via lists.yoctoproject.org
Quoted 5 lines · Ross Burton
Quoted 4 lines · Bruce Ashfield
Your change + my update are now queued:
Quoted 11 lines
Quoted 5 lines
Quoted 3 lines
If you have any cycles for test build, that would be great .. since somehow my own build didn't notice the empty package, so I can't say I fully trust it.
SETUPTOOLS_SETUP_PATHdefaults to S, so you can remove the assignment entirely.done. And pushed to master.
Bruce
Quoted 1 line
Ross
Hi Bruce,
I am now seeing the following failure on our build when attempting to use python3-dtc:
Quoted 7 lines
usr/lib/python3.10/site-packages/_libfdt.cpython-310-x86_64-linux-gnu.so:
undefined symbol:fdt_overlay_target_offsetI think this is because the updated SRCREV includes 45f3d1a which requires libfdt to export the symbol above, but poky/dtc is still on an older revision. Maybe its necessary to roll back the SRCREV patch until poky updates?
Quoted 4 lines
Hmm. That's a last resort, thrashing around the SRCREVs is never a good idea.
I'll temporarily carry a newer dtc in meta-virt to get things working.
I split the difference.
The PV was wrong on the updated package anyway, so I've pushed a change that uses SRCPV to show that I'm running ahead of oe-core DTC, and I've reverted the one commit that introduces the problematic symbol.
This gets me what I need for lopper, and I can now build and construct xen-image-mininal for qemuarm64
Bruce
Quoted 15 lines
Bruce
Quoted 5 lines
Cheers,
Peter
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
Quoted 8 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7026): https://lists.yoctoproject.org/g/meta-virtualization/message/7026
Mute This Topic: https://lists.yoctoproject.org/mt/88482921/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II