* [PATCH v3 1/5] python3-blivetgui: use setuptools_legacy
@ 2022-03-07 17:01 Ross Burton
2022-03-07 17:01 ` [PATCH v3 2/5] python3-blivet: " Ross Burton
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ross Burton @ 2022-03-07 17:01 UTC (permalink / raw)
To: openembedded-devel
The setup.py installs to arbitrary target paths, so can't use the new
bdist_wheel installation method.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
index 89f1c700f4..c26ae1fe98 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protoc
inherit features_check
REQUIRED_DISTRO_FEATURES = "x11 systemd"
-inherit setuptools3 python3native
+inherit setuptools3_legacy python3native
PIP_INSTALL_PACKAGE = "blivet_gui"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 2/5] python3-blivet: use setuptools_legacy
2022-03-07 17:01 [PATCH v3 1/5] python3-blivetgui: use setuptools_legacy Ross Burton
@ 2022-03-07 17:01 ` Ross Burton
2022-03-07 17:01 ` [PATCH v3 3/5] python3-meh: fix HOMEPAGE Ross Burton
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2022-03-07 17:01 UTC (permalink / raw)
To: openembedded-devel
The setup.py installs to arbitrary target paths, so can't use the new
bdist_wheel installation method.
Reverts daba6521f which was a sympton of the bad usage.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../python-blivet/python3-blivet_3.4.3.bb | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
index 1d2add87a0..bd57604f26 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
@@ -19,16 +19,10 @@ SRC_URI += "\
"
SRC_URI[sha256sum] = "1b05b77f3ee35d82c7a577a168c9ba0204d3e9a87eb1975e5f9af47700eeff48"
-inherit pypi features_check systemd setuptools3
+inherit pypi features_check systemd setuptools3_legacy
REQUIRED_DISTRO_FEATURES = "systemd"
-do_install:append() {
- mv ${D}${PYTHON_SITEPACKAGES_DIR}${exec_prefix}/* ${D}${exec_prefix}
- mv ${D}${PYTHON_SITEPACKAGES_DIR}${sysconfdir} ${D}
- mv ${D}${PYTHON_SITEPACKAGES_DIR}${nonarch_base_libdir} ${D}
-}
-
RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \
parted python3-pyparted multipath-tools \
lsof cryptsetup libblockdev \
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 3/5] python3-meh: fix HOMEPAGE
2022-03-07 17:01 [PATCH v3 1/5] python3-blivetgui: use setuptools_legacy Ross Burton
2022-03-07 17:01 ` [PATCH v3 2/5] python3-blivet: " Ross Burton
@ 2022-03-07 17:01 ` Ross Burton
2022-03-07 17:01 ` [PATCH v3 4/5] python3-meh: use setuptools_legacy Ross Burton
2022-03-07 17:01 ` [PATCH v3 5/5] unattended-upgrades: remove PYPA_WHEEL Ross Burton
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2022-03-07 17:01 UTC (permalink / raw)
To: openembedded-devel
fedorahosted.org is retired, so set the GitHub page as the homepage.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb b/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb
index 16596596a6..9f72b72623 100644
--- a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb
+++ b/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb
@@ -1,7 +1,7 @@
SUMMARY = "A python library for handling exceptions"
DESCRIPTION = "The python-meh package is a python library for handling, saving, and reporting \
exceptions."
-HOMEPAGE = "http://git.fedorahosted.org/git/?p=python-meh.git"
+HOMEPAGE = "https://github.com/rhinstaller/python-meh"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 4/5] python3-meh: use setuptools_legacy
2022-03-07 17:01 [PATCH v3 1/5] python3-blivetgui: use setuptools_legacy Ross Burton
2022-03-07 17:01 ` [PATCH v3 2/5] python3-blivet: " Ross Burton
2022-03-07 17:01 ` [PATCH v3 3/5] python3-meh: fix HOMEPAGE Ross Burton
@ 2022-03-07 17:01 ` Ross Burton
2022-03-07 17:01 ` [PATCH v3 5/5] unattended-upgrades: remove PYPA_WHEEL Ross Burton
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2022-03-07 17:01 UTC (permalink / raw)
To: openembedded-devel
This setup.py installs data_files with absolute paths, which isn't
supported by bdist_wheel. Use setuptools_legacy as the legacy install
task needs to be used.
Also update patch status on the setuptools port.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
...etup.py-switch-from-distutils-to-setuptools.patch | 3 +--
.../python-meh/python3-meh_0.50.1.bb | 12 ++----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch b/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch
index b616b3fad3..2eb6be5a18 100644
--- a/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch
+++ b/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch
@@ -9,8 +9,7 @@ In Python 3.10 'distutils' is deprecated with removal slated for Python
This also allows for a 'wheel' binary archive format to be built with
'setup.py bdist_wheel'.
-Upstream-Status: Submitted
-[https://github.com/rhinstaller/python-meh/pull/37]
+Upstream-Status: Backport [cf9eafdd165347f86bb4a2534c41fd805db52322]
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
diff --git a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb b/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb
index 9f72b72623..1d9af438da 100644
--- a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb
+++ b/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/rhinstaller/python-meh"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-inherit setuptools3
+inherit setuptools3_legacy
S = "${WORKDIR}/git"
@@ -14,12 +14,4 @@ SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=rhe
"
SRCREV = "c321ce22950aff76611a3c6beffa02b5ea3adbed"
-PIP_INSTALL_PACKAGE = "python_meh"
-
-do_install:append () {
- install -d ${D}/${datadir}/python-meh
- mv ${D}${PYTHON_SITEPACKAGES_DIR}${datadir}/python-meh/* ${D}/${datadir}/python-meh/
-}
-
-FILES:${PN} += "${datadir}/*"
-
+FILES:${PN} += "${datadir}/python-meh"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 5/5] unattended-upgrades: remove PYPA_WHEEL
2022-03-07 17:01 [PATCH v3 1/5] python3-blivetgui: use setuptools_legacy Ross Burton
` (2 preceding siblings ...)
2022-03-07 17:01 ` [PATCH v3 4/5] python3-meh: use setuptools_legacy Ross Burton
@ 2022-03-07 17:01 ` Ross Burton
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2022-03-07 17:01 UTC (permalink / raw)
To: openembedded-devel
As this now uses setuptools_legacy there is no need to set PYPA_WHEEL.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../unattended-upgrades/unattended-upgrades_2.6.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
index 2196266b99..e528d72e8c 100644
--- a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
+++ b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
@@ -15,8 +15,6 @@ S = "${WORKDIR}/git"
inherit setuptools3_legacy
-PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.1-*.whl"
-
DEPENDS += "apt intltool-native python3-distutils-extra-native"
RDEPENDS:${PN} += "apt lsb-release python3-apt python3-core python3-datetime python3-email python3-fcntl python3-io python3-logging python3-stringold python3-syslog"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-07 17:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-07 17:01 [PATCH v3 1/5] python3-blivetgui: use setuptools_legacy Ross Burton
2022-03-07 17:01 ` [PATCH v3 2/5] python3-blivet: " Ross Burton
2022-03-07 17:01 ` [PATCH v3 3/5] python3-meh: fix HOMEPAGE Ross Burton
2022-03-07 17:01 ` [PATCH v3 4/5] python3-meh: use setuptools_legacy Ross Burton
2022-03-07 17:01 ` [PATCH v3 5/5] unattended-upgrades: remove PYPA_WHEEL Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.