Skip to contentSkip to conversation

unattended-upgrades: Move to meta-python

PATCH In review Khem Raj 1 participant 3 messages Mar 3, 2022 – Mar 4, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 unattended-upgrades: Move to meta-python

It needs distutils, until its ported to use setuptools, keep it in meta-python as it depends on distutils infra from here.

---
 .../recipes-core/packagegroups/packagegroup-meta-python.bb    | 1 +
 ...unattended-upgrade-Remove-distro_info-usage-to-check.patch | 0
 .../unattended-upgrades/unattended-upgrades_2.6.bb            | 4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename {meta-oe => meta-python}/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch (100%)
 rename {meta-oe => meta-python}/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb (92%)
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +1 -0
index 670361598e..b2d31282e6 100644
@@ -474,6 +474,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
     python3-yarl \
     python3-zopeinterface \
     telepathy-python3 \
+    unattended-upgrades \
 "
 RDEPENDS:packagegroup-meta-python3:remove:libc-musl:powerpc64le = "python3-grpcio python3-grpcio-tools"
 
meta-python/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch renamed from meta-oe/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch
rename to meta-python/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch
meta-python/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb renamed from meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb +2 -2
similarity index 92%
rename from meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
rename to meta-python/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
index 85e5f59c7a..0629bf6db1 100644
@@ -13,8 +13,8 @@ SRCREV = "c6db6fad26a2b83ba301b52ff5dee98cef7558ca"
 
 S = "${WORKDIR}/git"
 
-inherit setuptools_build_meta
-PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.1-*.whl"
+inherit distutils3
+#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"
Signature · 1 line
2.35.1
author
#1 lore raw

PATCH 2/2 python3-blivetgui: Set PIP_INSTALL_PACKAGE

---
 .../recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb   | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb +2 -0
index 9522770eff..4bcb45ebd6 100644
@@ -18,6 +18,8 @@ REQUIRED_DISTRO_FEATURES = "x11 systemd"
 
 inherit setuptools3 python3native
 
+PIP_INSTALL_PACKAGE = "blivet_gui"
+
 RDEPENDS:${PN} = "python3-pygobject python3 \
                   python3-blivet gtk+3  \
                   python3-pid libreport \
Signature · 1 line
2.35.1
author
#2 lore raw
In reply to Khem Raj

ignore this one, since setuptools3_legacy will fix it and we can keep it in meta-oe

Quoted 50 lines · Khem Raj

It needs distutils, until its ported to use setuptools, keep it in meta-python as it depends on distutils infra from here.

---
 .../recipes-core/packagegroups/packagegroup-meta-python.bb    | 1 +
 ...unattended-upgrade-Remove-distro_info-usage-to-check.patch | 0
 .../unattended-upgrades/unattended-upgrades_2.6.bb            | 4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename {meta-oe => meta-python}/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch (100%)
 rename {meta-oe => meta-python}/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb (92%)
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +1 -0
index 670361598e..b2d31282e6 100644
@@ -474,6 +474,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
     python3-yarl \
     python3-zopeinterface \
     telepathy-python3 \
+    unattended-upgrades \
 "
 RDEPENDS:packagegroup-meta-python3:remove:libc-musl:powerpc64le = "python3-grpcio python3-grpcio-tools"
 
meta-python/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch renamed from meta-oe/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch
rename to meta-python/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch
meta-python/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb renamed from meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb +2 -3
similarity index 92%
rename from meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
rename to meta-python/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
index 85e5f59c7a..0629bf6db1 100644
@@ -13,8 +13,8 @@ SRCREV = "c6db6fad26a2b83ba301b52ff5dee98cef7558ca"
 
 S = "${WORKDIR}/git"
 
-inherit setuptools_build_meta
-PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.1-*.whl"
+inherit distutils3
+#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.35.1