From be0e3df5cfb3af0e96068406bba979f3997f1212 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 10 Aug 2019 10:17:15 -0700 Subject: python-rtimu,python-sense-hat: Convert to py3 modules py2 is on its way out from oe-core Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-rpi-test.bb | 4 +-- ...0001-include-asm-ioctl.h-for-ioctl-define.patch | 33 ---------------------- recipes-devtools/python/python-rtimu_git.bb | 15 ---------- recipes-devtools/python/python-sense-hat_2.2.0.bb | 24 ---------------- ...0001-include-asm-ioctl.h-for-ioctl-define.patch | 33 ++++++++++++++++++++++ recipes-devtools/python/python3-rtimu_git.bb | 15 ++++++++++ recipes-devtools/python/python3-sense-hat_2.2.0.bb | 24 ++++++++++++++++ 7 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 recipes-devtools/python/python-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch delete mode 100644 recipes-devtools/python/python-rtimu_git.bb delete mode 100644 recipes-devtools/python/python-sense-hat_2.2.0.bb create mode 100644 recipes-devtools/python/python3-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch create mode 100644 recipes-devtools/python/python3-rtimu_git.bb create mode 100644 recipes-devtools/python/python3-sense-hat_2.2.0.bb diff --git a/recipes-core/packagegroups/packagegroup-rpi-test.bb b/recipes-core/packagegroups/packagegroup-rpi-test.bb index 654416f..57400b1 100644 --- a/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -15,8 +15,8 @@ RDEPENDS_${PN} = "\ rpio \ rpi-gpio \ pi-blaster \ - python-rtimu \ - python-sense-hat \ + python3-rtimu \ + python3-sense-hat \ connman \ connman-client \ wireless-regdb \ diff --git a/recipes-devtools/python/python-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch b/recipes-devtools/python/python-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch deleted file mode 100644 index 4a93a1c..0000000 --- a/recipes-devtools/python/python-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c3aa4af56652b403e304ea5f321acfe289e42922 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Jan 2016 16:07:14 -0800 -Subject: [PATCH] include asm/ioctl.h for ioctl() define - -also fixes errors e.g. - -../../RTIMULib/RTIMUHal.cpp:208:29: error: '_IOC_SIZEBITS' was not -declared in this scope - return ioctl(m_SPI, SPI_IOC_MESSAGE(1), &wrIOC); - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - RTIMULib/RTIMUHal.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/RTIMULib/RTIMUHal.cpp b/RTIMULib/RTIMUHal.cpp -index f9c3d15..d968326 100644 ---- a/RTIMULib/RTIMUHal.cpp -+++ b/RTIMULib/RTIMUHal.cpp -@@ -29,6 +29,7 @@ - #if !defined(WIN32) && !defined(__APPLE__) - - #include -+#include - - RTIMUHal::RTIMUHal() - { --- -2.7.0 - diff --git a/recipes-devtools/python/python-rtimu_git.bb b/recipes-devtools/python/python-rtimu_git.bb deleted file mode 100644 index 63c92b3..0000000 --- a/recipes-devtools/python/python-rtimu_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "RTIMULib is a C++ and Python library that makes it easy to use 9-dof and \ -10-dof IMUs with embedded Linux systems" -HOMEPAGE = "https://github.com/RPi-Distro/RTIMULib/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../../LICENSE;md5=96cdecb41125f498958e09b72faf318e" - -SRC_URI = "git://github.com/RPi-Distro/RTIMULib.git;protocol=http;branch=master \ - file://0001-include-asm-ioctl.h-for-ioctl-define.patch;patchdir=../.. \ - " -SRCREV = "b949681af69b45f0f7f4bb53b6770037b5b02178" - -S = "${WORKDIR}/git/Linux/python/" - -inherit setuptools diff --git a/recipes-devtools/python/python-sense-hat_2.2.0.bb b/recipes-devtools/python/python-sense-hat_2.2.0.bb deleted file mode 100644 index f7c4e34..0000000 --- a/recipes-devtools/python/python-sense-hat_2.2.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Python module to control the Raspberry Pi Sense HAT used in the Astro Pi mission" -HOMEPAGE = "https://github.com/RPi-Distro/python-sense-hat" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=d80fe312e1ff5fbd97369b093bf21cda" - -inherit setuptools pypi - -PYPI_PACKAGE = "sense-hat" - -SRC_URI[md5sum] = "69929250cb72349a8a82edf2584b1d83" -SRC_URI[sha256sum] = "f000998d042d96ed722d459312e1bebd0107f9f3015cd34b3e4fabcab9c800af" - -DEPENDS += " \ - jpeg \ - zlib \ - freetype \ - " - -RDEPENDS_${PN} += " \ - python-numpy \ - python-rtimu \ - python-imaging \ - " diff --git a/recipes-devtools/python/python3-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch b/recipes-devtools/python/python3-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch new file mode 100644 index 0000000..4a93a1c --- /dev/null +++ b/recipes-devtools/python/python3-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch @@ -0,0 +1,33 @@ +From c3aa4af56652b403e304ea5f321acfe289e42922 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Jan 2016 16:07:14 -0800 +Subject: [PATCH] include asm/ioctl.h for ioctl() define + +also fixes errors e.g. + +../../RTIMULib/RTIMUHal.cpp:208:29: error: '_IOC_SIZEBITS' was not +declared in this scope + return ioctl(m_SPI, SPI_IOC_MESSAGE(1), &wrIOC); + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + RTIMULib/RTIMUHal.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/RTIMULib/RTIMUHal.cpp b/RTIMULib/RTIMUHal.cpp +index f9c3d15..d968326 100644 +--- a/RTIMULib/RTIMUHal.cpp ++++ b/RTIMULib/RTIMUHal.cpp +@@ -29,6 +29,7 @@ + #if !defined(WIN32) && !defined(__APPLE__) + + #include ++#include + + RTIMUHal::RTIMUHal() + { +-- +2.7.0 + diff --git a/recipes-devtools/python/python3-rtimu_git.bb b/recipes-devtools/python/python3-rtimu_git.bb new file mode 100644 index 0000000..c0cb311 --- /dev/null +++ b/recipes-devtools/python/python3-rtimu_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "RTIMULib is a C++ and Python library that makes it easy to use 9-dof and \ +10-dof IMUs with embedded Linux systems" +HOMEPAGE = "https://github.com/RPi-Distro/RTIMULib/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://../../LICENSE;md5=96cdecb41125f498958e09b72faf318e" + +SRC_URI = "git://github.com/RPi-Distro/RTIMULib.git;protocol=http;branch=master \ + file://0001-include-asm-ioctl.h-for-ioctl-define.patch;patchdir=../.. \ + " +SRCREV = "b949681af69b45f0f7f4bb53b6770037b5b02178" + +S = "${WORKDIR}/git/Linux/python/" + +inherit setuptools3 diff --git a/recipes-devtools/python/python3-sense-hat_2.2.0.bb b/recipes-devtools/python/python3-sense-hat_2.2.0.bb new file mode 100644 index 0000000..5ea0014 --- /dev/null +++ b/recipes-devtools/python/python3-sense-hat_2.2.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Python module to control the Raspberry Pi Sense HAT used in the Astro Pi mission" +HOMEPAGE = "https://github.com/RPi-Distro/python-sense-hat" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=d80fe312e1ff5fbd97369b093bf21cda" + +inherit setuptools3 pypi + +PYPI_PACKAGE = "sense-hat" + +SRC_URI[md5sum] = "69929250cb72349a8a82edf2584b1d83" +SRC_URI[sha256sum] = "f000998d042d96ed722d459312e1bebd0107f9f3015cd34b3e4fabcab9c800af" + +DEPENDS += " \ + jpeg \ + zlib \ + freetype \ + " + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-numpy \ + ${PYTHON_PN}-rtimu \ + ${PYTHON_PN}-imaging \ + " -- cgit v1.2.3-54-g00ecf