From 1711452e2c443f35cad5e24313509ca3d46810ca Mon Sep 17 00:00:00 2001 From: Mykola Salomatin Date: Wed, 11 Aug 2021 15:28:06 +0300 Subject: [MTX-4164] mPower R.6.0: GP-1224 Remove Python 2 from MTCDT and MTCAP, Support only Python3 Remove python2 support for GPSD --- recipes-navigation/gpsd/gpsd_3.20.bb | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'recipes-navigation') diff --git a/recipes-navigation/gpsd/gpsd_3.20.bb b/recipes-navigation/gpsd/gpsd_3.20.bb index ea217ce..e04df0f 100644 --- a/recipes-navigation/gpsd/gpsd_3.20.bb +++ b/recipes-navigation/gpsd/gpsd_3.20.bb @@ -4,11 +4,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=01764c35ae34d9521944bb6ab312af53" DEPENDS = "dbus dbus-glib ncurses python3 libusb1 chrpath-replacement-native pps-tools" PROVIDES = "virtual/gpsd" -PR="m8" - -#TODO -#the recipe generates python2 pygps package for Atmel based devices and python3 pygps package for TI based devices. -#later when python2 will be removed the recipe should be returned to previous version +PR="m9" EXTRANATIVEPATH += "chrpath-native" @@ -54,8 +50,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}" PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" -PYTHON2_SITEPACKAGES_DIR="${libdir}/python2.7/site-packages" - # Remove unneeded features. netfeed is needed by gpsmon EXTRA_OESCONS = " \ sysroot=${STAGING_DIR_TARGET} \ @@ -153,8 +147,6 @@ do_install_append() { #support for python install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - install -d ${D}/${PYTHON2_SITEPACKAGES_DIR}/gps - install -m 755 ${S}/gps/*.py ${D}/${PYTHON2_SITEPACKAGES_DIR}/gps #support for systemd install -d ${D}${systemd_unitdir}/system/ @@ -191,7 +183,7 @@ pkg_postrm_${PN}-conf() { } -PACKAGES =+ "libgps libgpsd gpsd-udev gpsd-conf gpsd-gpsctl gpspipe gps-utils python-pygps-dbg python-pygps python3-pygps-dbg python3-pygps" +PACKAGES =+ "libgps libgpsd gpsd-udev gpsd-conf gpsd-gpsctl gpspipe gps-utils python3-pygps-dbg python3-pygps" # PACKAGES =+ "${PN} ${PN}-dbg ${PN}-dev" # File does not exist: ${libdir}/libQgpsmm.prl @@ -232,12 +224,9 @@ FILES_gpspipe = "${bindir}/gpspipe" SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" FILES_gps-utils = "${bindir}/*" -#RDEPENDS_gps-utils_mtbsp-at91 = "python-pygps" RDEPENDS_gps-utils = "python3-pygps" -SUMMARY_python-pygps = "Python bindings to gpsd" SUMMARY_python3-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON2_SITEPACKAGES_DIR}/*" FILES_python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS_python3-pygps = " \ python3-core \ @@ -248,15 +237,6 @@ RDEPENDS_python3-pygps = " \ gpsd \ python3-json" -RDEPENDS_python-pygps = " \ - python-core \ - python-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -- cgit v1.2.3