From ba0ca845af46a5d9c05dbd8943744a4e78d268d5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 22 Jan 2020 16:21:37 +0000 Subject: misc: python3 readiness Updating the packages in m-c-s to be python3 parse safe. These are not runtime tested, but will pass layer inclusion and parsing. Signed-off-by: Bruce Ashfield --- recipes-devtools/python/python-ansible_2.3.1.0.bb | 4 ---- recipes-devtools/python/python-greenlet_0.4.9.bb | 11 ----------- recipes-devtools/python/python-pyparsing_2.0.1.bb | 10 ---------- recipes-extended/glusterfs/glusterfs.inc | 7 ++++--- recipes-support/spice/spice_git.bb | 6 +++--- 5 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 recipes-devtools/python/python-ansible_2.3.1.0.bb delete mode 100644 recipes-devtools/python/python-greenlet_0.4.9.bb delete mode 100644 recipes-devtools/python/python-pyparsing_2.0.1.bb diff --git a/recipes-devtools/python/python-ansible_2.3.1.0.bb b/recipes-devtools/python/python-ansible_2.3.1.0.bb deleted file mode 100644 index b6659fc..0000000 --- a/recipes-devtools/python/python-ansible_2.3.1.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit setuptools -require python-ansible.inc - -RDEPENDS_${PN} += "python-pyyaml python-jinja2 python-modules" diff --git a/recipes-devtools/python/python-greenlet_0.4.9.bb b/recipes-devtools/python/python-greenlet_0.4.9.bb deleted file mode 100644 index 49c2551..0000000 --- a/recipes-devtools/python/python-greenlet_0.4.9.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Python lightweight in-process concurrent programming" -HOMEPAGE = "http://pypi.python.org/pypi/greenlet" -SECTION = "devel/python" -LICENSE = "MIT & PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=03143d7a1a9f5d8a0fee825f24ca9c36 \ - file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" - -SRC_URI[md5sum] = "00bb1822d8511cc85f052e89d1fd919b" -SRC_URI[sha256sum] = "79f9b8bbbb1c599c66aed5e643e8b53bae697cae46e0acfc4ee461df48a90012" - -inherit distutils pypi diff --git a/recipes-devtools/python/python-pyparsing_2.0.1.bb b/recipes-devtools/python/python-pyparsing_2.0.1.bb deleted file mode 100644 index c19f137..0000000 --- a/recipes-devtools/python/python-pyparsing_2.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python parsing module" -HOMEPAGE = "http://pyparsing.wikispaces.com/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb46329938e6bc829b256e37d5c1e31a" - -SRC_URI[md5sum] = "37adec94104b98591507218bc82e7c31" -SRC_URI[sha256sum] = "0007cd3f008eba4a203f1f6b4b133ddc352552c8808b694c88c23db56416e4e4" - -inherit distutils pypi diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc index 1ac5123..4eb325f 100644 --- a/recipes-extended/glusterfs/glusterfs.inc +++ b/recipes-extended/glusterfs/glusterfs.inc @@ -26,7 +26,8 @@ LIC_FILES_CHKSUM = "file://COPYING-GPLV2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING-LGPLV3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://contrib/fuse-util/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit autotools pkgconfig distutils-base update-rc.d systemd +inherit autotools pkgconfig distutils3-base update-rc.d systemd +inherit python3-dir DEPENDS += "bison-native flex-native python3-native fuse libaio libtirpc libxml2 ncurses \ openssl python3 readline zlib liburcu util-linux glib-2.0 acl" @@ -42,8 +43,8 @@ EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \ ac_cv_file__etc_centos_release=no \ --with-mountutildir=${sbindir} \ --disable-fusermount \ - TARGET_PYTHON=${bindir}/python \ - PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ + TARGET_PYTHON=${bindir}/python3 \ + PYTHON=${PYTHON} \ BUILD_PYTHON_INC=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ BUILD_PYTHON_LIB=python${PYTHON_BASEVERSION} \ BUILD_PYTHON_SITE_PACKAGES=${PYTHON_SITEPACKAGES_DIR} \ diff --git a/recipes-support/spice/spice_git.bb b/recipes-support/spice/spice_git.bb index c0fdd9c..7198ce0 100644 --- a/recipes-support/spice/spice_git.bb +++ b/recipes-support/spice/spice_git.bb @@ -45,12 +45,12 @@ SRC_URI += " \ S = "${WORKDIR}/git" -inherit autotools gettext pythonnative python-dir pkgconfig +inherit autotools gettext python3native python3-dir pkgconfig -DEPENDS += "python-native celt051 python-pyparsing jpeg pixman alsa-lib glib-2.0" +DEPENDS += "python3-native celt051 python3-pyparsing jpeg pixman alsa-lib glib-2.0" export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" -export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" +export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python${PYTHON_BASEVERSION}/site-packages" PACKAGECONFIG ?= "sasl" -- cgit v1.2.3-54-g00ecf