[meta-python,06/27] python-systemd: consolidate inc and bb files into a single bb file

Submitted by Derek Straka on April 4, 2020, 5:12 p.m. | Patch ID: 171628

Details

Message ID 20200404171251.19823-6-derek@asterius.io
State Changes Requested
Commit af965f7cefe8a2b00f7a5cc492aedf7f1ca3b973
Headers show

Commit Message

Derek Straka April 4, 2020, 5:12 p.m.
Signed-off-by: Derek Straka <derek@asterius.io>
---
 .../python/python-systemd.inc                 | 20 -----------------
 ...-implementation-of-strndupa-for-musl.patch |  0
 .../endian.patch                              |  0
 .../python/python3-systemd_234.bb             | 22 ++++++++++++++++---
 4 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-systemd.inc
 rename meta-python/recipes-devtools/python/{python-systemd => python3-systemd}/0001-Provide-implementation-of-strndupa-for-musl.patch (100%)
 rename meta-python/recipes-devtools/python/{python-systemd => python3-systemd}/endian.patch (100%)

Patch hide | download patch | download mbox

diff --git a/meta-python/recipes-devtools/python/python-systemd.inc b/meta-python/recipes-devtools/python/python-systemd.inc
deleted file mode 100644
index b14f825011..0000000000
--- a/meta-python/recipes-devtools/python/python-systemd.inc
+++ /dev/null
@@ -1,20 +0,0 @@ 
-SUMMARY = "Python interface for libsystemd"
-HOMEPAGE = "https://github.com/systemd/python-systemd"
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c"
-
-PYPI_PACKAGE = "systemd-python"
-DEPENDS += "systemd (<=234)"
-RDEPENDS_${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging"
-REQUIRED_DISTRO_FEATURES = "systemd"
-inherit pypi features_check
-
-SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d"
-SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7"
-
-# allow for common patches for python- and python3-systemd
-FILESEXTRAPATHS_prepend := "${THISDIR}/python-systemd:"
-
-SRC_URI += "file://endian.patch"
-
-SRC_URI_append_libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch"
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
similarity index 100%
rename from meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
rename to meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
diff --git a/meta-python/recipes-devtools/python/python-systemd/endian.patch b/meta-python/recipes-devtools/python/python3-systemd/endian.patch
similarity index 100%
rename from meta-python/recipes-devtools/python/python-systemd/endian.patch
rename to meta-python/recipes-devtools/python/python3-systemd/endian.patch
diff --git a/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-python/recipes-devtools/python/python3-systemd_234.bb
index 78ec431560..0ee5df8782 100644
--- a/meta-python/recipes-devtools/python/python3-systemd_234.bb
+++ b/meta-python/recipes-devtools/python/python3-systemd_234.bb
@@ -1,3 +1,19 @@ 
-require python-systemd.inc
-RDEPENDS_${PN} += "python3-syslog"
-inherit setuptools3
+SUMMARY = "Python interface for libsystemd"
+HOMEPAGE = "https://github.com/systemd/python-systemd"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d"
+SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7"
+
+SRC_URI += "file://endian.patch"
+SRC_URI_append_libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch"
+
+DEPENDS += "systemd (<=234)"
+
+PYPI_PACKAGE = "systemd-python"
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+inherit pypi setuptools3 
+
+RDEPENDS_${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging"

Comments

Khem Raj April 5, 2020, 5:37 p.m.
On Sat, Apr 4, 2020 at 10:13 AM Derek Straka <derek@asterius.io> wrote:
>
> Signed-off-by: Derek Straka <derek@asterius.io>
> ---
>  .../python/python-systemd.inc                 | 20 -----------------
>  ...-implementation-of-strndupa-for-musl.patch |  0
>  .../endian.patch                              |  0
>  .../python/python3-systemd_234.bb             | 22 ++++++++++++++++---
>  4 files changed, 19 insertions(+), 23 deletions(-)
>  delete mode 100644 meta-python/recipes-devtools/python/python-systemd.inc
>  rename meta-python/recipes-devtools/python/{python-systemd => python3-systemd}/0001-Provide-implementation-of-strndupa-for-musl.patch (100%)
>  rename meta-python/recipes-devtools/python/{python-systemd => python3-systemd}/endian.patch (100%)
>
> diff --git a/meta-python/recipes-devtools/python/python-systemd.inc b/meta-python/recipes-devtools/python/python-systemd.inc
> deleted file mode 100644
> index b14f825011..0000000000
> --- a/meta-python/recipes-devtools/python/python-systemd.inc
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -SUMMARY = "Python interface for libsystemd"
> -HOMEPAGE = "https://github.com/systemd/python-systemd"
> -LICENSE = "LGPLv2.1+"
> -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c"
> -
> -PYPI_PACKAGE = "systemd-python"
> -DEPENDS += "systemd (<=234)"
> -RDEPENDS_${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging"
> -REQUIRED_DISTRO_FEATURES = "systemd"
> -inherit pypi features_check
> -

inheriting feature_check is dropped, please reintroduce it and send v2.

> -SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d"
> -SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7"
> -
> -# allow for common patches for python- and python3-systemd
> -FILESEXTRAPATHS_prepend := "${THISDIR}/python-systemd:"
> -
> -SRC_URI += "file://endian.patch"
> -
> -SRC_URI_append_libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch"
> 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
> similarity index 100%
> rename from meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
> rename to meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
> diff --git a/meta-python/recipes-devtools/python/python-systemd/endian.patch b/meta-python/recipes-devtools/python/python3-systemd/endian.patch
> similarity index 100%
> rename from meta-python/recipes-devtools/python/python-systemd/endian.patch
> rename to meta-python/recipes-devtools/python/python3-systemd/endian.patch
> diff --git a/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-python/recipes-devtools/python/python3-systemd_234.bb
> index 78ec431560..0ee5df8782 100644
> --- a/meta-python/recipes-devtools/python/python3-systemd_234.bb
> +++ b/meta-python/recipes-devtools/python/python3-systemd_234.bb
> @@ -1,3 +1,19 @@
> -require python-systemd.inc
> -RDEPENDS_${PN} += "python3-syslog"
> -inherit setuptools3
> +SUMMARY = "Python interface for libsystemd"
> +HOMEPAGE = "https://github.com/systemd/python-systemd"
> +LICENSE = "LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c"
> +
> +SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d"
> +SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7"
> +
> +SRC_URI += "file://endian.patch"
> +SRC_URI_append_libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch"
> +
> +DEPENDS += "systemd (<=234)"
> +
> +PYPI_PACKAGE = "systemd-python"
> +REQUIRED_DISTRO_FEATURES = "systemd"
> +
> +inherit pypi setuptools3
> +
> +RDEPENDS_${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging"
> --
> 2.17.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#83748): https://lists.openembedded.org/g/openembedded-devel/message/83748
Mute This Topic: https://lists.openembedded.org/mt/72774255/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-