summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCook, Samuel <samuel.cook@cornelisnetworks.com>2023-02-21 14:51:28 +0000
committerKhem Raj <raj.khem@gmail.com>2023-02-22 01:07:43 -0800
commit2e7903d8613ccf885b432fd1a9452c1f51094228 (patch)
treeb7897e14ff585a2c78f311c9c2a14941d7f741c8
parent227fca5ef5023514ccbed5487e708e0e29ffa3f0 (diff)
downloadmeta-openembedded-2e7903d8613ccf885b432fd1a9452c1f51094228.tar.gz
python-systemd: update from v234 to v235
Includes bugfix from v234 which won't run on python3.10 See: https://github.com/systemd/python-systemd/issues/107 Removes patches now no longer required as they are implemented in v235 drop setting md5 checksum for src_uri as it is no longer needed rename patch directory to match recipe name as python2 version of recipe is gone V235 released to PyPI on 11 Feb 23 https://pypi.org/project/systemd-python/235/ Signed-off-by: Samuel Cook <samuel.cook@cornelisnetworks.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch30
-rw-r--r--meta-python/recipes-devtools/python/python-systemd/endian.patch14
-rw-r--r--meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch (renamed from meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch)0
-rw-r--r--meta-python/recipes-devtools/python/python3-systemd_235.bb (renamed from meta-python/recipes-devtools/python/python3-systemd_234.bb)15
4 files changed, 2 insertions, 57 deletions
diff --git a/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch b/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch
deleted file mode 100644
index b3180f29f2..0000000000
--- a/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From a681a79472df85cdc8c052bc61fb8b9e7b9a6495 Mon Sep 17 00:00:00 2001
2From: Tim Orling <tim.orling@konsulko.com>
3Date: Sun, 27 Feb 2022 11:50:36 -0800
4Subject: [PATCH] setup.py: switch from distutils to setuptools
5
6In Python 3.10, distutils is deprecated and slated for removal in Python
73.12. It also prevents 'setup.py bdist_wheel' from building a wheel.
8
9Upstream-Status: Submitted
10[https://github.com/systemd/python-systemd/pull/103]
11
12Signed-off-by: Tim Orling <tim.orling@konsulko.com>
13---
14 setup.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/setup.py b/setup.py
18index 099819b..fe9c03a 100644
19--- a/setup.py
20+++ b/setup.py
21@@ -1,5 +1,5 @@
22 import sys, os
23-from distutils.core import setup, Extension
24+from setuptools import setup, Extension
25 from subprocess import Popen, PIPE, check_output
26
27 def call(*cmd):
28--
292.30.2
30
diff --git a/meta-python/recipes-devtools/python/python-systemd/endian.patch b/meta-python/recipes-devtools/python/python-systemd/endian.patch
deleted file mode 100644
index e09aea7336..0000000000
--- a/meta-python/recipes-devtools/python/python-systemd/endian.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Include endian.h for missing definitions of htobe16
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5--- a/systemd/util.c
6+++ b/systemd/util.c
7@@ -28,6 +28,7 @@
8 #include <stdbool.h>
9 #include <assert.h>
10 #include <errno.h>
11+#include <endian.h>
12 #include <fcntl.h>
13 #include <unistd.h>
14 #include <net/if.h>
diff --git a/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch b/meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
index d7085a8565..d7085a8565 100644
--- a/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
+++ b/meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
diff --git a/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-python/recipes-devtools/python/python3-systemd_235.bb
index 10614fe374..01d42cd5a4 100644
--- a/meta-python/recipes-devtools/python/python3-systemd_234.bb
+++ b/meta-python/recipes-devtools/python/python3-systemd_235.bb
@@ -4,20 +4,9 @@ LICENSE = "LGPL-2.1-or-later"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c"
5 5
6PYPI_PACKAGE = "systemd-python" 6PYPI_PACKAGE = "systemd-python"
7DEPENDS += "systemd (<=234)" 7DEPENDS += "systemd (<=235)"
8RDEPENDS:${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging python3-syslog" 8RDEPENDS:${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging python3-syslog"
9REQUIRED_DISTRO_FEATURES = "systemd" 9REQUIRED_DISTRO_FEATURES = "systemd"
10inherit pypi features_check pkgconfig setuptools3 10inherit pypi features_check pkgconfig setuptools3
11
12SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d"
13SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7"
14
15# allow for common patches for python- and python3-systemd
16FILESEXTRAPATHS:prepend := "${THISDIR}/python-systemd:"
17
18SRC_URI += " \
19 file://endian.patch \
20 file://0002-setup.py-switch-from-distutils-to-setuptools.patch \
21"
22
23SRC_URI:append:libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch" 11SRC_URI:append:libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch"
12SRC_URI[sha256sum] = "4e57f39797fd5d9e2d22b8806a252d7c0106c936039d1e71c8c6b8008e695c0a"