From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../recipes-devtools/python/python-cpuset_1.6.bb | 18 --- .../python/python-distutils-extra.bb | 7 -- .../python/python-futures_3.3.0.bb | 13 --- .../recipes-devtools/python/python-jsmin_2.2.2.bb | 11 -- .../0001-python-pyobject-fix-install-dir.patch | 121 --------------------- .../python/python-pygobject_3.34.0.bb | 39 ------- .../recipes-devtools/python/python-pytoml.inc | 12 -- .../python/python-pytoml_0.1.21.bb | 2 - .../recipes-devtools/python/python-six_1.13.0.bb | 2 - .../recipes-devtools/python/python-which_1.1.0.bb | 19 ---- 10 files changed, 244 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.3.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-jsmin_2.2.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-python-pyobject-fix-install-dir.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.34.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml.inc delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml_0.1.21.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-which_1.1.0.bb (limited to 'meta-openembedded/meta-oe/recipes-devtools/python') diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.6.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.6.bb deleted file mode 100644 index 1255a51f7..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.6.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Cpuset is a Python application to make using the cpusets facilities in the Linux kernel easier" -SECTION = "devel/python" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -S = "${WORKDIR}/git" -SRCREV = "6c46d71a1c6ee711063153b9f7787280128f7252" -SRC_URI = "git://github.com/lpechacek/cpuset.git;protocol=https;" - -inherit distutils - -RDEPENDS_${PN} = "\ - python-core \ - python-re \ - python-logging \ - python-textutils \ - python-unixadmin \ - " diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.bb deleted file mode 100644 index eb84f7436..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.bb +++ /dev/null @@ -1,7 +0,0 @@ -require python-distutils-extra.inc - -inherit setuptools - -RDEPENDS_${PN} = "\ - python-distutils \ -" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.3.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.3.0.bb deleted file mode 100644 index 1636f7371..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.3.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The concurrent.futures module provides a high-level interface for asynchronously executing callables." -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=834d982f973c48b6d662b5944c5ab567" -HOMEPAGE = "https://github.com/agronholm/pythonfutures" -DEPENDS = "python" - -SRC_URI[md5sum] = "b43a39ae1475e3fd6940f2b4f7214675" -SRC_URI[sha256sum] = "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794" - -inherit pypi setuptools - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-jsmin_2.2.2.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-jsmin_2.2.2.bb deleted file mode 100644 index d00d1e2a0..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-jsmin_2.2.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "JavaScript minifier." -HOMEPAGE = "https://github.com/tikitu/jsmin/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3a3301ce2ad647e172f4a1016c67324d" - -inherit setuptools pypi -SRC_URI[md5sum] = "00e7a3179a4591aab2ee707b3214e2fd" -SRC_URI[sha256sum] = "b6df99b2cd1c75d9d342e4335b535789b8da9107ec748212706ef7bbe5c2553b" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-python-pyobject-fix-install-dir.patch b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-python-pyobject-fix-install-dir.patch deleted file mode 100644 index 848cda5aa..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-python-pyobject-fix-install-dir.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 8b4648d5bc50cb1c14961ed38bf97d5a693f5237 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 24 Jun 2019 14:51:52 +0800 -Subject: [PATCH] python-pyobject: fix the wrong install dir for python2 - -* after upgrade to 3.32.1, pygobject switch to build with meson, and - default python option is python3, switch to python2 - -* default install dir get by python.install_sources and -python.get_install_dir is get from python's sysconfig info, -not like python3, for python2, the install dir include the basedir of -recipe-sysroot-native, add stagedir option for user to config -correct install dir. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li ---- - gi/meson.build | 7 +++---- - gi/overrides/meson.build | 4 ++-- - gi/repository/meson.build | 4 ++-- - meson.build | 4 +++- - meson_options.txt | 1 + - pygtkcompat/meson.build | 4 ++-- - 6 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/gi/meson.build b/gi/meson.build -index c1afd68..249c23d 100644 ---- a/gi/meson.build -+++ b/gi/meson.build -@@ -60,9 +60,8 @@ python_sources = [ - 'types.py', - ] - --python.install_sources(python_sources, -- pure : false, -- subdir : 'gi' -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi') - ) - - # https://github.com/mesonbuild/meson/issues/4117 -@@ -76,7 +75,7 @@ giext = python.extension_module('_gi', sources, - dependencies : [python_ext_dep, glib_dep, gi_dep, ffi_dep], - include_directories: include_directories('..'), - install: true, -- subdir : 'gi', -+ install_dir: join_paths(stagedir, 'gi'), - c_args: pyext_c_args + main_c_args - ) - -diff --git a/gi/overrides/meson.build b/gi/overrides/meson.build -index 6ff073f..964fef1 100644 ---- a/gi/overrides/meson.build -+++ b/gi/overrides/meson.build -@@ -10,6 +10,6 @@ python_sources = [ - 'keysyms.py', - '__init__.py'] - --python.install_sources(python_sources, -- subdir : join_paths('gi', 'overrides') -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi', 'overrides') - ) -diff --git a/gi/repository/meson.build b/gi/repository/meson.build -index fdc136b..fc88adf 100644 ---- a/gi/repository/meson.build -+++ b/gi/repository/meson.build -@@ -1,5 +1,5 @@ - python_sources = ['__init__.py'] - --python.install_sources(python_sources, -- subdir : join_paths('gi', 'repository') -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi', 'repository') - ) -diff --git a/meson.build b/meson.build -index d27a005..ecd55d5 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,12 +165,14 @@ else - py_version = pygobject_version - endif - -+stagedir = get_option('stagedir') -+ - pkginfo_conf = configuration_data() - pkginfo_conf.set('VERSION', py_version) - configure_file(input : 'PKG-INFO.in', - output : 'PyGObject-@0@.egg-info'.format(py_version), - configuration : pkginfo_conf, -- install_dir : python.get_install_dir(pure : false)) -+ install_dir : stagedir) - - subdir('gi') - subdir('pygtkcompat') -diff --git a/meson_options.txt b/meson_options.txt -index 5dd4cbc..21def16 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ - option('python', type : 'string', value : 'python3') - option('pycairo', type : 'boolean', value : true, description : 'build with pycairo integration') - option('tests', type : 'boolean', value : true, description : 'build unit tests') -+option('stagedir', type : 'string', value : '') -diff --git a/pygtkcompat/meson.build b/pygtkcompat/meson.build -index 9e43c44..ef3322d 100644 ---- a/pygtkcompat/meson.build -+++ b/pygtkcompat/meson.build -@@ -3,6 +3,6 @@ python_sources = [ - 'generictreemodel.py', - 'pygtkcompat.py'] - --python.install_sources(python_sources, -- subdir : 'pygtkcompat' -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'pygtkcompat') - ) --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.34.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.34.0.bb deleted file mode 100644 index 0cbd07f66..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.34.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Python GObject bindings" -HOMEPAGE = "http://www.pygtk.org/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection distutils-base upstream-version-is-even - -DEPENDS += "python glib-2.0" - -SRCNAME = "pygobject" -SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ - file://0001-python-pyobject-fix-install-dir.patch \ -" - -SRC_URI[md5sum] = "ca1dc4f31c1d6d283758e8f315a88ab6" -SRC_URI[sha256sum] = "87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -UNKNOWN_CONFIGURE_WHITELIST = "introspection" - -PACKAGECONFIG ??= "stagedir" - -PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python-pycairo, python-pycairo" -PACKAGECONFIG[tests] = "-Dtests=true, -Dtests=false, , " -PACKAGECONFIG[python] = "-Dpython=python3, -Dpython=python2, , " -PACKAGECONFIG[stagedir] = "-Dstagedir=${PYTHON_SITEPACKAGES_DIR}, -Dstagedir="", , " - -BBCLASSEXTEND = "native" -RDEPENDS_${PN} = "python-pkgutil" -RDEPENDS_${PN}_class-native = "" - -do_install_append() { - # Remove files that clash with python3-pygobject; their content is same - rm -r ${D}${includedir}/pygobject-3.0/pygobject.h ${D}${libdir}/pkgconfig -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml.inc b/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml.inc deleted file mode 100644 index 180531d75..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml.inc +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A TOML-0.4.0 parser/writer for Python" -HOMEPAGE = "https://pypi.python.org/pypi/pytoml/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cfff423699bdaef24331933ac4f56078" - -SRC_URI[md5sum] = "e59dd36a559dd2a876e4c149c69e947b" -SRC_URI[sha256sum] = "8eecf7c8d0adcff3b375b09fe403407aa9b645c499e5ab8cac670ac4a35f61e7" - -inherit pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml_0.1.21.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml_0.1.21.bb deleted file mode 100644 index 88fa95317..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml_0.1.21.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-pytoml.inc diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb deleted file mode 100644 index af26e83d6..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require recipes-devtools/python/python-six.inc diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-which_1.1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-which_1.1.0.bb deleted file mode 100644 index 901fdc763..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-which_1.1.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "which.py -- a portable GNU which replacement" -HOMEPAGE = "http://code.google.com/p/which/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=030b09798681482b9ad12ac47be496ea" - -inherit setuptools pypi python-dir - -SRCREV = "425bdeeb2d87c36e2313dc4b8d69ff2bb5a02ee9" -PYPI_SRC_URI = "git://github.com/trentm/which" - -S = "${WORKDIR}/git" - -do_install_append() { - rmdir -p --ignore-fail-on-non-empty ${D}${STAGING_BINDIR_NATIVE} - rmdir -p --ignore-fail-on-non-empty ${D}${datadir} -} - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3