From b809eb9d31058aad51fb82ff321a6bef45b23e58 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 18 Sep 2019 06:27:43 -0400 Subject: meta-openembedded: subtree update:19528ba2a6..ef1b17f4ef Callaghan, Dan (1): lmsensors: add a PACKAGECONFIG for sensord Changqing Li (1): ntp: fix package split wrongly when enabled usrmerge Khem Raj (1): remove spurious file Nathan Rossi (3): libeigen: Add native and nativesdk to BBCLASSEXTEND python*-pyusb: Add native and nativesdk to BBCLASSEXTEND python*-pyserial: Add native and nativesdk to BBCLASSEXTEND Oleksandr Kravchuk (23): babl: update to 0.1.62 znc: update to 1.7.4 zlog: update to 1.2.14 wipe: update to 0.24 upower: update to 0.99.11 python-pyobject: update to 3.34.0 python-pytoml: update to 0.1.21 python-cpuset: update to 1.6 libwebsockets: update to 3.2.0 libvpx: update to 1.8.1 libvdpau: update to 1.3 libmicrohttpd: update to 0.9.66 lcms: update to 2.9 libblockdev: update to 2.23 libbytesize: update to 2.1 iwd: update to 0.20 gsl: update to 2.6 gflags: update to 2.2.2 digitemp: update to 3.7.2 catch2: update to 2.9.2 botan: update to 2.11.0 agent-proxy: update to 1.97 ceres-solver: fix package version Paul Eggleton (1): mosquitto: update to 1.6.5 Scott Ellis (1): wireguard: Upgrade 20190905 to 20190913 Trevor Gamblin (1): openjpeg: upgrade 2.3.0 -> 2.3.1 Yi Zhao (1): samba: upgrade 4.10.7 -> 4.10.8 Zang Ruochen (2): python-dbus: upgrade 1.2.10 -> 1.2.12 python-pluggy: upgrade 0.12.0 -> 0.13.0 Zheng Ruoqin (1): xrdp: 0.9.4 -> 0.9.11 Change-Id: I3152060569cc5af7f7950c7037f25f54191d20a9 Signed-off-by: Brad Bishop --- .../recipes-devtools/python/python-dbus_1.2.10.bb | 32 ---------------------- .../recipes-devtools/python/python-dbus_1.2.12.bb | 32 ++++++++++++++++++++++ .../recipes-devtools/python/python-pluggy.inc | 4 +-- .../python/python-pluggy_0.12.0.bb | 2 -- .../python/python-pluggy_0.13.0.bb | 2 ++ .../recipes-devtools/python/python-pyserial.inc | 2 ++ .../recipes-devtools/python/python-pyusb.inc | 2 ++ .../python/python3-pluggy_0.12.0.bb | 2 -- .../python/python3-pluggy_0.13.0.bb | 2 ++ 9 files changed, 42 insertions(+), 38 deletions(-) delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.12.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.13.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.0.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python') diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb deleted file mode 100644 index 9907ea953..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Python bindings for the DBus inter-process communication system" -SECTION = "devel/python" -HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -LICENSE = "MIT & AFL-2.1 | GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b03240518994df6d8c974675675e5ca4 \ - file://dbus-gmain/COPYING;md5=99fece6728a80737c8fd3e7c734c17c4 " -DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "5d21d5ae6423f0e41caa3400af44edac" -SRC_URI[sha256sum] = "d4332bbd4a0054fa4010b259c293b84d461bbd9d7a8ef528157d151c0398d886" -S = "${WORKDIR}/dbus-python-${PV}" - -inherit distutils-base autotools pkgconfig - -# documentation needs python-sphinx, which is not in oe-core or meta-python for now -# change to use PACKAGECONFIG when python-sphinx is added to oe-core or meta-python -EXTRA_OECONF += "--disable-documentation" - -export STAGING_LIBDIR -export STAGING_INCDIR - -RDEPENDS_${PN} = "python-io python-logging python-stringold python-threading python-xml" - -FILES_${PN}-dev += "${libdir}/pkgconfig" - -do_install_append() { - # Remove files that clash with python3-dbus; their content is same - rm ${D}${includedir}/dbus-1.0/dbus/dbus-python.h ${D}${libdir}/pkgconfig/dbus-python.pc -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.12.bb new file mode 100644 index 000000000..f08fa20a1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.12.bb @@ -0,0 +1,32 @@ +SUMMARY = "Python bindings for the DBus inter-process communication system" +SECTION = "devel/python" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +LICENSE = "MIT & AFL-2.1 | GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b03240518994df6d8c974675675e5ca4 \ + file://dbus-gmain/COPYING;md5=99fece6728a80737c8fd3e7c734c17c4 " +DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "428b7a9e7e2d154a7ceb3e13536283e4" +SRC_URI[sha256sum] = "cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260" +S = "${WORKDIR}/dbus-python-${PV}" + +inherit distutils-base autotools pkgconfig + +# documentation needs python-sphinx, which is not in oe-core or meta-python for now +# change to use PACKAGECONFIG when python-sphinx is added to oe-core or meta-python +EXTRA_OECONF += "--disable-documentation" + +export STAGING_LIBDIR +export STAGING_INCDIR + +RDEPENDS_${PN} = "python-io python-logging python-stringold python-threading python-xml" + +FILES_${PN}-dev += "${libdir}/pkgconfig" + +do_install_append() { + # Remove files that clash with python3-dbus; their content is same + rm ${D}${includedir}/dbus-1.0/dbus/dbus-python.h ${D}${libdir}/pkgconfig/dbus-python.pc +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc index c9bee6287..57660060c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/pytest-dev/pluggy" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2" -SRC_URI[md5sum] = "e986647f5d786c0cc1bd065cf9bac658" -SRC_URI[sha256sum] = "0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc" +SRC_URI[md5sum] = "4b8384b69cddbc2e104fdd3ff5631788" +SRC_URI[sha256sum] = "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb deleted file mode 100644 index edcd4f512..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-pluggy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.13.0.bb new file mode 100644 index 000000000..edcd4f512 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.13.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pluggy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc index 52a7e05ce..870f1d8a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc @@ -40,3 +40,5 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-stringold \ ${PYTHON_PN}-threading \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc index 30bbe85a9..baf2db530 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc @@ -8,3 +8,5 @@ SRC_URI[md5sum] = "862b56452c64948c787ad8ef9498590b" SRC_URI[sha256sum] = "4e9b72cc4a4205ca64fbf1f3fff39a335512166c151ad103e55c8223ac147362" inherit pypi + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb deleted file mode 100644 index 941e8e3d8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pluggy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.0.bb new file mode 100644 index 000000000..941e8e3d8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pluggy.inc -- cgit v1.2.3