diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/gammu')
-rw-r--r-- | meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb (renamed from meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb) | 44 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch | 49 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb | 21 |
3 files changed, 92 insertions, 22 deletions
diff --git a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb index fd6b85ff2e..aa52f62572 100644 --- a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb +++ b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb @@ -1,21 +1,23 @@ SUMMARY = "GNU All Mobile Managment Utilities" SECTION = "console/network" -DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev unixodbc" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" -HOMEPAGE = "http://www.gammu.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +HOMEPAGE = "https://wammu.eu/" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}.tar.bz2 \ +SRC_URI = "https://dl.cihar.com/${BPN}/releases/${BP}.tar.xz \ file://gammurc \ file://gammu-smsdrc \ " -SRC_URI[md5sum] = "8ea16c6b3cc48097a8e62311fe0e25b9" -SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3" +SRC_URI[sha256sum] = "d8f152314d7e4d3d643610d742845e0a016ce97c234ad4b1151574e1b09651ee" + +UPSTREAM_CHECK_URI = "https://dl.cihar.com/${BPN}/releases" + +DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev unixodbc" -inherit distutils3 cmake gettext +inherit cmake gettext -do_install_append() { +do_install:append() { # these files seem to only be used by symbian and trigger QA warnings rm -rf ${D}/usr/share/gammu #install default configuration files @@ -35,26 +37,24 @@ EXTRA_OECMAKE = " \ -DWITH_BLUETOOTH=OFF \ -DWITH_NOKIA_SUPPORT=OFF \ -DWITH_IRDA=OFF \ - -DWITH_PYTHON=OFF \ -DWITH_MySQL=ON \ -DWITH_Postgres=OFF \ " -PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}" +PACKAGES =+ "${PN}-smsd libgammu libgsmsd" -FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ +FILES:${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ ${bindir}/gammu-detect ${sysconfdir}/gammurc" -CONFFILES_${PN} = "${sysconfdir}/gammurc" -FILES_${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" -CONFFILES_${PN}-smsd = "${sysconfdir}/gammu-smsdrc" -FILES_${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so" -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug ${PYTHON_SITEPACKAGES_DIR}/gammu/.debug" -FILES_libgammu = "${libdir}/libGammu.so.*" -FILES_libgsmsd = "${libdir}/libgsmsd.so.*" -FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/gammu/*.??" +CONFFILES:${PN} = "${sysconfdir}/gammurc" +FILES:${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" +CONFFILES:${PN}-smsd = "${sysconfdir}/gammu-smsdrc" +FILES:${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so" +FILES:${PN}-dbg += "${bindir}/.debug ${libdir}/.debug" +FILES:libgammu = "${libdir}/libGammu.so.*" +FILES:libgsmsd = "${libdir}/libgsmsd.so.*" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-dev += "bash" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-dev += "bash" # Fails to build with thumb-1 (qemuarm) # gammu-1.32.0/libgammu/service/sms/gsmems.c:542:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 diff --git a/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch b/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch new file mode 100644 index 0000000000..23fe4441dc --- /dev/null +++ b/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch @@ -0,0 +1,49 @@ +From 96e8f0b2d13e890d9ffff8673f18dcc94290efb2 Mon Sep 17 00:00:00 2001 +From: Tim Orling <tim.orling@konsulko.com> +Date: Thu, 13 Jan 2022 20:06:33 -0600 +Subject: [PATCH] setup.py: StrictVersion -> packaging.version.* + +distutils is deprecated in Python 3.10 and will be removed in Python +3.12 [1] + +The recommended replacement for distutils.version is to use +packaging.version + +StrictVersion can be replaced by packaging.version.Version and helpers +like packaging.version.parse() + +[1] https://www.python.org/dev/peps/pep-0632/ +[2] https://packaging.pypa.io/en/latest/version.html + +Upstream-Status: Submitted [https://github.com/gammu/python-gammu/pull/67] + +Signed-off-by: Tim Orling <tim.orling@konsulko.com> +--- + setup.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index a458181..bffb09d 100755 +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,7 @@ import os + import platform + import subprocess + import sys +-from distutils.version import StrictVersion ++from packaging.version import parse, Version + + from setuptools import Extension, setup + +@@ -112,9 +112,9 @@ class GammuConfig: + with open(self.config_path(self.path)) as handle: + for line in handle: + if line.startswith("#define GAMMU_VERSION "): +- version = line.split('"')[1] ++ version = parse(line.split('"')[1]) + +- if version is None or StrictVersion(version) < StrictVersion(GAMMU_REQUIRED): ++ if version is None or version < parse(GAMMU_REQUIRED): + print("Too old Gammu version, please upgrade!") + sys.exit(100) + diff --git a/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb b/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb new file mode 100644 index 0000000000..1fdb76eeb4 --- /dev/null +++ b/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "Gammu bindings for Python" +DESCRIPTION ="Python bindings for the Gammu library." +HOMEPAGE = "https://wammu.eu/python-gammu/" +BUGRACKER = "https://github.com/gammu/python-gammu/issues" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PYPI_PACKAGE = "python-gammu" + +inherit pypi setuptools3 pkgconfig + +SRC_URI += "file://0001-setup.py-StrictVersion-packaging.version.patch" +SRC_URI[sha256sum] = "49fc70f01bc192c43ff3ec815e082df5261ea4c8d36a695e977734c4eb4df868" + +S = "${WORKDIR}/python-gammu-${PV}" + +DEPENDS += "gammu python3-packaging-native" + +RDEPENDS:${PN} += "python3-asyncio python3-core python3-threading" + +RRECOMMENDS:${PN} += "gammu" |