[meta-python,1/2] unattended-upgrades: Move to meta-python

Message ID 20220303164013.3149208-1-raj.khem@gmail.com
State New
Headers show
Series [meta-python,1/2] unattended-upgrades: Move to meta-python | expand

Commit Message

Khem Raj March 3, 2022, 4:40 p.m. UTC
It needs distutils, until its ported to use setuptools, keep it in
meta-python as it depends on distutils infra from here.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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%)

Comments

Khem Raj March 4, 2022, 8:08 p.m. UTC | #1
ignore this one, since setuptools3_legacy will fix it and we can keep
it in meta-oe

On Thu, Mar 3, 2022 at 8:40 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> It needs distutils, until its ported to use setuptools, keep it in
> meta-python as it depends on distutils infra from here.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../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%)
>
> diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> index 670361598e..b2d31282e6 100644
> --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> @@ -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"
>
> diff --git a/meta-oe/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch b/meta-python/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch
> 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
> diff --git a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb b/meta-python/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
> 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
> --- a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
> +++ b/meta-python/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
> @@ -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
>

Patch

diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 670361598e..b2d31282e6 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -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"
 
diff --git a/meta-oe/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch b/meta-python/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch
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
diff --git a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb b/meta-python/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
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
--- a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
+++ b/meta-python/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
@@ -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"