Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 00/45] Move recipes to use Python 3 whenever possible
@ 2016-05-24 11:53 Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 01/45] python-native, python3-native: remove the use of exported HOST_SYS and BUILD_SYS variables Alexander Kanavin
                   ` (46 more replies)
  0 siblings, 47 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

This patchset updates recipes to use Python 3 whenever possible. A few items
cannot be moved at the moment for various reasons, here they are:

1) Smartpm package manager has not been ported to Python 3 and it is unlikely
to happen:
https://github.com/smartpm/smart/issues/4
We need to look into alternatives such as yum or dnf (the 'next generation' fork of yum).

Consequently, rpm's python bindings (required by smartpm) stay at python 2 as well
for now, even tough python 3 seems to be supported.

2) Scons build system is python 2 only, due to lack of resources.

3) createrepo recipe is using an upstream version from 2007, before createrepo was
rewritten on top of yum's python modules.

We need to look into adding yum recipe which will allow updating createrepo to latest upstream.
Also, libxml2 is currently a createrepo dependency, and so stays at Python 2 for now.

4) varous recipes that haven't been ported: kconfig-frontends, mklibs, opkg-utils,
ltp, mc, parted, libepoxy, mesa, perf, rt-tests, webkitgtk.

5) LSB spec is implicitly requiring Python 2 (via requirement for '/usr/bin/python').

6) gobject introspection has been ported to Python 3 in release 1.48. I'll send this
update separately, as a part of normal version update patches.

7) piglit has been ported to Python 3 as well in the latest upstream releases, Jussi
Kukkonen should take care of it. I've added piglit's python dependencies in their
Python 3 versions - python3-mako and python3-numpy, so that the task should be a little
easier.

The following changes since commit c7e614c438706fb3ed7520b4990ebb3973366942:

  useradd: Fix infinite build loop (2016-05-23 10:33:45 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib akanavin/deprecate-python2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/deprecate-python2

Alexander Kanavin (45):
  python-native, python3-native: remove the use of exported HOST_SYS and
    BUILD_SYS variables
  distutils-native-base.bbclass, distutils3-native-base.bbclass: remove
  python3-dir.bbclass: add a separate class for Python 3
  default-versions.inc: drop python-related defaults
  sip.bbclass: remove
  avahi-ui: remove support for building a python module
  bind: switch Python dependency to Python 3.x
  python-dbus: update to 1.2.4, port to python 3
  python3: manipulate all of the config*/Makefile files, not just
    config/Makefile
  python3: drop 110-enable-zlib.patch
  glib: move to Python 3
  dbus-test: remove unneeded pygobject dependency
  python-pygobject: port to Python 3
  neard: do not package python test scripts
  bluez5: switch to Python 3
  connman: do not install Python test scripts
  ofono: drop the custom-made revert to Python 2 from Python 3
  packagegroup-core-full-cmdline: drop python-dbus from the list of
    services
  nfs-utils: switch to Python 3
  systemd: drop python dependency for ptests
  util-linux: move to Python 3
  python-pycairo: move to Python 3
  bootchart2: move to Python 3
  gdb: move to Python 3
  git: remove Python package (to which nothing was packaged)
  qemu: remove runtime python dependency
  subversion: remove unnecessary python dependency
  swig: move to Python 3
  python-pyrex: remove unused recipe
  python-imaging: remove unused recipe
  python-docutils: move to Python 3
  cracklib: disable building the python module
  libuser: move to Python 3
  libnewt-python: move to Python 3
  gnome-doc-utils: remove recipe
  lttng-tools: move to Python 3
  lttng-ust: move to Python 3
  systemtap: move to Python 3
  libcap-ng: move to Python 3
  hwlatdetect: move to Python 3
  python3-mako: add a Python 3 recipe
  python3-nose: add a recipe
  python3: add = to -L linking option only when the path is absolute
  python-numpy: move recipe to own directory
  python3-numpy: add a recipe

 meta/classes/distutils-common-base.bbclass         |    2 -
 meta/classes/distutils-native-base.bbclass         |    3 -
 meta/classes/distutils-tools.bbclass               |    4 -
 meta/classes/distutils.bbclass                     |    4 -
 meta/classes/distutils3-base.bbclass               |    3 -
 meta/classes/distutils3-native-base.bbclass        |    4 -
 meta/classes/distutils3.bbclass                    |   24 -
 meta/classes/gobject-introspection.bbclass         |    2 -
 meta/classes/python-dir.bbclass                    |    6 +-
 meta/classes/python3-dir.bbclass                   |    5 +
 meta/classes/python3native.bbclass                 |    4 +-
 meta/classes/sip.bbclass                           |   61 -
 meta/conf/distro/include/default-versions.inc      |    5 -
 meta/conf/distro/include/distro_alias.inc          |    2 -
 meta/conf/distro/include/security_flags.inc        |    1 -
 meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb |   11 +-
 meta/recipes-connectivity/bind/bind_9.10.3-P3.bb   |    4 +-
 meta/recipes-connectivity/bluez5/bluez5.inc        |    6 +-
 meta/recipes-connectivity/connman/connman.inc      |    6 +-
 meta/recipes-connectivity/neard/neard_0.15.bb      |   13 +-
 .../nfs-utils/nfs-utils_1.3.3.bb                   |    6 +-
 meta/recipes-connectivity/ofono/ofono.inc          |    6 +-
 .../ofono/Revert-test-Convert-to-Python-3.patch    | 1270 --------------------
 meta/recipes-connectivity/ofono/ofono_1.17.bb      |    1 -
 meta/recipes-core/dbus/dbus-test_1.10.6.bb         |    2 +-
 meta/recipes-core/glib-2.0/glib.inc                |   11 +-
 meta/recipes-core/libxml/libxml2_2.9.3.bb          |    2 -
 meta/recipes-core/systemd/systemd_229.bb           |    2 +-
 meta/recipes-core/util-linux/util-linux.inc        |   11 +-
 .../bootchart2/bootchart2_0.14.8.bb                |   16 +-
 meta/recipes-devtools/gdb/gdb-common.inc           |    2 +-
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |   12 +-
 meta/recipes-devtools/gdb/gdb-cross.inc            |    6 +-
 meta/recipes-devtools/gdb/gdb_7.11.bb              |    6 +-
 meta/recipes-devtools/git/git.inc                  |    7 +-
 ...h-usr-and-so-on-for-libraries-by-default-.patch |    0
 .../files}/aarch64/_numpyconfig.h                  |    0
 .../files/aarch64}/config.h                        |    0
 .../files}/add-glibc-check.patch                   |    0
 .../mipsel => python-numpy/files/arm}/config.h     |    0
 .../files/arm}/numpyconfig.h                       |    0
 .../files}/armeb/config.h                          |    0
 .../files}/armeb/numpyconfig.h                     |    0
 .../files}/mips/_numpyconfig.h                     |    0
 .../files}/mips/config.h                           |    0
 .../files/mips64}/_numpyconfig.h                   |    0
 .../files/mips64}/config.h                         |    0
 .../files}/mips64n32/_numpyconfig.h                |    0
 .../files/mips64n32}/config.h                      |    0
 .../arm => python-numpy/files/mipsel}/config.h     |    0
 .../files/mipsel}/numpyconfig.h                    |    0
 .../files}/powerpc/_numpyconfig.h                  |    0
 .../files}/powerpc/config.h                        |    0
 .../files/powerpc64}/_numpyconfig.h                |    0
 .../files/powerpc64}/config.h                      |    0
 .../files}/remove-build-path-in-comments.patch     |    0
 .../files}/x86-64/_numpyconfig.h                   |    0
 .../files}/x86-64/config.h                         |    0
 .../files}/x86/config.h                            |    0
 .../files}/x86/numpyconfig.h                       |    0
 .../python-numpy_1.10.4.bb                         |    1 -
 .../python-numpy/python3-numpy_1.10.4.bb           |  101 ++
 ...ing-setup.py-force-paths-for-zlib-freetyp.patch |   55 -
 .../allow.to.disable.some.features.patch           |   65 -
 .../python-imaging/fix-freetype-includes.patch     |   30 -
 .../python/python-imaging_1.1.7.bb                 |   45 -
 meta/recipes-devtools/python/python-mako_1.0.3.bb  |    6 +
 ...2-distutils-prefix-is-inside-staging-area.patch |   65 -
 .../python/python-native_2.7.11.bb                 |    4 +-
 .../python/python-pycairo_1.10.0.bb                |   41 -
 .../python/python-pyrex-native_0.9.9.bb            |    5 -
 .../python-pyrex/pyrex-fix-optimized-mode.patch    |   15 -
 meta/recipes-devtools/python/python-pyrex_0.9.9.bb |   22 -
 ...et-the-prefix-to-be-inside-staging-direct.patch |   51 +
 ...{python-dbus_1.2.0.bb => python3-dbus_1.2.4.bb} |   22 +-
 ...n-docutils_0.12.bb => python3-docutils_0.12.bb} |    4 +-
 meta/recipes-devtools/python/python3-mako_1.0.3.bb |   24 +
 .../python/python3-native_3.5.1.bb                 |    3 -
 meta/recipes-devtools/python/python3-nose_1.3.7.bb |   24 +
 .../python/python3-pycairo_1.10.0.bb               |   40 +
 ...c-add-sysroot-path-to-GI_DATADIR-don-t-se.patch |    0
 ...bject_3.18.2.bb => python3-pygobject_3.18.2.bb} |    8 +-
 .../python/python3/110-enable-zlib.patch           |   21 -
 ...2-distutils-prefix-is-inside-staging-area.patch |   49 +-
 .../python/python3/unixccompiler.patch             |    6 +-
 meta/recipes-devtools/python/python3_3.5.1.bb      |    8 +-
 meta/recipes-devtools/python/python_2.7.11.bb      |    3 -
 meta/recipes-devtools/qemu/qemu.inc                |    2 +-
 meta/recipes-devtools/rpm/rpm_5.4+cvs.bb           |    2 +-
 meta/recipes-devtools/rpm/rpm_5.4.16.bb            |    2 +-
 .../subversion/subversion_1.9.3.bb                 |    2 +-
 meta/recipes-devtools/swig/swig.inc                |    7 +-
 meta/recipes-extended/cracklib/cracklib_2.9.5.bb   |   25 +-
 meta/recipes-extended/libuser/libuser_0.62.bb      |    8 +-
 .../newt/libnewt-python_0.52.18.bb                 |    6 +-
 meta/recipes-extended/newt/libnewt_0.52.18.bb      |    3 -
 .../packagegroup-core-full-cmdline.bb              |    1 -
 meta/recipes-gnome/epiphany/epiphany_3.18.4.bb     |    1 -
 .../gnome-desktop/gnome-desktop3_3.18.2.bb         |    2 +-
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |   29 -
 .../gnome-doc-utils/sysrooted-pkg-config.patch     |   35 -
 .../use-usr-bin-env-for-python-in-xml2po.patch     |   30 -
 .../gnome/gnome-doc-utils/xsltproc_nonet.patch     |   95 --
 .../recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb |   12 -
 .../gobject-introspection_1.46.0.bb                |    2 -
 ...d-look-for-python-3.0-when-building-pytho.patch |   30 -
 meta/recipes-kernel/lttng/lttng-tools_git.bb       |    7 +-
 meta/recipes-kernel/lttng/lttng-ust_git.bb         |    9 +-
 meta/recipes-kernel/perf/perf.bb                   |    2 -
 meta/recipes-kernel/systemtap/systemtap_git.bb     |    5 +-
 meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb       |    5 +-
 meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb  |   12 +-
 112 files changed, 384 insertions(+), 2198 deletions(-)
 delete mode 100644 meta/classes/distutils-native-base.bbclass
 delete mode 100644 meta/classes/distutils3-native-base.bbclass
 create mode 100644 meta/classes/python3-dir.bbclass
 delete mode 100644 meta/classes/sip.bbclass
 delete mode 100644 meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/aarch64/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/powerpc64 => python-numpy/files/aarch64}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/add-glibc-check.patch (100%)
 rename meta/recipes-devtools/{python/python-numpy/mipsel => python-numpy/files/arm}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/mipsel => python-numpy/files/arm}/numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/armeb/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/armeb/numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/powerpc64 => python-numpy/files/mips64}/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/mips64n32 => python-numpy/files/mips64}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips64n32/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/mips64 => python-numpy/files/mips64n32}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/arm => python-numpy/files/mipsel}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/arm => python-numpy/files/mipsel}/numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/powerpc/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/powerpc/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/mips64 => python-numpy/files/powerpc64}/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/aarch64 => python-numpy/files/powerpc64}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/remove-build-path-in-comments.patch (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86-64/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86-64/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86/numpyconfig.h (100%)
 rename meta/recipes-devtools/{python => python-numpy}/python-numpy_1.10.4.bb (98%)
 create mode 100644 meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb
 delete mode 100644 meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
 delete mode 100644 meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
 delete mode 100644 meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
 delete mode 100644 meta/recipes-devtools/python/python-imaging_1.1.7.bb
 delete mode 100644 meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
 delete mode 100644 meta/recipes-devtools/python/python-pycairo_1.10.0.bb
 delete mode 100644 meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
 delete mode 100644 meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
 delete mode 100644 meta/recipes-devtools/python/python-pyrex_0.9.9.bb
 create mode 100644 meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
 rename meta/recipes-devtools/python/{python-dbus_1.2.0.bb => python3-dbus_1.2.4.bb} (53%)
 rename meta/recipes-devtools/python/{python-docutils_0.12.bb => python3-docutils_0.12.bb} (92%)
 create mode 100644 meta/recipes-devtools/python/python3-mako_1.0.3.bb
 create mode 100644 meta/recipes-devtools/python/python3-nose_1.3.7.bb
 create mode 100644 meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
 rename meta/recipes-devtools/python/{python-pygobject => python3-pygobject}/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch (100%)
 rename meta/recipes-devtools/python/{python-pygobject_3.18.2.bb => python3-pygobject_3.18.2.bb} (72%)
 delete mode 100644 meta/recipes-devtools/python/python3/110-enable-zlib.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils.inc
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch

-- 
2.8.1



^ permalink raw reply	[flat|nested] 63+ messages in thread

* [PATCH 01/45] python-native, python3-native: remove the use of exported HOST_SYS and BUILD_SYS variables
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 02/45] distutils-native-base.bbclass, distutils3-native-base.bbclass: remove Alexander Kanavin
                   ` (45 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

The code that utilized them was superseded by the code (in the same patch!)
that is utilizing STAGING_LIBDIR/STAGING_INCDIR, and wasn't correct in the
first place as HOST_SYS is not necessarily the same as the sysroot directory
name.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/classes/distutils-tools.bbclass               |  4 --
 meta/classes/distutils.bbclass                     |  4 --
 meta/classes/distutils3.bbclass                    | 24 --------
 meta/classes/gobject-introspection.bbclass         |  2 -
 meta/recipes-core/libxml/libxml2_2.9.3.bb          |  2 -
 meta/recipes-devtools/gdb/gdb-cross.inc            |  2 -
 meta/recipes-devtools/python/python-dbus_1.2.0.bb  |  3 -
 ...2-distutils-prefix-is-inside-staging-area.patch | 65 ----------------------
 .../python/python-native_2.7.11.bb                 |  4 +-
 .../recipes-devtools/python/python-numpy_1.10.4.bb |  1 -
 .../python/python-pycairo_1.10.0.bb                |  2 +-
 ...et-the-prefix-to-be-inside-staging-direct.patch | 51 +++++++++++++++++
 .../python/python3-native_3.5.1.bb                 |  2 -
 ...2-distutils-prefix-is-inside-staging-area.patch | 49 +++-------------
 meta/recipes-devtools/python/python3_3.5.1.bb      |  4 --
 meta/recipes-devtools/python/python_2.7.11.bb      |  3 -
 meta/recipes-extended/newt/libnewt_0.52.18.bb      |  3 -
 .../gobject-introspection_1.46.0.bb                |  2 -
 meta/recipes-kernel/perf/perf.bb                   |  2 -
 19 files changed, 62 insertions(+), 167 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
 create mode 100644 meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch

diff --git a/meta/classes/distutils-tools.bbclass b/meta/classes/distutils-tools.bbclass
index 8d9b3f7..3ef9cc5 100644
--- a/meta/classes/distutils-tools.bbclass
+++ b/meta/classes/distutils-tools.bbclass
@@ -8,14 +8,12 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
 distutils_do_compile() {
          STAGING_INCDIR=${STAGING_INCDIR} \
          STAGING_LIBDIR=${STAGING_LIBDIR} \
-         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
          ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \
          bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed."
 }
 
 distutils_stage_headers() {
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
 }
@@ -25,7 +23,6 @@ distutils_stage_all() {
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
         PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
 }
@@ -37,7 +34,6 @@ distutils_do_install() {
         STAGING_INCDIR=${STAGING_INCDIR} \
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install execution failed."
 
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index da48a2e..857572d 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -10,14 +10,12 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
 distutils_do_compile() {
          STAGING_INCDIR=${STAGING_INCDIR} \
          STAGING_LIBDIR=${STAGING_LIBDIR} \
-         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
          ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \
          bbfatal_log "${PYTHON_PN} setup.py build execution failed."
 }
 
 distutils_stage_headers() {
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
 }
@@ -27,7 +25,6 @@ distutils_stage_all() {
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
         PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
 }
@@ -37,7 +34,6 @@ distutils_do_install() {
         STAGING_INCDIR=${STAGING_INCDIR} \
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install execution failed."
 
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index 4f6ca44..a6720c5 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -9,14 +9,8 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
     --install-data=${D}/${datadir}"
 
 distutils3_do_compile() {
-        if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
-                SYS=${MACHINE}
-        else
-                SYS=${HOST_SYS}
-        fi
         STAGING_INCDIR=${STAGING_INCDIR} \
         STAGING_LIBDIR=${STAGING_LIBDIR} \
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
         build ${DISTUTILS_BUILD_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed."
@@ -25,28 +19,16 @@ distutils3_do_compile[vardepsexclude] = "MACHINE"
 
 distutils3_stage_headers() {
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
-        if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
-                SYS=${MACHINE}
-        else
-                SYS=${HOST_SYS}
-        fi
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
 }
 distutils3_stage_headers[vardepsexclude] = "MACHINE"
 
 distutils3_stage_all() {
-        if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
-                SYS=${MACHINE}
-        else
-                SYS=${HOST_SYS}
-        fi
         STAGING_INCDIR=${STAGING_INCDIR} \
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
         PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
 }
@@ -54,15 +36,9 @@ distutils3_stage_all[vardepsexclude] = "MACHINE"
 
 distutils3_do_install() {
         install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-        if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
-                SYS=${MACHINE}
-        else
-                SYS=${HOST_SYS}
-        fi
         STAGING_INCDIR=${STAGING_INCDIR} \
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
         bbfatal_log "${PYTHON_PN} setup.py install execution failed."
 
diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass
index 2d73e40..364c9d3 100644
--- a/meta/classes/gobject-introspection.bbclass
+++ b/meta/classes/gobject-introspection.bbclass
@@ -13,8 +13,6 @@ DEPENDS_append = " gobject-introspection gobject-introspection-native qemu-nativ
 
 # This is necessary for python scripts to succeed - distutils fails if these
 # are not set
-export BUILD_SYS
-export HOST_SYS
 export STAGING_INCDIR
 export STAGING_LIBDIR
 
diff --git a/meta/recipes-core/libxml/libxml2_2.9.3.bb b/meta/recipes-core/libxml/libxml2_2.9.3.bb
index 481346c..ae65159 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.3.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.3.bb
@@ -49,8 +49,6 @@ EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n -
 EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib"
 
 # required for python binding
-export HOST_SYS
-export BUILD_SYS
 export STAGING_LIBDIR
 export STAGING_INCDIR
 
diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc
index 2468d23..c62715f 100644
--- a/meta/recipes-devtools/gdb/gdb-cross.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross.inc
@@ -10,8 +10,6 @@ PACKAGECONFIG[python] = "--with-python=${STAGING_BINDIR_NATIVE}/python-native/py
 PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
 
 do_compile_prepend() {
-    export BUILD_SYS="${BUILD_SYS}"
-    export HOST_SYS="${HOST_SYS}"
     export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}"
     export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}"
 }
diff --git a/meta/recipes-devtools/python/python-dbus_1.2.0.bb b/meta/recipes-devtools/python/python-dbus_1.2.0.bb
index b314dce..ccdb9ae 100644
--- a/meta/recipes-devtools/python/python-dbus_1.2.0.bb
+++ b/meta/recipes-devtools/python/python-dbus_1.2.0.bb
@@ -18,9 +18,6 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python-docutils-native"
 PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python-docutils-native python-epydoc-native"
 
-export BUILD_SYS
-export HOST_SYS
-
 export STAGING_LIBDIR
 export STAGING_INCDIR
 
diff --git a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
deleted file mode 100644
index f89aaff..0000000
--- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-# The proper prefix is inside our staging area.
-# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
-# Signed-off-by: Phil Blundell <philb@gnu.org>
-
---- Python-2.6.6/Lib/distutils/sysconfig.py.orig	2012-01-03 14:02:03.027005296 +0000
-+++ Python-2.6.6/Lib/distutils/sysconfig.py	2012-01-03 14:02:31.517601081 +0000
-@@ -19,8 +19,8 @@
- from distutils.errors import DistutilsPlatformError
- 
- # These are needed in a couple of spots, so just compute them once.
--PREFIX = os.path.normpath(sys.prefix)
--EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
-+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
-+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
- 
- # Path to the base directory of the project. On Windows the binary may
- # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
-@@ -70,7 +70,7 @@
-     sys.exec_prefix -- i.e., ignore 'plat_specific'.
-     """
-     if prefix is None:
--        prefix = plat_specific and EXEC_PREFIX or PREFIX
-+        prefix = os.environ['STAGING_INCDIR'].rstrip('include')
- 
-     if os.name == "posix":
-         if python_build:
-@@ -115,12 +115,16 @@
-     If 'prefix' is supplied, use it instead of sys.prefix or
-     sys.exec_prefix -- i.e., ignore 'plat_specific'.
-     """
-+    lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
-     if prefix is None:
--        prefix = plat_specific and EXEC_PREFIX or PREFIX
-+        if plat_specific:
-+            prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
-+        else:
-+            prefix = PREFIX
- 
-     if os.name == "posix":
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 lib_basename, "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
-@@ -216,7 +220,7 @@
-     else:
-         # The name of the config.h file changed in 2.2
-         config_h = 'pyconfig.h'
--    return os.path.join(inc_dir, config_h)
-+    return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
- 
- 
- def get_makefile_filename():
-@@ -225,7 +229,7 @@
-         return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
-                             "Makefile")
-     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
--    return os.path.join(lib_dir, "config", "Makefile")
-+    return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
- 
- 
- def parse_config_h(fp, g=None):
diff --git a/meta/recipes-devtools/python/python-native_2.7.11.bb b/meta/recipes-devtools/python/python-native_2.7.11.bb
index abb69fc..31192ca 100644
--- a/meta/recipes-devtools/python/python-native_2.7.11.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.11.bb
@@ -8,7 +8,7 @@ SRC_URI += "\
             file://05-enable-ctypes-cross-build.patch \
             file://10-distutils-fix-swig-parameter.patch \
             file://11-distutils-never-modify-shebang-line.patch \
-            file://12-distutils-prefix-is-inside-staging-area.patch \
+            file://0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch \
             file://debug.patch \
             file://unixccompiler.patch \
             file://nohostlibs.patch \
@@ -30,8 +30,6 @@ RPROVIDES += "python-distutils-native python-compression-native python-textutils
 EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --with-system-expat=${STAGING_DIR_HOST}"
 
 EXTRA_OEMAKE = '\
-  BUILD_SYS="" \
-  HOST_SYS="" \
   LIBC="" \
   STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
   STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
diff --git a/meta/recipes-devtools/python/python-numpy_1.10.4.bb b/meta/recipes-devtools/python/python-numpy_1.10.4.bb
index 8a562dc..ca6a7ab 100644
--- a/meta/recipes-devtools/python/python-numpy_1.10.4.bb
+++ b/meta/recipes-devtools/python/python-numpy_1.10.4.bb
@@ -63,7 +63,6 @@ inherit distutils
 # Make the build fail and replace *config.h with proper one
 # This is a ugly, ugly hack - Koen
 do_compile_prepend_class-target() {
-    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
     ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \
     true
     cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/
diff --git a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
index 70fe25c..78e8a4e 100644
--- a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
+++ b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
@@ -23,7 +23,7 @@ inherit distutils pkgconfig
 BBCLASSEXTEND = "native"
 
 do_configure() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
+	./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
 }
 
 do_compile() {
diff --git a/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch b/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
new file mode 100644
index 0000000..502f849
--- /dev/null
+++ b/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
@@ -0,0 +1,51 @@
+From 4cdf2e9df13c6327fcc94d53e4953005543aef3d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 6 Apr 2016 17:43:02 +0300
+Subject: [PATCH 01/10] distutils: set the prefix to be inside staging
+ directory
+
+The proper prefix is inside our staging area.
+
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille-media.de>
+Signed-off-by: Phil Blundell <philb@gnu.org>
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Lib/distutils/sysconfig.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index de7da1d..f3aacf7 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -75,7 +75,7 @@ def get_python_inc(plat_specific=0, prefix=None):
+     sys.exec_prefix -- i.e., ignore 'plat_specific'.
+     """
+     if prefix is None:
+-        prefix = plat_specific and EXEC_PREFIX or PREFIX
++        prefix = os.environ['STAGING_INCDIR'].rstrip('include')
+ 
+     if os.name == "posix":
+         if python_build:
+@@ -115,12 +115,16 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+     If 'prefix' is supplied, use it instead of sys.prefix or
+     sys.exec_prefix -- i.e., ignore 'plat_specific'.
+     """
++    lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
+     if prefix is None:
+-        prefix = plat_specific and EXEC_PREFIX or PREFIX
++        if plat_specific:
++            prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
++        else:
++            prefix = PREFIX
+ 
+     if os.name == "posix":
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 lib_basename, "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+-- 
+2.8.0.rc3
+
diff --git a/meta/recipes-devtools/python/python3-native_3.5.1.bb b/meta/recipes-devtools/python/python3-native_3.5.1.bb
index 7bad11a..e8d0f9b 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.1.bb
@@ -47,8 +47,6 @@ RPROVIDES += "python3-distutils-native python3-compression-native python3-textut
 EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip"
 
 EXTRA_OEMAKE = '\
-  BUILD_SYS="" \
-  HOST_SYS="" \
   LIBC="" \
   STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
   STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index 8b93c1c..c53ec0c 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,4 +1,4 @@
-From d4dd67daa1555bf13272cc071706338572539bad Mon Sep 17 00:00:00 2001
+From 7630ab22578746d3d790d0598c0d279cf7afed97 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 14 May 2013 15:00:26 -0700
 Subject: [PATCH 01/20] python3: Add target and native recipes
@@ -14,27 +14,14 @@ Upstream-Status: Inappropriate [embedded specific]
 # Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
 
 ---
+ Lib/distutils/sysconfig.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
 diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 573724d..418b478 100644
+index 573724d..390c485 100644
 --- a/Lib/distutils/sysconfig.py
 +++ b/Lib/distutils/sysconfig.py
-@@ -17,10 +17,11 @@ import sys
- from .errors import DistutilsPlatformError
- 
- # These are needed in a couple of spots, so just compute them once.
--PREFIX = os.path.normpath(sys.prefix)
--EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
--BASE_PREFIX = os.path.normpath(sys.base_prefix)
--BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
-+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
-+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
-+BASE_PREFIX = os.path.normpath(sys.base_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
-+BASE_EXEC_PREFIX= os.path.normpath(sys.base_exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
-+
- 
- # Path to the base directory of the project. On Windows the binary may
- # live in project/PCBuild/win32 or project/PCBuild/amd64.
-@@ -84,7 +85,9 @@ def get_python_inc(plat_specific=0, prefix=None):
+@@ -84,7 +84,9 @@ def get_python_inc(plat_specific=0, prefix=None):
      If 'prefix' is supplied, use it instead of sys.base_prefix or
      sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
      """
@@ -45,7 +32,7 @@ index 573724d..418b478 100644
          prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
      if os.name == "posix":
          if python_build:
-@@ -125,6 +128,10 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+@@ -125,6 +127,10 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
      If 'prefix' is supplied, use it instead of sys.base_prefix or
      sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
      """
@@ -56,7 +43,7 @@ index 573724d..418b478 100644
      if prefix is None:
          if standard_lib:
              prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
-@@ -133,7 +140,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+@@ -133,7 +139,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
  
      if os.name == "posix":
          libpython = os.path.join(prefix,
@@ -65,24 +52,6 @@ index 573724d..418b478 100644
          if standard_lib:
              return libpython
          else:
-@@ -233,7 +240,7 @@ def get_config_h_filename():
-     else:
-         inc_dir = get_python_inc(plat_specific=1)
- 
--    return os.path.join(inc_dir, 'pyconfig.h')
-+    return os.path.join(inc_dir, 'pyconfig.h'.replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ))
- 
- 
- def get_makefile_filename():
-@@ -242,7 +249,7 @@ def get_makefile_filename():
-         return os.path.join(_sys_home or project_base, "Makefile")
-     lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
-     config_file = 'config-{}{}'.format(get_python_version(), build_flags)
--    return os.path.join(lib_dir, config_file, 'Makefile')
-+    return os.path.join(lib_dir, config_file, 'Makefile').replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
- 
- 
- def parse_config_h(fp, g=None):
 -- 
-2.7.0
+2.8.0.rc3
 
diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb
index 2fbb3cb..26d05c7 100644
--- a/meta/recipes-devtools/python/python3_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3_3.5.1.bb
@@ -118,7 +118,6 @@ do_compile() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
-		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 		LIB=${baselib} \
 		ARCH=${TARGET_ARCH} \
 		OPT="${CFLAGS}" libpython3.so
@@ -128,7 +127,6 @@ do_compile() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
-		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 		LIB=${baselib} \
 		ARCH=${TARGET_ARCH} \
 		OPT="${CFLAGS}"
@@ -149,7 +147,6 @@ do_install() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
-		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 		LIB=${baselib} \
 		ARCH=${TARGET_ARCH} \
 		DESTDIR=${D} LIBDIR=${libdir}
@@ -159,7 +156,6 @@ do_install() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
-		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 		LIB=${baselib} \
 		ARCH=${TARGET_ARCH} \
 		DESTDIR=${D} LIBDIR=${libdir} install
diff --git a/meta/recipes-devtools/python/python_2.7.11.bb b/meta/recipes-devtools/python/python_2.7.11.bb
index 606f153..7eced2d 100644
--- a/meta/recipes-devtools/python/python_2.7.11.bb
+++ b/meta/recipes-devtools/python/python_2.7.11.bb
@@ -80,7 +80,6 @@ do_compile() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
-		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 		OPT="${CFLAGS}"
 }
 
@@ -100,7 +99,6 @@ do_install() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
-		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 		DESTDIR=${D} LIBDIR=${libdir}
 	
 	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
@@ -109,7 +107,6 @@ do_install() {
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
-		BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 		DESTDIR=${D} LIBDIR=${libdir} install
 
 	install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
diff --git a/meta/recipes-extended/newt/libnewt_0.52.18.bb b/meta/recipes-extended/newt/libnewt_0.52.18.bb
index 9a2964b..b6a9cd4 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.18.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.18.bb
@@ -40,9 +40,6 @@ export STAGING_INCDIR
 export STAGING_LIBDIR
 export CPPFLAGS
 
-export BUILD_SYS
-export HOST_SYS
-
 PACKAGES_prepend = "whiptail "
 
 do_configure_prepend() {
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
index 861af5f..b544f8c 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
@@ -20,8 +20,6 @@ inherit autotools pkgconfig gtk-doc pythonnative qemu gobject-introspection-data
 BBCLASSEXTEND = "native"
 
 # necessary to let the call for python-config from configure.ac succeed
-export BUILD_SYS
-export HOST_SYS
 export STAGING_INCDIR
 export STAGING_LIBDIR
 
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 3d6ffb3..d668300 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -42,8 +42,6 @@ inherit linux-kernel-base kernel-arch pythonnative
 inherit python-dir
 export STAGING_INCDIR
 export STAGING_LIBDIR
-export BUILD_SYS
-export HOST_SYS
 export PYTHON_SITEPACKAGES_DIR
 
 #kernel 3.1+ supports WERROR to disable warnings as errors
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 02/45] distutils-native-base.bbclass, distutils3-native-base.bbclass: remove
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 01/45] python-native, python3-native: remove the use of exported HOST_SYS and BUILD_SYS variables Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 03/45] python3-dir.bbclass: add a separate class for Python 3 Alexander Kanavin
                   ` (44 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

These classes do not seem to be used by anything.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/classes/distutils-native-base.bbclass  | 3 ---
 meta/classes/distutils3-native-base.bbclass | 4 ----
 2 files changed, 7 deletions(-)
 delete mode 100644 meta/classes/distutils-native-base.bbclass
 delete mode 100644 meta/classes/distutils3-native-base.bbclass

diff --git a/meta/classes/distutils-native-base.bbclass b/meta/classes/distutils-native-base.bbclass
deleted file mode 100644
index 509cb95..0000000
--- a/meta/classes/distutils-native-base.bbclass
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit distutils-common-base
-
-DEPENDS  += "${@["${PYTHON_PN}-native", ""][(d.getVar('PACKAGES', True) == '')]}"
diff --git a/meta/classes/distutils3-native-base.bbclass b/meta/classes/distutils3-native-base.bbclass
deleted file mode 100644
index db9a1a7..0000000
--- a/meta/classes/distutils3-native-base.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-PYTHON_BASEVERSION = "3.5"
-PYTHON_ABI = "m"
-
-inherit distutils-native-base
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 03/45] python3-dir.bbclass: add a separate class for Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 01/45] python-native, python3-native: remove the use of exported HOST_SYS and BUILD_SYS variables Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 02/45] distutils-native-base.bbclass, distutils3-native-base.bbclass: remove Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 04/45] default-versions.inc: drop python-related defaults Alexander Kanavin
                   ` (43 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

This is much cleaner than sharing python-dir.bbclass between python 2
and 3 classes, and doing confusing overrides in them.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/classes/distutils-common-base.bbclass | 2 --
 meta/classes/distutils3-base.bbclass       | 3 ---
 meta/classes/python-dir.bbclass            | 6 +++---
 meta/classes/python3-dir.bbclass           | 5 +++++
 meta/classes/python3native.bbclass         | 4 +---
 5 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 meta/classes/python3-dir.bbclass

diff --git a/meta/classes/distutils-common-base.bbclass b/meta/classes/distutils-common-base.bbclass
index 08511f5..dee06b4 100644
--- a/meta/classes/distutils-common-base.bbclass
+++ b/meta/classes/distutils-common-base.bbclass
@@ -1,5 +1,3 @@
-inherit python-dir
-
 EXTRA_OEMAKE = ""
 
 export STAGING_INCDIR
diff --git a/meta/classes/distutils3-base.bbclass b/meta/classes/distutils3-base.bbclass
index 2a093d3a..82ab6a3 100644
--- a/meta/classes/distutils3-base.bbclass
+++ b/meta/classes/distutils3-base.bbclass
@@ -1,8 +1,5 @@
 DEPENDS  += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES', True) == '')]}"
 RDEPENDS_${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}"
 
-PYTHON_BASEVERSION = "3.5"
-PYTHON_ABI = "m"
-
 inherit distutils-common-base python3native
 
diff --git a/meta/classes/python-dir.bbclass b/meta/classes/python-dir.bbclass
index ebfa4b3..a11dc35 100644
--- a/meta/classes/python-dir.bbclass
+++ b/meta/classes/python-dir.bbclass
@@ -1,5 +1,5 @@
-PYTHON_BASEVERSION ?= "2.7"
-PYTHON_ABI ?= ""
+PYTHON_BASEVERSION = "2.7"
+PYTHON_ABI = ""
 PYTHON_DIR = "python${PYTHON_BASEVERSION}"
-PYTHON_PN = "python${@'' if '${PYTHON_BASEVERSION}'.startswith('2') else '3'}"
+PYTHON_PN = "python"
 PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/meta/classes/python3-dir.bbclass b/meta/classes/python3-dir.bbclass
new file mode 100644
index 0000000..06bb046
--- /dev/null
+++ b/meta/classes/python3-dir.bbclass
@@ -0,0 +1,5 @@
+PYTHON_BASEVERSION = "3.5"
+PYTHON_ABI = "m"
+PYTHON_DIR = "python${PYTHON_BASEVERSION}"
+PYTHON_PN = "python3"
+PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/meta/classes/python3native.bbclass b/meta/classes/python3native.bbclass
index 8ec6b76..1899863 100644
--- a/meta/classes/python3native.bbclass
+++ b/meta/classes/python3native.bbclass
@@ -1,6 +1,4 @@
-PYTHON_BASEVERSION = "3.5"
-
-inherit python-dir
+inherit python3-dir
 
 PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
 EXTRANATIVEPATH += "${PYTHON_PN}-native"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 04/45] default-versions.inc: drop python-related defaults
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (2 preceding siblings ...)
  2016-05-24 11:53 ` [PATCH 03/45] python3-dir.bbclass: add a separate class for Python 3 Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 05/45] sip.bbclass: remove Alexander Kanavin
                   ` (42 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

There is only one version of python 2.x provided, so no need
to set a preferred version.
PYTHON_BASEVERSION is now set explicitly in python-dir.bbclass and
python3-dir.bbclass, so fix up a few recipes that relied on it being
set in default-versions.inc without inheriting python-dir.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/conf/distro/include/default-versions.inc | 5 -----
 meta/recipes-devtools/rpm/rpm_5.4+cvs.bb      | 2 +-
 meta/recipes-devtools/rpm/rpm_5.4.16.bb       | 2 +-
 meta/recipes-kernel/lttng/lttng-tools_git.bb  | 2 +-
 meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb  | 1 +
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index a04ea71..cc8c533 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -2,11 +2,6 @@
 # Default preferred versions
 #
 
-# Force the python versions in one place
-PYTHON_BASEVERSION ?= "2.7"
-PREFERRED_VERSION_python ?= "2.7.11"
-PREFERRED_VERSION_python-native ?= "2.7.11"
-
 # Force the older version of liberation-fonts until we fix the fontforge issue
 PREFERRED_VERSION_liberation-fonts ?= "1.04"
 
diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
index 0991f6d..625d75e 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
@@ -156,7 +156,7 @@ SRC_URI_append_libc-musl = "\
 # to process certain package feeds.
 #SRC_URI += "file://rpm-debug-platform.patch"
 
-inherit autotools gettext
+inherit autotools gettext python-dir
 
 acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
 
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 7ebd5e9..3adb29c 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -165,7 +165,7 @@ SRC_URI_append_libc-musl = "\
 
 UPSTREAM_CHECK_REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$"
 
-inherit autotools gettext
+inherit autotools gettext python-dir
 
 acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
 
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index 3ce4a9e..8ef267c 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -35,7 +35,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
 
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep ptest pkgconfig useradd
+inherit autotools-brokensep ptest pkgconfig useradd python-dir
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "tracing"
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
index 962069e..025eb63 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
+++ b/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
@@ -6,6 +6,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 require rt-tests.inc
+inherit python-dir
 
 EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages"
 
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 05/45] sip.bbclass: remove
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (3 preceding siblings ...)
  2016-05-24 11:53 ` [PATCH 04/45] default-versions.inc: drop python-related defaults Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 16:35   ` Philip Balister
  2016-05-24 11:53 ` [PATCH 06/45] avahi-ui: remove support for building a python module Alexander Kanavin
                   ` (41 subsequent siblings)
  46 siblings, 1 reply; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

Nothing is requiring it in oe-core or meta-oe.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/classes/sip.bbclass | 61 ------------------------------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 meta/classes/sip.bbclass

diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
deleted file mode 100644
index 6ed2a13..0000000
--- a/meta/classes/sip.bbclass
+++ /dev/null
@@ -1,61 +0,0 @@
-# Build Class for Sip based Python Bindings
-# (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
-#
-STAGING_SIPDIR ?= "${STAGING_DATADIR_NATIVE}/sip"
-
-DEPENDS  =+ "sip-native"
-RDEPENDS_${PN} += "python-sip"
-
-# default stuff, do not uncomment
-# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
-
-# do_generate is before do_configure so ensure that sip_native is populated in sysroot before executing it
-do_generate[depends] += "sip-native:do_populate_sysroot"
-
-sip_do_generate() {
-	if [ -z "${SIP_MODULES}" ]; then 
-		MODULES="`ls sip/*mod.sip`"
-	else
-		MODULES="${SIP_MODULES}"
-	fi
-
-	if [ -z "$MODULES" ]; then
-		die "SIP_MODULES not set and no modules found in $PWD"
-        else
-		bbnote "using modules '${SIP_MODULES}' and tags '${EXTRA_SIPTAGS}'"
-	fi
-
-	if [ -z "${EXTRA_SIPTAGS}" ]; then
-		die "EXTRA_SIPTAGS needs to be set!"
-	else
-		SIPTAGS="${EXTRA_SIPTAGS}"
-	fi
-
-	if [ ! -z "${SIP_FEATURES}" ]; then
-		FEATURES="-z ${SIP_FEATURES}"
-		bbnote "sip feature file: ${SIP_FEATURES}"
-	fi
-
-	for module in $MODULES
-	do
-		install -d ${module}/
-		echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
-		sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
-			sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
-		sed -e 's,target,TARGET,' -e 's,sources,SOURCES,' -e 's,headers,HEADERS,' \
-			${module}/${module}.sbf | sed s,"moc_HEADERS =","HEADERS +=", \
-			>${module}/${module}.pro
-		echo "TEMPLATE=lib" >>${module}/${module}.pro
-		[ "${module}" = "qt" ] 		&& echo "" 		>>${module}/${module}.pro
-		[ "${module}" = "qtcanvas" ] 	&& echo ""		>>${module}/${module}.pro
-		[ "${module}" = "qttable" ] 	&& echo ""		>>${module}/${module}.pro
-		[ "${module}" = "qwt" ] 	&& echo ""		>>${module}/${module}.pro
-		[ "${module}" = "qtpe" ]        && echo ""		>>${module}/${module}.pro
-		[ "${module}" = "qtpe" ]        && echo "LIBS+=-lqpe"	>>${module}/${module}.pro
-		true
-	done
-}
-
-EXPORT_FUNCTIONS do_generate
-
-addtask generate after do_unpack do_patch before do_configure
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 06/45] avahi-ui: remove support for building a python module
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (4 preceding siblings ...)
  2016-05-24 11:53 ` [PATCH 05/45] sip.bbclass: remove Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 07/45] bind: switch Python dependency to Python 3.x Alexander Kanavin
                   ` (40 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

It's not used by anything and hasn't been ported to Python 3.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
index 3966b4c..1b3e918 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
@@ -6,12 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 require avahi.inc
 
-inherit python-dir pythonnative distro_features_check
+inherit distro_features_check
 ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
 
-PACKAGECONFIG ??= "dbus python"
-PACKAGECONFIG[python] = "--enable-python,--disable-python,python-native python"
-
 SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
 SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
 
@@ -21,7 +18,7 @@ AVAHI_GTK = "--enable-gtk --disable-gtk3 --disable-pygtk"
 
 S = "${WORKDIR}/avahi-${PV}"
 
-PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc python-avahi avahi-discover"
+PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc avahi-discover"
 
 FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
 FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}"
@@ -29,15 +26,11 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a"
 
 FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
 
-FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi ${PYTHON_SITEPACKAGES_DIR}/avahi_discover"
 FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
                         ${datadir}/avahi/interfaces/avahi-discover* \
                         ${bindir}/avahi-discover-standalone \
                         ${datadir}/avahi/interfaces/avahi-discover.glade"
 
-RDEPENDS_python-avahi = "python-core python-dbus"
-
-
 do_install_append () {
 	rm ${D}${sysconfdir} -rf
 	rm ${D}${base_libdir} -rf
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 07/45] bind: switch Python dependency to Python 3.x
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (5 preceding siblings ...)
  2016-05-24 11:53 ` [PATCH 06/45] avahi-ui: remove support for building a python module Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 08/45] python-dbus: update to 1.2.4, port to python 3 Alexander Kanavin
                   ` (39 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-connectivity/bind/bind_9.10.3-P3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb b/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
index 1e3a20f..a99f0dd 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
@@ -56,7 +56,7 @@ SYSTEMD_SERVICE_${PN} = "named.service"
 
 PARALLEL_MAKE = ""
 
-RDEPENDS_${PN} = "python-core"
+RDEPENDS_${PN} = "python3-core"
 RDEPENDS_${PN}-dev = ""
 
 PACKAGE_BEFORE_PN += "${PN}-utils"
@@ -81,7 +81,7 @@ do_install_append() {
 	install -d "${D}${sysconfdir}/init.d"
 	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
 	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
-	sed -i -e '1s,#!.*python,#! /usr/bin/env python,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
+	sed -i -e '1s,#!.*python,#! /usr/bin/python3,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 08/45] python-dbus: update to 1.2.4, port to python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (6 preceding siblings ...)
  2016-05-24 11:53 ` [PATCH 07/45] bind: switch Python dependency to Python 3.x Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 11:53 ` [PATCH 09/45] python3: manipulate all of the config*/Makefile files, not just config/Makefile Alexander Kanavin
                   ` (38 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{python-dbus_1.2.0.bb => python3-dbus_1.2.4.bb}       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/python/{python-dbus_1.2.0.bb => python3-dbus_1.2.4.bb} (62%)

diff --git a/meta/recipes-devtools/python/python-dbus_1.2.0.bb b/meta/recipes-devtools/python/python3-dbus_1.2.4.bb
similarity index 62%
rename from meta/recipes-devtools/python/python-dbus_1.2.0.bb
rename to meta/recipes-devtools/python/python3-dbus_1.2.4.bb
index ccdb9ae..c058caf 100644
--- a/meta/recipes-devtools/python/python-dbus_1.2.0.bb
+++ b/meta/recipes-devtools/python/python3-dbus_1.2.4.bb
@@ -3,24 +3,25 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0b83047ce9e948b67c0facc5f233476a"
-DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
+DEPENDS = "expat dbus dbus-glib virtual/libintl"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
 "
 
-SRC_URI[md5sum] = "b09cd2d1a057cc432ce944de3fc06bf7"
-SRC_URI[sha256sum] = "e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df"
+SRC_URI[md5sum] = "7372a588c83a7232b4e08159bfd48fe5"
+SRC_URI[sha256sum] = "e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc"
 S = "${WORKDIR}/dbus-python-${PV}"
 
-inherit distutils-base autotools pkgconfig
+inherit distutils3-base autotools pkgconfig
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python-docutils-native"
 PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python-docutils-native python-epydoc-native"
 
-export STAGING_LIBDIR
-export STAGING_INCDIR
+do_configure_prepend() {
+    export PYTHON=${PYTHON}
+}
 
-RDEPENDS_${PN} = "python-io python-logging python-stringold python-threading python-xml"
+RDEPENDS_${PN} = "python3-io python3-logging python3-stringold python3-threading python3-xml"
 
 FILES_${PN}-dev += "${libdir}/pkgconfig"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 09/45] python3: manipulate all of the config*/Makefile files, not just config/Makefile
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (7 preceding siblings ...)
  2016-05-24 11:53 ` [PATCH 08/45] python-dbus: update to 1.2.4, port to python 3 Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 12:50   ` Martin Jansa
  2016-05-24 11:53 ` [PATCH 10/45] python3: drop 110-enable-zlib.patch Alexander Kanavin
                   ` (37 subsequent siblings)
  46 siblings, 1 reply; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/python/python3_3.5.1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb
index 26d05c7..1c8fe2f 100644
--- a/meta/recipes-devtools/python/python3_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3_3.5.1.bb
@@ -164,6 +164,7 @@ do_install() {
 	rm -f ${D}/${bindir}/2to3
 
 	install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
+	install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile
 
 	if [ -e ${WORKDIR}/sitecustomize.py ]; then
 		install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
@@ -182,9 +183,11 @@ PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess"
 py_package_preprocess () {
 	# copy back the old Makefile to fix target package
 	install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
+	install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile
 	# Remove references to buildmachine paths in target Makefile and _sysconfigdata
 	sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
 		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \
+		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile \
 		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py
 }
 
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 10/45] python3: drop 110-enable-zlib.patch
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (8 preceding siblings ...)
  2016-05-24 11:53 ` [PATCH 09/45] python3: manipulate all of the config*/Makefile files, not just config/Makefile Alexander Kanavin
@ 2016-05-24 11:53 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 11/45] glib: move to Python 3 Alexander Kanavin
                   ` (36 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:53 UTC (permalink / raw)
  To: openembedded-core

With the patch, python (incorrectly) builds zlib module against external zlib.
Without the patch, it's using own internal copy of zlib.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../recipes-devtools/python/python3-native_3.5.1.bb |  1 -
 .../python/python3/110-enable-zlib.patch            | 21 ---------------------
 meta/recipes-devtools/python/python3_3.5.1.bb       |  1 -
 3 files changed, 23 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3/110-enable-zlib.patch

diff --git a/meta/recipes-devtools/python/python3-native_3.5.1.bb b/meta/recipes-devtools/python/python3-native_3.5.1.bb
index e8d0f9b..126935b 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.1.bb
@@ -12,7 +12,6 @@ file://020-dont-compile-python-files.patch \
 file://030-fixup-include-dirs.patch \
 file://070-dont-clean-ipkg-install.patch \
 file://080-distutils-dont_adjust_files.patch \
-file://110-enable-zlib.patch \
 file://130-readline-setup.patch \
 file://150-fix-setupterm.patch \
 file://python-3.3-multilib.patch \
diff --git a/meta/recipes-devtools/python/python3/110-enable-zlib.patch b/meta/recipes-devtools/python/python3/110-enable-zlib.patch
deleted file mode 100644
index fb92a19..0000000
--- a/meta/recipes-devtools/python/python3/110-enable-zlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable zlib in python
-
--Khem
-
-Upstream-Status: Inappropriate [OE-Specific]
-
----
- Modules/Setup.dist |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Modules/Setup.dist
-+++ b/Modules/Setup.dist
-@@ -354,7 +354,7 @@ _symtable symtablemodule.c
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -lz
- 
- # Interface to the Expat XML parser
- #
diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb
index 1c8fe2f..bbb54f6 100644
--- a/meta/recipes-devtools/python/python3_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3_3.5.1.bb
@@ -13,7 +13,6 @@ file://020-dont-compile-python-files.patch \
 file://030-fixup-include-dirs.patch \
 file://070-dont-clean-ipkg-install.patch \
 file://080-distutils-dont_adjust_files.patch \
-file://110-enable-zlib.patch \
 file://130-readline-setup.patch \
 file://150-fix-setupterm.patch \
 file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 11/45] glib: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (9 preceding siblings ...)
  2016-05-24 11:53 ` [PATCH 10/45] python3: drop 110-enable-zlib.patch Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 12/45] dbus-test: remove unneeded pygobject dependency Alexander Kanavin
                   ` (35 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Drop python-pygobject and python-dbus dependencies, because nothing in
ptests depends on them, and it creates a circular dependency chain.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index ddf5e40..1da0bfd 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -17,13 +17,16 @@ SECTION = "libs"
 
 BBCLASSEXTEND = "native nativesdk"
 
-DEPENDS = "virtual/libiconv libffi zlib glib-2.0-native"
+DEPENDS = "virtual/libiconv libffi zlib glib-2.0-native python3"
 DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' dbus', '', d)}"
 DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native"
 DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib glib-2.0-native"
 
 PACKAGES += "${PN}-codegen ${PN}-utils"
 
+RDEPENDS_${PN}-codegen += "python3-core"
+RDEPENDS_${PN}-utils += "python3-core"
+
 LEAD_SONAME = "libglib-2.0.*"
 
 inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache
@@ -44,7 +47,7 @@ EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
 EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"
 
 do_configure_prepend() {
-	sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
+	sed -i -e '1s,#!.*,#!${USRBINPATH}/python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
 }
 
 FILES_${PN} = "${libdir}/lib*${SOLIBS} \
@@ -73,7 +76,7 @@ USE_NLS = "yes"
 
 do_install_append () {
 	if [ -f ${D}${bindir}/gtester-report ]; then
-		sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python|'
+		sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/python3|'
 	fi
 
 	# Remove some unpackaged files
@@ -109,8 +112,6 @@ RDEPENDS_${PN}-ptest += "\
             tzdata-asia \
             tzdata-europe \
             tzdata-posix \
-            python-pygobject \
-            python-dbus \
             shared-mime-info \
            "
 
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 12/45] dbus-test: remove unneeded pygobject dependency
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (10 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 11/45] glib: move to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 13/45] python-pygobject: port to Python 3 Alexander Kanavin
                   ` (34 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-core/dbus/dbus-test_1.10.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/dbus/dbus-test_1.10.6.bb b/meta/recipes-core/dbus/dbus-test_1.10.6.bb
index 3748fe6..af99976 100644
--- a/meta/recipes-core/dbus/dbus-test_1.10.6.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.10.6.bb
@@ -5,7 +5,7 @@ LICENSE = "AFL-2 | GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
                     file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
 
-DEPENDS = "python-pygobject dbus"
+DEPENDS = "dbus glib-2.0"
 
 RDEPENDS_${PN} += "make"
 RDEPENDS_${PN}-dev = ""
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 13/45] python-pygobject: port to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (11 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 12/45] dbus-test: remove unneeded pygobject dependency Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 14/45] neard: do not package python test scripts Alexander Kanavin
                   ` (33 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

This reverts commit 7f7c9ab29eba0e58916629ca13dc4a494535ce19.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch | 0
 .../{python-pygobject_3.18.2.bb => python3-pygobject_3.18.2.bb}   | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python-pygobject => python3-pygobject}/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch (100%)
 rename meta/recipes-devtools/python/{python-pygobject_3.18.2.bb => python3-pygobject_3.18.2.bb} (72%)

diff --git a/meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
similarity index 100%
rename from meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
rename to meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
diff --git a/meta/recipes-devtools/python/python-pygobject_3.18.2.bb b/meta/recipes-devtools/python/python3-pygobject_3.18.2.bb
similarity index 72%
rename from meta/recipes-devtools/python/python-pygobject_3.18.2.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.18.2.bb
index 00c5079..4ddae81 100644
--- a/meta/recipes-devtools/python/python-pygobject_3.18.2.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.18.2.bb
@@ -3,9 +3,9 @@ SECTION = "devel/python"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 
-inherit autotools pkgconfig gnomebase distutils-base gobject-introspection
+inherit autotools pkgconfig gnomebase distutils3-base gobject-introspection
 
-DEPENDS += "python glib-2.0"
+DEPENDS += "python3 glib-2.0"
 
 SRCNAME="pygobject"
 SRC_URI = " \
@@ -20,6 +20,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 BBCLASSEXTEND = "native"
 
-EXTRA_OECONF = "--disable-cairo --with-python=python2.7"
+EXTRA_OECONF = "--disable-cairo"
 
-RDEPENDS_${PN} += "python-setuptools python-importlib"
+RDEPENDS_${PN} += "python3-setuptools python3-importlib"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 14/45] neard: do not package python test scripts
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (12 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 13/45] python-pygobject: port to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 15/45] bluez5: switch to Python 3 Alexander Kanavin
                   ` (32 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

They require python-dbus and python-gobject
(which are only provided for Python 3), and have not
been ported to Python 3.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-connectivity/neard/neard_0.15.bb | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb
index 93bddb3..065cbec 100644
--- a/meta/recipes-connectivity/neard/neard_0.15.bb
+++ b/meta/recipes-connectivity/neard/neard_0.15.bb
@@ -33,18 +33,9 @@ do_install_append() {
 		  > ${D}${sysconfdir}/init.d/neard
 		chmod 0755 ${D}${sysconfdir}/init.d/neard
 	fi
-
-	# Install the tests for neard-tests
-	install -d ${D}${libdir}/neard
-	install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
-	install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
 }
 
-PACKAGES =+ "${PN}-tests"
-
-FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
-
-RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
+RDEPENDS_${PN} = "dbus"
 
 # Bluez & Wifi are not mandatory except for handover
 RRECOMMENDS_${PN} = "\
@@ -52,8 +43,6 @@ RRECOMMENDS_${PN} = "\
                      ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
                     "
 
-RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
-
 INITSCRIPT_NAME = "neard"
 INITSCRIPT_PARAMS = "defaults 64"
 
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 15/45] bluez5: switch to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (13 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 14/45] neard: do not package python test scripts Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 16/45] connman: do not install Python test scripts Alexander Kanavin
                   ` (31 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index b3cd8ed..92e360a 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -69,6 +69,10 @@ do_install_append() {
         for f in ${NOINST_TOOLS} ; do
 	    install -m 755 ${B}/$f ${D}/${bindir}
 	done
+
+        # Patch python tools to use Python 3; they should be source compatible, but
+        # still refer to Python 2 in the shebang
+        sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
 }
 
 ALLOW_EMPTY_libasound-module-bluez = "1"
@@ -99,7 +103,7 @@ def get_noinst_tools_paths (d, bb, tools):
 
 FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}"
 
-RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
+RDEPENDS_${PN}-testtools += "python3 python3-dbus python3-pygobject"
 
 SYSTEMD_SERVICE_${PN} = "bluetooth.service"
 INITSCRIPT_PACKAGES = "${PN}"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 16/45] connman: do not install Python test scripts
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (14 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 15/45] bluez5: switch to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 17/45] ofono: drop the custom-made revert to Python 2 from Python 3 Alexander Kanavin
                   ` (30 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

They are not compatible with python 3, and require python-dbus
and python-gobject (which are provided only for Python 3).

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-connectivity/connman/connman.inc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index c375251..f09a2de 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -26,7 +26,6 @@ EXTRA_OECONF += "\
     --enable-loopback \
     --enable-ethernet \
     --enable-tools \
-    --enable-test \
     --disable-polkit \
     --enable-client \
 "
@@ -140,10 +139,7 @@ PACKAGES =+ "${PN}-tools ${PN}-tests ${PN}-client"
 FILES_${PN}-tools = "${bindir}/wispr"
 RDEPENDS_${PN}-tools ="${PN}"
 
-FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${BPN}/test/*"
-RDEPENDS_${PN}-tests = "python-dbus python-pygobject python-textutils python-subprocess python-fcntl python-netclient \
-                        ${PN} \
-"
+FILES_${PN}-tests = "${bindir}/*-test"
 
 FILES_${PN}-client = "${bindir}/connmanctl"
 RDEPENDS_${PN}-client ="${PN}"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 17/45] ofono: drop the custom-made revert to Python 2 from Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (15 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 16/45] connman: do not install Python test scripts Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 18/45] packagegroup-core-full-cmdline: drop python-dbus from the list of services Alexander Kanavin
                   ` (29 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-connectivity/ofono/ofono.inc          |    6 +-
 .../ofono/Revert-test-Convert-to-Python-3.patch    | 1270 --------------------
 meta/recipes-connectivity/ofono/ofono_1.17.bb      |    1 -
 3 files changed, 5 insertions(+), 1272 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index c415a39..72bbcac 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -26,6 +26,10 @@ SYSTEMD_SERVICE_${PN} = "ofono.service"
 do_install_append() {
   install -d ${D}${sysconfdir}/init.d/
   install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
+
+  # Ofono still has one test tool that refers to Python 2 in the shebang
+  sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/ofono/test/set-ddr
+
 }
 
 PACKAGES =+ "${PN}-tests"
@@ -34,4 +38,4 @@ RDEPENDS_${PN} += "dbus"
 
 FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
 FILES_${PN}-tests = "${libdir}/${BPN}/test"
-RDEPENDS_${PN}-tests = "python python-pygobject python-dbus"
+RDEPENDS_${PN}-tests = "python3 python3-pygobject python3-dbus"
diff --git a/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch b/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch
deleted file mode 100644
index 5f8ca77..0000000
--- a/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch
+++ /dev/null
@@ -1,1270 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-From 572fc23f6efd65a2ef9e6c957b2506108738672b Mon Sep 17 00:00:00 2001
-From: Cristian Iorga <cristian.iorga@intel.com>
-Date: Mon, 25 Aug 2014 16:59:39 +0300
-Subject: [PATCH] Revert "test: Convert to Python 3"
-
-This reverts commit c027ab9fbc1a8e8c9e76bcd123df1ad7696307c2.
----
- test/activate-context          |  2 +-
- test/answer-calls              |  2 +-
- test/backtrace                 |  2 +-
- test/cancel-ussd               |  2 +-
- test/cdma-connman-disable      |  2 +-
- test/cdma-connman-enable       |  2 +-
- test/cdma-dial-number          |  2 +-
- test/cdma-hangup               |  2 +-
- test/cdma-list-call            |  2 +-
- test/cdma-set-credentials      |  2 +-
- test/change-pin                |  2 +-
- test/create-internet-context   |  2 +-
- test/create-mms-context        |  2 +-
- test/create-multiparty         |  2 +-
- test/deactivate-all            |  2 +-
- test/deactivate-context        |  2 +-
- test/dial-number               |  2 +-
- test/disable-call-forwarding   |  2 +-
- test/disable-gprs              |  2 +-
- test/disable-modem             |  2 +-
- test/display-icon              |  2 +-
- test/enable-cbs                |  2 +-
- test/enable-gprs               |  2 +-
- test/enable-modem              |  2 +-
- test/enter-pin                 |  2 +-
- test/get-icon                  |  2 +-
- test/get-operators             |  2 +-
- test/get-tech-preference       |  2 +-
- test/hangup-active             |  2 +-
- test/hangup-all                |  2 +-
- test/hangup-call               |  2 +-
- test/hangup-multiparty         |  2 +-
- test/hold-and-answer           |  2 +-
- test/initiate-ussd             |  4 ++--
- test/list-calls                |  2 +-
- test/list-contexts             |  2 +-
- test/list-messages             |  2 +-
- test/list-modems               |  2 +-
- test/list-operators            |  2 +-
- test/lock-pin                  |  2 +-
- test/lockdown-modem            |  2 +-
- test/monitor-ofono             |  4 ++--
- test/offline-modem             |  2 +-
- test/online-modem              |  2 +-
- test/private-chat              |  2 +-
- test/process-context-settings  |  2 +-
- test/receive-sms               |  2 +-
- test/reject-calls              |  2 +-
- test/release-and-answer        |  2 +-
- test/release-and-swap          |  2 +-
- test/remove-contexts           |  2 +-
- test/reset-pin                 |  2 +-
- test/scan-for-operators        |  2 +-
- test/send-sms                  |  2 +-
- test/send-ussd                 |  4 ++--
- test/send-vcal                 |  2 +-
- test/send-vcard                |  2 +-
- test/set-call-forwarding       |  2 +-
- test/set-cbs-topics            |  2 +-
- test/set-context-property      |  2 +-
- test/set-fast-dormancy         |  2 +-
- test/set-gsm-band              |  2 +-
- test/set-mic-volume            |  2 +-
- test/set-mms-details           |  2 +-
- test/set-msisdn                |  2 +-
- test/set-roaming-allowed       |  2 +-
- test/set-speaker-volume        |  2 +-
- test/set-tech-preference       |  2 +-
- test/set-tty                   |  2 +-
- test/set-umts-band             |  2 +-
- test/set-use-sms-reports       |  2 +-
- test/swap-calls                |  2 +-
- test/test-advice-of-charge     |  2 +-
- test/test-call-barring         |  2 +-
- test/test-call-forwarding      |  2 +-
- test/test-call-settings        |  2 +-
- test/test-cbs                  |  4 ++--
- test/test-gnss                 |  4 ++--
- test/test-message-waiting      |  2 +-
- test/test-modem                |  2 +-
- test/test-network-registration |  2 +-
- test/test-phonebook            |  2 +-
- test/test-push-notification    |  2 +-
- test/test-smart-messaging      |  2 +-
- test/test-sms                  | 18 +++++++++---------
- test/test-ss                   |  2 +-
- test/test-ss-control-cb        |  2 +-
- test/test-ss-control-cf        |  2 +-
- test/test-ss-control-cs        |  2 +-
- test/test-stk-menu             | 34 +++++++++++++++++-----------------
- test/unlock-pin                |  2 +-
- 94 files changed, 124 insertions(+), 124 deletions(-)
-
-diff --git a/test/activate-context b/test/activate-context
-index e4fc702..4241396 100755
---- a/test/activate-context
-+++ b/test/activate-context
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/answer-calls b/test/answer-calls
-index daa794b..45ff08f 100755
---- a/test/answer-calls
-+++ b/test/answer-calls
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- 
-diff --git a/test/backtrace b/test/backtrace
-index 03c7632..c624709 100755
---- a/test/backtrace
-+++ b/test/backtrace
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import os
- import re
-diff --git a/test/cancel-ussd b/test/cancel-ussd
-index e7559ba..1797f26 100755
---- a/test/cancel-ussd
-+++ b/test/cancel-ussd
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/cdma-connman-disable b/test/cdma-connman-disable
-index 3adc14d..0ddc0cd 100755
---- a/test/cdma-connman-disable
-+++ b/test/cdma-connman-disable
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/cdma-connman-enable b/test/cdma-connman-enable
-index ac16a2d..a3cca01 100755
---- a/test/cdma-connman-enable
-+++ b/test/cdma-connman-enable
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/cdma-dial-number b/test/cdma-dial-number
-index 683431e..9cdfb24 100755
---- a/test/cdma-dial-number
-+++ b/test/cdma-dial-number
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/cdma-hangup b/test/cdma-hangup
-index 41ffa60..493ece4 100755
---- a/test/cdma-hangup
-+++ b/test/cdma-hangup
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/cdma-list-call b/test/cdma-list-call
-index b132353..5d36a69 100755
---- a/test/cdma-list-call
-+++ b/test/cdma-list-call
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- 
-diff --git a/test/cdma-set-credentials b/test/cdma-set-credentials
-index a60c86e..a286b0e 100755
---- a/test/cdma-set-credentials
-+++ b/test/cdma-set-credentials
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/change-pin b/test/change-pin
-index 301c6ce..000ce53 100755
---- a/test/change-pin
-+++ b/test/change-pin
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/create-internet-context b/test/create-internet-context
-index 1089053..efd0998 100755
---- a/test/create-internet-context
-+++ b/test/create-internet-context
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/create-mms-context b/test/create-mms-context
-index 598336f..e5be08d 100755
---- a/test/create-mms-context
-+++ b/test/create-mms-context
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/create-multiparty b/test/create-multiparty
-index 1b76010..97047c3 100755
---- a/test/create-multiparty
-+++ b/test/create-multiparty
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/deactivate-all b/test/deactivate-all
-index 5aa8587..427009e 100755
---- a/test/deactivate-all
-+++ b/test/deactivate-all
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/deactivate-context b/test/deactivate-context
-index 5c86a71..df47d2e 100755
---- a/test/deactivate-context
-+++ b/test/deactivate-context
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/dial-number b/test/dial-number
-index fe5adad..ee674d9 100755
---- a/test/dial-number
-+++ b/test/dial-number
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/disable-call-forwarding b/test/disable-call-forwarding
-index 811e4fa..3609816 100755
---- a/test/disable-call-forwarding
-+++ b/test/disable-call-forwarding
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- from gi.repository import GLib
-diff --git a/test/disable-gprs b/test/disable-gprs
-index 61ce216..c6c40a5 100755
---- a/test/disable-gprs
-+++ b/test/disable-gprs
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/disable-modem b/test/disable-modem
-index 6fba857..ca8c8d8 100755
---- a/test/disable-modem
-+++ b/test/disable-modem
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/display-icon b/test/display-icon
-index ac40818..753d14d 100755
---- a/test/display-icon
-+++ b/test/display-icon
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/enable-cbs b/test/enable-cbs
-index 4a8bf66..c08bf2b 100755
---- a/test/enable-cbs
-+++ b/test/enable-cbs
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/enable-gprs b/test/enable-gprs
-index 68d5ef0..8664891 100755
---- a/test/enable-gprs
-+++ b/test/enable-gprs
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/enable-modem b/test/enable-modem
-index fc5958a..dfaaaa8 100755
---- a/test/enable-modem
-+++ b/test/enable-modem
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/enter-pin b/test/enter-pin
-index 9556363..c6ee669 100755
---- a/test/enter-pin
-+++ b/test/enter-pin
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/get-icon b/test/get-icon
-index 5569a33..fdaaee7 100755
---- a/test/get-icon
-+++ b/test/get-icon
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/get-operators b/test/get-operators
-index 0f35c80..62354c5 100755
---- a/test/get-operators
-+++ b/test/get-operators
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/get-tech-preference b/test/get-tech-preference
-index 7ba6365..77d20d0 100755
---- a/test/get-tech-preference
-+++ b/test/get-tech-preference
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus, sys
- 
-diff --git a/test/hangup-active b/test/hangup-active
-index 82e0eb0..5af62ab 100755
---- a/test/hangup-active
-+++ b/test/hangup-active
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/hangup-all b/test/hangup-all
-index 3a0138d..32933db 100755
---- a/test/hangup-all
-+++ b/test/hangup-all
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/hangup-call b/test/hangup-call
-index 5a2de20..447020c 100755
---- a/test/hangup-call
-+++ b/test/hangup-call
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/hangup-multiparty b/test/hangup-multiparty
-index 24751c3..48fe342 100755
---- a/test/hangup-multiparty
-+++ b/test/hangup-multiparty
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/hold-and-answer b/test/hold-and-answer
-index da3be57..2c47e27 100755
---- a/test/hold-and-answer
-+++ b/test/hold-and-answer
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/initiate-ussd b/test/initiate-ussd
-index faf50d0..d7022f1 100755
---- a/test/initiate-ussd
-+++ b/test/initiate-ussd
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-@@ -45,7 +45,7 @@ if state == "idle":
- print("State: %s" % (state))
- 
- while state == "user-response":
--	response = input("Enter response: ")
-+	response = raw_input("Enter response: ")
- 
- 	result = ussd.Respond(response, timeout=100)
- 
-diff --git a/test/list-calls b/test/list-calls
-index f3ee991..08668c6 100755
---- a/test/list-calls
-+++ b/test/list-calls
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- 
-diff --git a/test/list-contexts b/test/list-contexts
-index 78278ca..f0d4094 100755
---- a/test/list-contexts
-+++ b/test/list-contexts
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- 
-diff --git a/test/list-messages b/test/list-messages
-index 9f5bce3..cfccbea 100755
---- a/test/list-messages
-+++ b/test/list-messages
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- 
-diff --git a/test/list-modems b/test/list-modems
-index b9f510a..ed66124 100755
---- a/test/list-modems
-+++ b/test/list-modems
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- 
-diff --git a/test/list-operators b/test/list-operators
-index 064c4e3..349bf41 100755
---- a/test/list-operators
-+++ b/test/list-operators
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/lock-pin b/test/lock-pin
-index 96ea9c2..5579735 100755
---- a/test/lock-pin
-+++ b/test/lock-pin
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/lockdown-modem b/test/lockdown-modem
-index 4e04205..781abb6 100755
---- a/test/lockdown-modem
-+++ b/test/lockdown-modem
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/monitor-ofono b/test/monitor-ofono
-index 8830757..bd31617 100755
---- a/test/monitor-ofono
-+++ b/test/monitor-ofono
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-@@ -6,7 +6,7 @@ import dbus
- import dbus.mainloop.glib
- 
- _dbus2py = {
--	dbus.String : str,
-+	dbus.String : unicode,
- 	dbus.UInt32 : int,
- 	dbus.Int32 : int,
- 	dbus.Int16 : int,
-diff --git a/test/offline-modem b/test/offline-modem
-index e8c043a..ea1f522 100755
---- a/test/offline-modem
-+++ b/test/offline-modem
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus, sys
- 
-diff --git a/test/online-modem b/test/online-modem
-index 029c4a5..310ed7d 100755
---- a/test/online-modem
-+++ b/test/online-modem
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus, sys
- 
-diff --git a/test/private-chat b/test/private-chat
-index e7e5406..ef2ef6c 100755
---- a/test/private-chat
-+++ b/test/private-chat
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/process-context-settings b/test/process-context-settings
-index 8a3ecfa..0f058b2 100755
---- a/test/process-context-settings
-+++ b/test/process-context-settings
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import os
- import dbus
-diff --git a/test/receive-sms b/test/receive-sms
-index a0c6915..c23eb14 100755
---- a/test/receive-sms
-+++ b/test/receive-sms
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/reject-calls b/test/reject-calls
-index 71b243e..9edf1ff 100755
---- a/test/reject-calls
-+++ b/test/reject-calls
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- 
-diff --git a/test/release-and-answer b/test/release-and-answer
-index dec8e17..25fd818 100755
---- a/test/release-and-answer
-+++ b/test/release-and-answer
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/release-and-swap b/test/release-and-swap
-index cb8c84e..7b3569f 100755
---- a/test/release-and-swap
-+++ b/test/release-and-swap
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/remove-contexts b/test/remove-contexts
-index b54184e..c5082cb 100755
---- a/test/remove-contexts
-+++ b/test/remove-contexts
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- 
-diff --git a/test/reset-pin b/test/reset-pin
-index 3fbd126..b429254 100755
---- a/test/reset-pin
-+++ b/test/reset-pin
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/scan-for-operators b/test/scan-for-operators
-index b4fc05e..749c710 100755
---- a/test/scan-for-operators
-+++ b/test/scan-for-operators
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/send-sms b/test/send-sms
-index 98808aa..e06444d 100755
---- a/test/send-sms
-+++ b/test/send-sms
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/send-ussd b/test/send-ussd
-index a20e098..e585883 100755
---- a/test/send-ussd
-+++ b/test/send-ussd
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-@@ -46,7 +46,7 @@ if state == "idle":
- print("State: %s" % (state))
- 
- while state == "user-response":
--	response = input("Enter response: ")
-+	response = raw_input("Enter response: ")
- 
- 	print(ussd.Respond(response, timeout=100))
- 
-diff --git a/test/send-vcal b/test/send-vcal
-index 566daef..7f8272b 100755
---- a/test/send-vcal
-+++ b/test/send-vcal
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/send-vcard b/test/send-vcard
-index 4dedf51..250b36f 100755
---- a/test/send-vcard
-+++ b/test/send-vcard
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/set-call-forwarding b/test/set-call-forwarding
-index 49d1ce0..9fd358b 100755
---- a/test/set-call-forwarding
-+++ b/test/set-call-forwarding
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- from gi.repository import GLib
-diff --git a/test/set-cbs-topics b/test/set-cbs-topics
-index db95e16..78d6d44 100755
---- a/test/set-cbs-topics
-+++ b/test/set-cbs-topics
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/set-context-property b/test/set-context-property
-index 5ff7a67..64a6fb8 100755
---- a/test/set-context-property
-+++ b/test/set-context-property
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/set-fast-dormancy b/test/set-fast-dormancy
-index ef77bcd..7bf7715 100755
---- a/test/set-fast-dormancy
-+++ b/test/set-fast-dormancy
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/set-gsm-band b/test/set-gsm-band
-index b37bcb5..3c17c10 100755
---- a/test/set-gsm-band
-+++ b/test/set-gsm-band
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/set-mic-volume b/test/set-mic-volume
-index cd6c73f..e0bff49 100755
---- a/test/set-mic-volume
-+++ b/test/set-mic-volume
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/set-mms-details b/test/set-mms-details
-index 6ee59fa..d2d0838 100755
---- a/test/set-mms-details
-+++ b/test/set-mms-details
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/set-msisdn b/test/set-msisdn
-index b5fe819..01f284d 100755
---- a/test/set-msisdn
-+++ b/test/set-msisdn
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/set-roaming-allowed b/test/set-roaming-allowed
-index 698c8b6..9e3e058 100755
---- a/test/set-roaming-allowed
-+++ b/test/set-roaming-allowed
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/set-speaker-volume b/test/set-speaker-volume
-index 6d4e301..7962f39 100755
---- a/test/set-speaker-volume
-+++ b/test/set-speaker-volume
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/set-tech-preference b/test/set-tech-preference
-index b549abc..2666cbd 100755
---- a/test/set-tech-preference
-+++ b/test/set-tech-preference
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/set-tty b/test/set-tty
-index eed1fba..53d6b99 100755
---- a/test/set-tty
-+++ b/test/set-tty
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/set-umts-band b/test/set-umts-band
-index 0bae5c4..c1e6448 100755
---- a/test/set-umts-band
-+++ b/test/set-umts-band
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/set-use-sms-reports b/test/set-use-sms-reports
-index 288d4e1..a4efe4f 100755
---- a/test/set-use-sms-reports
-+++ b/test/set-use-sms-reports
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
-diff --git a/test/swap-calls b/test/swap-calls
-index 018a8d3..eeb257b 100755
---- a/test/swap-calls
-+++ b/test/swap-calls
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/test-advice-of-charge b/test/test-advice-of-charge
-index 6e87e61..0f1f57f 100755
---- a/test/test-advice-of-charge
-+++ b/test/test-advice-of-charge
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- import sys
-diff --git a/test/test-call-barring b/test/test-call-barring
-index eedb69f..be4ab57 100755
---- a/test/test-call-barring
-+++ b/test/test-call-barring
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- import sys
-diff --git a/test/test-call-forwarding b/test/test-call-forwarding
-index 5db84d7..01a7294 100755
---- a/test/test-call-forwarding
-+++ b/test/test-call-forwarding
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/test-call-settings b/test/test-call-settings
-index 435594c..5d7ee49 100755
---- a/test/test-call-settings
-+++ b/test/test-call-settings
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/test-cbs b/test/test-cbs
-index a5cec06..13cdd80 100755
---- a/test/test-cbs
-+++ b/test/test-cbs
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import dbus.mainloop.glib
-@@ -78,7 +78,7 @@ def set_topics(cbs):
- 	invalidData = False;
- 	index = 0
- 
--	topics = input('Enter the topic ID(s) you want to register to: ')
-+	topics = raw_input('Enter the topic ID(s) you want to register to: ')
- 
- 	while index < len(topics):
- 		if topics[index] == ',' or topics[index] == '-':
-diff --git a/test/test-gnss b/test/test-gnss
-index 6ae64db..aa0b160 100755
---- a/test/test-gnss
-+++ b/test/test-gnss
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- import sys
-@@ -40,7 +40,7 @@ def print_menu():
- def stdin_handler(channel, condition, gnss, path):
- 	in_key = os.read(channel.unix_get_fd(), 160).rstrip().decode('UTF-8')
- 	if in_key == '0':
--		xml = input('type the element and press enter: ')
-+		xml = raw_input('type the element and press enter: ')
- 		try:
- 			gnss.SendPositioningElement(dbus.String(xml))
- 			print("ok")
-diff --git a/test/test-message-waiting b/test/test-message-waiting
-index 432862e..b93fbf3 100755
---- a/test/test-message-waiting
-+++ b/test/test-message-waiting
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- import sys
-diff --git a/test/test-modem b/test/test-modem
-index aa38b1f..29dbf14 100755
---- a/test/test-modem
-+++ b/test/test-modem
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/test-network-registration b/test/test-network-registration
-index 68b4347..c5ad586 100755
---- a/test/test-network-registration
-+++ b/test/test-network-registration
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- import sys
-diff --git a/test/test-phonebook b/test/test-phonebook
-index 42646d3..116fd4f 100755
---- a/test/test-phonebook
-+++ b/test/test-phonebook
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus, sys
- 
-diff --git a/test/test-push-notification b/test/test-push-notification
-index d972ad3..ecc6afb 100755
---- a/test/test-push-notification
-+++ b/test/test-push-notification
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/test-smart-messaging b/test/test-smart-messaging
-index f22efd2..188ac1e 100755
---- a/test/test-smart-messaging
-+++ b/test/test-smart-messaging
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/test-sms b/test/test-sms
-index 30ac651..49935e1 100755
---- a/test/test-sms
-+++ b/test/test-sms
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- # -*- coding: utf-8 -*-
- 
- from gi.repository import GLib
-@@ -132,7 +132,7 @@ def stdin_handler(channel, condition, sms, value, number):
- 		lock = "on"
- 		if in_key == '0':
- 			print_send_sms_menu()
--			sms_type = input('Select SMS type: ')
-+			sms_type = raw_input('Select SMS type: ')
- 
- 			if sms_type == '1':
- 				message_send(sms, number, value)
-@@ -150,49 +150,49 @@ def stdin_handler(channel, condition, sms, value, number):
- 
- 		elif in_key == '1':
- 			message_delivery_report(sms, 1)
--			send_msg = input('Send test message[y/n]?: ')
-+			send_msg = raw_input('Send test message[y/n]?: ')
- 			if send_msg == 'y':
- 				message_send(sms, number, ("(1)" + value +
- 						": UseDeliveryReports[TRUE]"))
- 
- 		elif in_key == '2':
- 			message_delivery_report(sms, 0)
--			send_msg = input('Send test message[y/n]?: ')
-+			send_msg = raw_input('Send test message[y/n]?: ')
- 			if send_msg == 'y':
- 				message_send(sms, number, ("(2) " + value +
- 						": UseDeliveryReports[FALSE]"))
- 
- 		elif in_key == '3':
- 			message_service_center_address(sms, SCA)
--			send_msg = input('Send test message[y/n]?: ')
-+			send_msg = raw_input('Send test message[y/n]?: ')
- 			if send_msg == 'y':
- 				message_send(sms, number, ("(3) " + value +
- 						": ServiceCenterAddress"))
- 
- 		elif in_key == '4':
- 			message_bearer(sms, "ps-only")
--			send_msg = input('Send test message[y/n]?: ')
-+			send_msg = raw_input('Send test message[y/n]?: ')
- 			if send_msg == 'y':
- 				message_send(sms, number, ("(4) " + value +
- 						": Bearer[ps-only]"))
- 
- 		elif in_key == '5':
- 			message_bearer(sms, "cs-only")
--			send_msg = input('Send test message[y/n]?: ')
-+			send_msg = raw_input('Send test message[y/n]?: ')
- 			if send_msg == 'y':
- 				message_send(sms, number, ("(5) " + value +
- 						": Bearer[cs-only]"))
- 
- 		elif in_key == '6':
- 			message_bearer(sms, "ps-preferred")
--			send_msg = input('Send test message[y/n]?: ')
-+			send_msg = raw_input('Send test message[y/n]?: ')
- 			if send_msg == 'y':
- 				message_send(sms, number, ("(6) " + value +
- 						": Bearer[ps-preferred]"))
- 
- 		elif in_key == '7':
- 			message_bearer(sms, "cs-preferred")
--			send_msg = input('Send test message[y/n]?: ')
-+			send_msg = raw_input('Send test message[y/n]?: ')
- 			if send_msg == 'y':
- 				message_send(sms,number, ("(7) " + value +
- 						": Bearer[cs-preferred]"))
-diff --git a/test/test-ss b/test/test-ss
-index 4cd8732..2c80806 100755
---- a/test/test-ss
-+++ b/test/test-ss
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import sys
- import dbus
-diff --git a/test/test-ss-control-cb b/test/test-ss-control-cb
-index ddae6d3..86bac9b 100755
---- a/test/test-ss-control-cb
-+++ b/test/test-ss-control-cb
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/test-ss-control-cf b/test/test-ss-control-cf
-index 095eb5d..d30bf4f 100755
---- a/test/test-ss-control-cf
-+++ b/test/test-ss-control-cf
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/test-ss-control-cs b/test/test-ss-control-cs
-index 8180474..e0ed1d1 100755
---- a/test/test-ss-control-cs
-+++ b/test/test-ss-control-cs
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-diff --git a/test/test-stk-menu b/test/test-stk-menu
-index 0cf8fa2..ac0a5bd 100755
---- a/test/test-stk-menu
-+++ b/test/test-stk-menu
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- from gi.repository import GLib
- 
-@@ -58,7 +58,7 @@ class StkAgent(dbus.service.Object):
- 			index += 1
- 
- 		print("\nDefault: %d" % (default))
--		select = input("Enter Selection (t, b):")
-+		select = raw_input("Enter Selection (t, b):")
- 
- 		if select == 'b':
- 			raise GoBack("User wishes to go back")
-@@ -75,7 +75,7 @@ class StkAgent(dbus.service.Object):
- 		print("DisplayText (%s)" % (title))
- 		print("Icon: (%d)" % (int(icon)))
- 		print("Urgent: (%d)" % (urgent))
--		key = input("Press return to clear ('t' terminates, "
-+		key = raw_input("Press return to clear ('t' terminates, "
- 						"'b' goes back, 'n' busy, "
- 						"'w' return and wait):")
- 
-@@ -108,7 +108,7 @@ class StkAgent(dbus.service.Object):
- 		print("Hide typing: (%s)" % (hide_typing))
- 		print("Enter characters, min: %d, max: %d:" % (min_chars,
- 								max_chars))
--		userin = input("")
-+		userin = raw_input("")
- 
- 		return userin
- 
-@@ -122,7 +122,7 @@ class StkAgent(dbus.service.Object):
- 		print("Hide typing: (%s)" % (hide_typing))
- 		print("Enter digits, min: %d, max: %d:" % (min_chars,
- 								max_chars))
--		userin = input("'t' terminates, 'b' goes back:")
-+		userin = raw_input("'t' terminates, 'b' goes back:")
- 
- 		if userin == 'b':
- 			raise GoBack("User wishes to go back")
-@@ -136,7 +136,7 @@ class StkAgent(dbus.service.Object):
- 	def RequestKey(self, title, icon):
- 		print("Title: (%s)" % (title))
- 		print("Icon: (%d)" % (int(icon)))
--		key = input("Enter Key (t, b):")
-+		key = raw_input("Enter Key (t, b):")
- 
- 		if key == 'b':
- 			raise GoBack("User wishes to go back")
-@@ -150,7 +150,7 @@ class StkAgent(dbus.service.Object):
- 	def RequestDigit(self, title, icon):
- 		print("Title: (%s)" % (title))
- 		print("Icon: (%d)" % (int(icon)))
--		key = input("Enter Digit (t, b):")
-+		key = raw_input("Enter Digit (t, b):")
- 
- 		if key == 'b':
- 			raise GoBack("User wishes to go back")
-@@ -164,7 +164,7 @@ class StkAgent(dbus.service.Object):
- 	def RequestQuickDigit(self, title, icon):
- 		print("Title: (%s)" % (title))
- 		print("Icon: (%d)" % (int(icon)))
--		key = input("Quick digit (0-9, *, #, t, b):")
-+		key = raw_input("Quick digit (0-9, *, #, t, b):")
- 
- 		if key == 'b':
- 			raise GoBack("User wishes to go back")
-@@ -178,7 +178,7 @@ class StkAgent(dbus.service.Object):
- 	def RequestConfirmation(self, title, icon):
- 		print("Title: (%s)" % (title))
- 		print("Icon: (%d)" % (int(icon)))
--		key = input("Enter Confirmation (t, b, y, n):")
-+		key = raw_input("Enter Confirmation (t, b, y, n):")
- 
- 		if key == 'b':
- 			raise GoBack("User wishes to go back")
-@@ -194,7 +194,7 @@ class StkAgent(dbus.service.Object):
- 	def ConfirmCallSetup(self, info, icon):
- 		print("Information: (%s)" % (info))
- 		print("Icon: (%d)" % (int(icon)))
--		key = input("Enter Confirmation (t, y, n):")
-+		key = raw_input("Enter Confirmation (t, y, n):")
- 
- 		if key == 't':
- 			raise EndSession("User wishes to terminate session")
-@@ -209,7 +209,7 @@ class StkAgent(dbus.service.Object):
- 		print("Information: (%s)" % (info))
- 		print("Icon: (%d)" % (int(icon)))
- 		print("URL (%s)" % (url))
--		key = input("Enter Confirmation (y, n):")
-+		key = raw_input("Enter Confirmation (y, n):")
- 
- 		if key == 'y':
- 			return True
-@@ -232,7 +232,7 @@ class StkAgent(dbus.service.Object):
- 		signal.alarm(5)
- 
- 		try:
--			key = input("Press return to end before end of"
-+			key = raw_input("Press return to end before end of"
- 							 " single tone (t):")
- 			signal.alarm(0)
- 
-@@ -250,7 +250,7 @@ class StkAgent(dbus.service.Object):
- 		print("LoopTone: %s" % (tone))
- 		print("Text: %s" % (text))
- 		print("Icon: %d" % (int(icon)))
--		key = input("Press return to end before timeout "
-+		key = raw_input("Press return to end before timeout "
- 				"('t' terminates, 'w' return and wait):")
- 
- 		if key == 'w':
-@@ -279,7 +279,7 @@ class StkAgent(dbus.service.Object):
- 	def DisplayAction(self, text, icon):
- 		print("Text: (%s)" % (text))
- 		print("Icon: (%d)" % (int(icon)))
--		key = input("Press 't' to terminate the session ")
-+		key = raw_input("Press 't' to terminate the session ")
- 
- 		if key == 't':
- 			raise EndSession("User wishes to terminate session")
-@@ -289,7 +289,7 @@ class StkAgent(dbus.service.Object):
- 	def ConfirmOpenChannel(self, info, icon):
- 		print("Open channel confirmation: (%s)" % (info))
- 		print("Icon: (%d)" % (int(icon)))
--		key = input("Enter Confirmation (t, y, n):")
-+		key = raw_input("Enter Confirmation (t, y, n):")
- 
- 		if key == 't':
- 			raise EndSession("User wishes to terminate session")
-@@ -299,7 +299,7 @@ class StkAgent(dbus.service.Object):
- 			return False
- 
- _dbus2py = {
--	dbus.String : str,
-+	dbus.String : unicode,
- 	dbus.UInt32 : int,
- 	dbus.Int32 : int,
- 	dbus.Int16 : int,
-@@ -396,7 +396,7 @@ if __name__ == '__main__':
- 		except:
- 			pass
- 
--		select = int(input("Enter Selection: "))
-+		select = int(raw_input("Enter Selection: "))
- 		stk.SelectItem(select, path)
- 	elif mode == 'agent':
- 		path = "/test/agent"
-diff --git a/test/unlock-pin b/test/unlock-pin
-index 61f4765..10b6626 100755
---- a/test/unlock-pin
-+++ b/test/unlock-pin
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/python
- 
- import dbus
- import sys
--- 
-1.9.1
-
diff --git a/meta/recipes-connectivity/ofono/ofono_1.17.bb b/meta/recipes-connectivity/ofono/ofono_1.17.bb
index 947f9d7..69f395777 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.17.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.17.bb
@@ -3,7 +3,6 @@ require ofono.inc
 SRC_URI  = "\
   ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
   file://ofono \
-  file://Revert-test-Convert-to-Python-3.patch \
 "
 SRC_URI[md5sum] = "d280b1d267ba5bf391d2a898fea7c748"
 SRC_URI[sha256sum] = "cbf20f07fd15253c682b23c1786d517f505c3688f7c4ea93da777e1523b89635"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 18/45] packagegroup-core-full-cmdline: drop python-dbus from the list of services
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (16 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 17/45] ofono: drop the custom-made revert to Python 2 from Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 19/45] nfs-utils: switch to Python 3 Alexander Kanavin
                   ` (28 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Any Python scripts should include this dependency explicitly.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index f33b43e..a60a68c 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -143,7 +143,6 @@ RDEPENDS_packagegroup-core-full-cmdline-sys-services = "\
     cronie \
     dbus \
     dbus-glib \
-    python-dbus \
     elfutils \
     gzip \
     less \
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 19/45] nfs-utils: switch to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (17 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 18/45] packagegroup-core-full-cmdline: drop python-dbus from the list of services Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 20/45] systemd: drop python dependency for ptests Alexander Kanavin
                   ` (27 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb
index a6268f3..285bd2c 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb
@@ -88,7 +88,7 @@ FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \
 		      ${sysconfdir}/init.d/nfscommon \
 		      ${systemd_unitdir}/system/nfs-statd.service"
 FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat"
-RDEPENDS_${PN}-stats = "python"
+RDEPENDS_${PN}-stats = "python3-core"
 
 FILES_${PN} += "${systemd_unitdir}"
 
@@ -140,4 +140,8 @@ do_install_append () {
 	rm -f ${D}${sbindir}/rpcdebug
 	rm -f ${D}${sbindir}/rpcgen
 	rm -f ${D}${sbindir}/locktest
+
+        # Make python tools use python 3
+        sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${sbindir}/mountstats ${D}${sbindir}/nfsiostat
+
 }
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 20/45] systemd: drop python dependency for ptests
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (18 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 19/45] nfs-utils: switch to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 21/45] util-linux: move to Python 3 Alexander Kanavin
                   ` (26 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Python tests are not actually used, because systemd is configured
using --without-python

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-core/systemd/systemd_229.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_229.bb b/meta/recipes-core/systemd/systemd_229.bb
index ae63c58..a1ca0e8 100644
--- a/meta/recipes-core/systemd/systemd_229.bb
+++ b/meta/recipes-core/systemd/systemd_229.bb
@@ -336,7 +336,7 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
-RDEPENDS_${PN}-ptest += "gawk make perl python bash xz \
+RDEPENDS_${PN}-ptest += "gawk make perl bash xz \
                          tzdata tzdata-americas tzdata-asia \
                          tzdata-europe tzdata-africa tzdata-antarctica \
                          tzdata-arctic tzdata-atlantic tzdata-australia \
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 21/45] util-linux: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (19 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 20/45] systemd: drop python dependency for ptests Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 22/45] python-pycairo: " Alexander Kanavin
                   ` (25 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index a1614c2..c0f2540 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c
                     file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
                     file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
 
-inherit autotools gettext pkgconfig systemd update-alternatives python-dir ptest bash-completion
+inherit autotools gettext pkgconfig systemd update-alternatives python3-dir ptest bash-completion
 DEPENDS = "zlib ncurses"
 DEPENDS_append_class-native = " lzo-native"
 DEPENDS_append_class-nativesdk = " lzo-native"
@@ -60,14 +60,14 @@ PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_u
 PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng,"
 
 # Build python bindings for libmount
-PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python --disable-pylibmount,python"
+PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3"
 
 # Readline support
 PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
 
 FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
 
-FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la"
+FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la"
 
 FILES_util-linux-agetty = "${base_sbindir}/agetty"
 FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}"
@@ -89,8 +89,9 @@ FILES_util-linux-findfs = "${sbindir}/findfs"
 FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
 FILES_util-linux-runuser = "${sbindir}/runuser"
 
-FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \
-                               ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*"
+FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \
+                               ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \
+                               ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*"
 FILES_util-linux-lscpu = "${bindir}/lscpu"
 
 FILES_util-linux-fsck = "${base_sbindir}/fsck*"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 22/45] python-pycairo: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (20 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 21/45] util-linux: move to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 23/45] bootchart2: " Alexander Kanavin
                   ` (24 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

The Python 3 version comes in a separate tarball, and is relicensed
under LGPLv3:
http://cairographics.org/pycairo/

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../python/python-pycairo_1.10.0.bb                | 41 ----------------------
 .../python/python3-pycairo_1.10.0.bb               | 40 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-pycairo_1.10.0.bb
 create mode 100644 meta/recipes-devtools/python/python3-pycairo_1.10.0.bb

diff --git a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
deleted file mode 100644
index 78e8a4e..0000000
--- a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "Python bindings for the Cairo canvas library"
-HOMEPAGE = "http://cairographics.org/pycairo"
-BUGTRACKER = "http://bugs.freedesktop.org"
-SECTION = "python-devel"
-LICENSE = "LGPLv2.1 & MPL-1.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
-                    file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
-                    file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
-
-# cairo >= 1.8.8
-DEPENDS = "cairo"
-PR = "r2"
-
-SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "20337132c4ab06c1146ad384d55372c5"
-SRC_URI[sha256sum] = "d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431"
-
-S = "${WORKDIR}/py2cairo-${PV}"
-
-inherit distutils pkgconfig
-
-BBCLASSEXTEND = "native"
-
-do_configure() {
-	./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
-}
-
-do_compile() {
-	./waf build ${PARALLEL_MAKE}
-}
-
-do_install() {
-	./waf install
-	sed \
-		-e 's:@prefix@:${prefix}:' \
-		-e 's:@VERSION@:${PV}:' \
-		-e 's:@includedir@:${includedir}:' \
-		pycairo.pc.in > pycairo.pc
-	install -m 0644 pycairo.pc ${D}${libdir}/pkgconfig/
-}
diff --git a/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
new file mode 100644
index 0000000..f9031b3
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Python bindings for the Cairo canvas library"
+HOMEPAGE = "http://cairographics.org/pycairo"
+BUGTRACKER = "http://bugs.freedesktop.org"
+SECTION = "python-devel"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+# cairo >= 1.8.8
+DEPENDS = "cairo"
+PR = "r2"
+
+SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "e6fd3f2f1e6a72e0db0868c4985669c5"
+SRC_URI[sha256sum] = "9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be"
+
+S = "${WORKDIR}/pycairo-${PV}"
+
+inherit distutils3 pkgconfig
+
+BBCLASSEXTEND = "native"
+
+do_configure() {
+	PYTHON=${PYTHON} ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
+}
+
+do_compile() {
+	./waf build ${PARALLEL_MAKE}
+}
+
+do_install() {
+	./waf install
+	sed \
+		-e 's:@prefix@:${prefix}:' \
+		-e 's:@VERSION@:${PV}:' \
+		-e 's:@includedir@:${includedir}:' \
+		py3cairo.pc.in > py3cairo.pc
+	install -m 0644 py3cairo.pc ${D}${libdir}/pkgconfig/
+}
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 23/45] bootchart2: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (21 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 22/45] python-pycairo: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 24/45] gdb: " Alexander Kanavin
                   ` (23 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
index 86c614a..d0555c3 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
@@ -99,7 +99,7 @@ SRCREV = "48e0071048564c6af75ab969e842d6dec808da09"
 
 inherit systemd
 inherit update-rc.d
-inherit pythonnative
+inherit python3native
 
 # The only reason to build bootchart2-native is for a native pybootchartgui.
 BBCLASSEXTEND = "native"
@@ -110,13 +110,6 @@ UPDATERCPN = "bootchartd-stop-initscript"
 INITSCRIPT_NAME = "bootchartd_stop.sh"
 INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
 
-# We want native pybootchartgui to execute with the correct Python interpeter.
-do_compile_append_class-native () {
-    echo "#! ${PYTHON}" | cat - ${S}/pybootchartgui.py > ${WORKDIR}/temp_pybootchartgui
-    mv ${WORKDIR}/temp_pybootchartgui ${S}/pybootchartgui.py
-    chmod +x ${S}/pybootchartgui
-}
-
 do_compile_prepend () {
     export PY_LIBDIR="${libdir}/${PYTHON_DIR}"
     export BINDIR="${bindir}"
@@ -135,14 +128,17 @@ do_install () {
     install -m 0755 ${WORKDIR}/bootchartd_stop.sh ${D}${sysconfdir}/init.d
 
     echo 'EXIT_PROC="$EXIT_PROC matchbox-window-manager"' >> ${D}${sysconfdir}/bootchartd.conf
+
+   # Use python 3 instead of python 2
+   sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/pybootchartgui
 }
 
 PACKAGES =+ "pybootchartgui"
 FILES_pybootchartgui += "${libdir}/python*/site-packages/pybootchartgui ${bindir}/pybootchartgui"
-RDEPENDS_pybootchartgui = "python-pycairo python-compression python-image python-textutils python-shell python-compression python-codecs"
+RDEPENDS_pybootchartgui = "python3-pycairo python3-compression python3-image python3-textutils python3-shell python3-compression python3-codecs"
 RDEPENDS_${PN}_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}"
 RDEPENDS_${PN}_class-target += "lsb"
-DEPENDS_append_class-native = " python-pycairo-native"
+DEPENDS_append_class-native = " python3-pycairo-native"
 
 PACKAGES =+ "bootchartd-stop-initscript"
 FILES_bootchartd-stop-initscript += "${sysconfdir}/init.d ${sysconfdir}/rc*.d"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 24/45] gdb: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (22 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 23/45] bootchart2: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 25/45] git: remove Python package (to which nothing was packaged) Alexander Kanavin
                   ` (22 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/gdb/gdb-common.inc         |  2 +-
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 12 ++++++------
 meta/recipes-devtools/gdb/gdb-cross.inc          |  4 ++--
 meta/recipes-devtools/gdb/gdb_7.11.bb            |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 3e00a2e..a5a9adf 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -61,7 +61,7 @@ EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-werror \
 PACKAGECONFIG ??= "readline"
 # Use --without-system-readline to compile with readline 5.
 PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline"
-PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python,python python-codecs"
+PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs"
 PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace"
 
 GDBPROPREFIX = "--program-prefix=''"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index 6e42af1..e53081d 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -1,5 +1,5 @@
 inherit cross-canadian
-inherit python-dir
+inherit python3-dir
 
 SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)"
 PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
@@ -12,9 +12,9 @@ GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 
 # Overrides PACKAGECONFIG variables in gdb-common.inc
 PACKAGECONFIG ??= "python readline"
-PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python, \
-                         nativesdk-python-core nativesdk-python-lang nativesdk-python-re \
-                         nativesdk-python-codecs nativesdk-python-netclient"
+PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \
+                         nativesdk-python3-core nativesdk-python3-lang nativesdk-python3-re \
+                         nativesdk-python3-codecs nativesdk-python3-netclient"
 PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline"
 
 SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"
@@ -23,8 +23,8 @@ do_configure_prepend() {
 cat > ${WORKDIR}/python << EOF
 #! /bin/sh
 case "\$2" in
-        --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;;
-        --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
+        --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
+        --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;;
         --exec-prefix) echo "${exec_prefix}" ;;
         *) exit 1 ;;
 esac
diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc
index c62715f..7579205 100644
--- a/meta/recipes-devtools/gdb/gdb-cross.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross.inc
@@ -2,11 +2,11 @@ require gdb-common.inc
 
 DEPENDS = "expat-native ncurses-native"
 
-inherit pythonnative
+inherit python3native
 
 # Overrides PACKAGECONFIG variables in gdb-common.inc
 PACKAGECONFIG ??= "python readline"
-PACKAGECONFIG[python] = "--with-python=${STAGING_BINDIR_NATIVE}/python-native/python,--without-python,python-native"
+PACKAGECONFIG[python] = "--with-python=${STAGING_BINDIR_NATIVE}/python-native/python,--without-python,python3-native"
 PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
 
 do_compile_prepend() {
diff --git a/meta/recipes-devtools/gdb/gdb_7.11.bb b/meta/recipes-devtools/gdb/gdb_7.11.bb
index ccc33b8..f02e643 100644
--- a/meta/recipes-devtools/gdb/gdb_7.11.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.11.bb
@@ -1,15 +1,15 @@
 require gdb.inc
 require gdb-${PV}.inc
 
-inherit python-dir
+inherit python3-dir
 
 do_configure_prepend() {
 	if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then
 		cat > ${WORKDIR}/python << EOF
 #!/bin/sh
 case "\$2" in
-	--includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;;
-	--ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
+	--includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
+	--ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;;
 	--exec-prefix) echo "${exec_prefix}" ;;
 	*) exit 1 ;;
 esac
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 25/45] git: remove Python package (to which nothing was packaged)
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (23 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 24/45] gdb: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 26/45] qemu: remove runtime python dependency Alexander Kanavin
                   ` (21 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/git/git.inc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 7b3bec7..753b047 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -32,8 +32,7 @@ do_compile_prepend () {
 
 do_install () {
 	oe_runmake install DESTDIR="${D}" bindir=${bindir} \
-		template_dir=${datadir}/git-core/templates \
-		GIT_PYTHON_DIR=${D}${datadir}/git-core/python
+		template_dir=${datadir}/git-core/templates
 	install -d ${D}/${mandir}/man1
 	install -d ${D}/${mandir}/man5
 	install -d ${D}/${mandir}/man7
@@ -108,10 +107,6 @@ FILES_${PN}-perltools += " \
 "
 RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
 
-PACKAGES =+ "${PN}-python"
-FILES_${PN}-python = "${libdir}/python*"
-
-
 # git-tk package with gitk and git-gui
 PACKAGES =+ "${PN}-tk"
 #RDEPENDS_${PN}-tk = "${PN} tk tcl"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 26/45] qemu: remove runtime python dependency
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (24 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 25/45] git: remove Python package (to which nothing was packaged) Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 27/45] subversion: remove unnecessary " Alexander Kanavin
                   ` (20 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Nothing seems to require it.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/qemu/qemu.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 36d600f..bf689bb 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -2,7 +2,7 @@ SUMMARY = "Fast open source processor emulator"
 HOMEPAGE = "http://qemu.org"
 LICENSE = "GPLv2 & LGPLv2.1"
 DEPENDS = "glib-2.0 zlib pixman"
-RDEPENDS_${PN}_class-target += "bash python"
+RDEPENDS_${PN}_class-target += "bash"
 RDEPENDS_${PN}-ptest = "bash make"
 
 require qemu-targets.inc
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 27/45] subversion: remove unnecessary python dependency
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (25 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 26/45] qemu: remove runtime python dependency Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 28/45] swig: move to Python 3 Alexander Kanavin
                   ` (19 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

It would be useful if swig was enabled, but it isn't.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/subversion/subversion_1.9.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/subversion/subversion_1.9.3.bb b/meta/recipes-devtools/subversion/subversion_1.9.3.bb
index a19a675..626276d 100644
--- a/meta/recipes-devtools/subversion/subversion_1.9.3.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.9.3.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://subversion.tigris.org"
 
 BBCLASSEXTEND = "native"
 
-inherit gettext pythonnative
+inherit gettext
 
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://disable_macos.patch \
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 28/45] swig: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (26 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 27/45] subversion: remove unnecessary " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 16:38   ` Philip Balister
  2016-05-24 11:54 ` [PATCH 29/45] python-pyrex: remove unused recipe Alexander Kanavin
                   ` (18 subsequent siblings)
  46 siblings, 1 reply; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/swig/swig.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/swig/swig.inc b/meta/recipes-devtools/swig/swig.inc
index 9da40df..704bb27 100644
--- a/meta/recipes-devtools/swig/swig.inc
+++ b/meta/recipes-devtools/swig/swig.inc
@@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
 
 SECTION = "devel"
 
-DEPENDS = "libpcre python"
+DEPENDS = "libpcre python3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
 
-inherit autotools pythonnative
+inherit autotools python3native
 
 EXTRA_OECONF = " \
-    --with-python=${PYTHON} \
+    --with-python3=${PYTHON} \
     --without-allegrocl \
     --without-android \
     --without-boost \
@@ -33,7 +33,6 @@ EXTRA_OECONF = " \
     --without-perl5 \
     --without-pike \
     --without-php \
-    --without-python3 \
     --without-r \
     --without-ruby \
     --without-tcl \
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 29/45] python-pyrex: remove unused recipe
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (27 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 28/45] swig: move to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 30/45] python-imaging: " Alexander Kanavin
                   ` (17 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/conf/distro/include/distro_alias.inc          |  1 -
 .../python/python-pyrex-native_0.9.9.bb            |  5 -----
 .../python-pyrex/pyrex-fix-optimized-mode.patch    | 15 ---------------
 meta/recipes-devtools/python/python-pyrex_0.9.9.bb | 22 ----------------------
 4 files changed, 43 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
 delete mode 100644 meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
 delete mode 100644 meta/recipes-devtools/python/python-pyrex_0.9.9.bb

diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index c8f9395..5626792 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -343,7 +343,6 @@ DISTRO_PN_ALIAS_pn-python-mako = "Fedora=python-mako Opensuse=python-Mako"
 DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo"
 DISTRO_PN_ALIAS_pn-python-pycurl = "Debian=python-pycurl Ubuntu=python-pycurl"
 DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject"
-DISTRO_PN_ALIAS_pn-python-pyrex = "Mandriva=python-pyrex Ubuntu=python-pyrex"
 DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons"
 DISTRO_PN_ALIAS_pn-python-setuptools = "Mandriva=python-setup OpenSuSE=python-setup-git"
 DISTRO_PN_ALIAS_pn-python-smartpm = "Debian=smart OpenSuSE=smart"
diff --git a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
deleted file mode 100644
index e8ef1aa..0000000
--- a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require python-pyrex_${PV}.bb
-inherit native pythonnative
-DEPENDS = "python-native"
-RDEPENDS_${PN} = ""
-PR = "r3"
diff --git a/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch b/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
deleted file mode 100644
index c58c328..0000000
--- a/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Index: Pyrex-0.9.8.4/Pyrex/Distutils/extension.py
-===================================================================
---- Pyrex-0.9.8.4.orig/Pyrex/Distutils/extension.py
-+++ Pyrex-0.9.8.4/Pyrex/Distutils/extension.py
-@@ -15,7 +15,7 @@ except ImportError:
-     warnings = None
- 
- class Extension(_Extension.Extension):
--    _Extension.Extension.__doc__ + \
-+    _Extension.Extension.__doc__ or "" + \
-     """pyrex_include_dirs : [string]
-         list of directories to search for Pyrex header files (.pxd) (in
-         Unix form for portability)
diff --git a/meta/recipes-devtools/python/python-pyrex_0.9.9.bb b/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
deleted file mode 100644
index c4dd2e6..0000000
--- a/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Language for writing Python extension modules"
-DESCRIPTION = "Pyrex is a language specially designed for writing Python extension modules. \
-It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
-and the messy, low-level world of C."
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=771d472f53f933033f57eeee7808e5bd"
-SRCNAME = "Pyrex"
-PR = "r4"
-
-SRC_URI = "\
-  http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-  file://pyrex-fix-optimized-mode.patch \
-"
-
-SRC_URI[md5sum] = "515dee67d15d4393841e2d60e8341947"
-SRC_URI[sha256sum] = "5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-FILES_${PN} += "${datadir}${base_libdir}/${PYTHON_DIR}/site-packages/Pyrex/Compiler/Lexicon.pickle"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 30/45] python-imaging: remove unused recipe
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (28 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 29/45] python-pyrex: remove unused recipe Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 31/45] python-docutils: move to Python 3 Alexander Kanavin
                   ` (16 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/conf/distro/include/distro_alias.inc          |  1 -
 meta/conf/distro/include/security_flags.inc        |  1 -
 ...ing-setup.py-force-paths-for-zlib-freetyp.patch | 55 ------------------
 .../allow.to.disable.some.features.patch           | 65 ----------------------
 .../python-imaging/fix-freetype-includes.patch     | 30 ----------
 .../python/python-imaging_1.1.7.bb                 | 45 ---------------
 6 files changed, 197 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
 delete mode 100644 meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
 delete mode 100644 meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
 delete mode 100644 meta/recipes-devtools/python/python-imaging_1.1.7.bb

diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 5626792..f3315b4 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -338,7 +338,6 @@ DISTRO_PN_ALIAS_pn-python3-setuptools = "OpenSuSE=python3-setuptools Debian=pyth
 DISTRO_PN_ALIAS_pn-python-dbus = "Ubuntu=python-dbus Debian=python-dbus Mandriva=python-dbus"
 DISTRO_PN_ALIAS_pn-python-distribute = "Opensuse=python-setuptools Fedora=python-setuptools"
 DISTRO_PN_ALIAS_pn-python-git = "Debian=python-git Fedora=GitPython"
-DISTRO_PN_ALIAS_pn-python-imaging = "Mandriva=python-imaging Debian=python-imaging"
 DISTRO_PN_ALIAS_pn-python-mako = "Fedora=python-mako Opensuse=python-Mako"
 DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo"
 DISTRO_PN_ALIAS_pn-python-pycurl = "Debian=python-pycurl Ubuntu=python-pycurl"
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index febedfa..4b4a884 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -76,7 +76,6 @@ SECURITY_CFLAGS_pn-openssl = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-opensp = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-ppp = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-python = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-python-imaging = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-python-smartpm = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-python-numpy = "${SECURITY_NO_PIE_CFLAGS}"
diff --git a/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch b/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
deleted file mode 100644
index 2575306..0000000
--- a/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Tue, 15 Nov 2011 13:16:54 +0100
-Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
-Upstream-Status: Inappropriate [embedded specific]
----
- setup.py |   14 +++-----------
- 1 files changed, 3 insertions(+), 11 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 5d4d53a..b1a22ec 100644
---- a/setup.py
-+++ b/setup.py
-@@ -34,10 +34,10 @@ def libinclude(root):
- # TIFF_ROOT = libinclude("/opt/tiff")
- 
- TCL_ROOT = None
--JPEG_ROOT = None
--ZLIB_ROOT = None
-+JPEG_ROOT = os.environ['STAGING_LIBDIR']
-+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
- TIFF_ROOT = None
--FREETYPE_ROOT = None
-+FREETYPE_ROOT =  os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
- LCMS_ROOT = None
- 
- # FIXME: add mechanism to explicitly *disable* the use of a library
-@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
-             add_directory(library_dirs, "/opt/local/lib")
-             add_directory(include_dirs, "/opt/local/include")
- 
--        add_directory(library_dirs, "/usr/local/lib")
-         # FIXME: check /opt/stuff directories here?
- 
-         prefix = sysconfig.get_config_var("prefix")
-@@ -207,13 +206,6 @@ class pil_build_ext(build_ext):
-             if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
-                 add_directory(include_dirs, tcl_dir)
- 
--        # standard locations
--        add_directory(library_dirs, "/usr/local/lib")
--        add_directory(include_dirs, "/usr/local/include")
--
--        add_directory(library_dirs, "/usr/lib")
--        add_directory(include_dirs, "/usr/include")
--
-         #
-         # insert new dirs *before* default libs, to avoid conflicts
-         # between Python PYD stub libs and real libraries
--- 
-1.7.2.5
-
diff --git a/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch b/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
deleted file mode 100644
index 4960ed4..0000000
--- a/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-At least lcms wasn't deterministicly detected from sysroot.
-
-This will allow to export LCMS_ENABLED=False when lcms isn't in PACKAGECONFIG.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-diff -uNr Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py
---- Imaging-1.1.7.orig/setup.py	2013-07-22 10:17:02.081457075 +0200
-+++ Imaging-1.1.7/setup.py	2013-07-22 13:10:09.029707492 +0200
-@@ -39,6 +39,12 @@
- TIFF_ROOT = None
- FREETYPE_ROOT =  os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
- LCMS_ROOT = None
-+TCL_ENABLED = os.getenv('TCL_ENABLED', "True")
-+JPEG_ENABLED = os.getenv('JPEG_ENABLED', "True")
-+ZLIB_ENABLED = os.getenv('ZLIB_ENABLED', "True")
-+TIFF_ENABLED = os.getenv('TIFF_ENABLED', "True")
-+FREETYPE_ENABLED = os.getenv('FREETYPE_ENABLED', "True")
-+LCMS_ENABLED = os.getenv('LCMS_ENABLED', "True")
- 
- # FIXME: add mechanism to explicitly *disable* the use of a library
- 
-@@ -220,22 +226,22 @@
-             zlib = jpeg = tiff = freetype = tcl = tk = lcms = None
-         feature = feature()
- 
--        if find_include_file(self, "zlib.h"):
-+        if ZLIB_ENABLED == 'True' and find_include_file(self, "zlib.h"):
-             if find_library_file(self, "z"):
-                 feature.zlib = "z"
-             elif sys.platform == "win32" and find_library_file(self, "zlib"):
-                 feature.zlib = "zlib" # alternative name
- 
--        if find_include_file(self, "jpeglib.h"):
-+        if JPEG_ENABLED == 'True' and find_include_file(self, "jpeglib.h"):
-             if find_library_file(self, "jpeg"):
-                 feature.jpeg = "jpeg"
-             elif sys.platform == "win32" and find_library_file(self, "libjpeg"):
-                 feature.jpeg = "libjpeg" # alternative name
- 
--        if find_library_file(self, "tiff"):
-+        if TIFF_ENABLED == 'True' and find_library_file(self, "tiff"):
-             feature.tiff = "tiff"
- 
--        if find_library_file(self, "freetype"):
-+        if FREETYPE_ENABLED == 'True' and find_library_file(self, "freetype"):
-             # look for freetype2 include files
-             freetype_version = 0
-             for dir in self.compiler.include_dirs:
-@@ -256,11 +262,11 @@
-                 if dir:
-                     add_directory(self.compiler.include_dirs, dir, 0)
- 
--        if find_include_file(self, "lcms.h"):
-+        if LCMS_ENABLED == 'True' and find_include_file(self, "lcms.h"):
-             if find_library_file(self, "lcms"):
-                 feature.lcms = "lcms"
- 
--        if _tkinter and find_include_file(self, "tk.h"):
-+        if TCL_ENABLED == 'True' and _tkinter and find_include_file(self, "tk.h"):
-             # the library names may vary somewhat (e.g. tcl84 or tcl8.4)
-             version = TCL_VERSION[0] + TCL_VERSION[2]
-             if find_library_file(self, "tcl" + version):
diff --git a/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch b/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
deleted file mode 100644
index 9ecc63a..0000000
--- a/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From c6040f618d8f2706a7b46d1cdf37d1a587f9701f Mon Sep 17 00:00:00 2001
-From: Andrew Stromnov <stromnov@gmail.com>
-Date: Thu, 28 Nov 2013 16:58:43 +0400
-Subject: [PATCH] fix compiling with FreeType 2.5.1
-
----
- _imagingft.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/_imagingft.c b/_imagingft.c
-index 47d50bd..f19555b 100644
---- a/_imagingft.c
-+++ b/_imagingft.c
-@@ -59,7 +59,11 @@ struct {
-     const char* message;
- } ft_errors[] =
- 
-+#if defined(USE_FREETYPE_2_1)
-+#include FT_ERRORS_H
-+#else
- #include <freetype/fterrors.h>
-+#endif
- 
- /* -------------------------------------------------------------------- */
- /* font objects */
--- 
-1.8.5.1
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
deleted file mode 100644
index a678328..0000000
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "Python Imaging Library (PIL)"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec"
-DEPENDS = "freetype jpeg tiff"
-SRCNAME = "Imaging"
-PR = "r5"
-
-SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
-           file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \
-           file://allow.to.disable.some.features.patch \
-           file://fix-freetype-includes.patch"
-
-SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e"
-SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-# There isn't enable/disable option, and lcms is in meta-oe, at least make it explicit when enabled
-# setup.py already has FIXME: add mechanism to explicitly *disable* the use of a library
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[lcms] = ",,lcms"
-
-inherit distutils
-
-do_compile() {
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)}
-    distutils_do_compile
-}
-
-do_install() {
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)}
-    distutils_do_install
-    install -d ${D}${datadir}/doc/${BPN}/html/
-    install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/
-    install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${BPN}/html/
-
-    # get rid of #!/usr/local/bin/python
-    sed -i -e 's:/usr/local/bin/:${bindir}/env :g' ${D}${bindir}/*
-}
-
-RDEPENDS_${PN} += "python-lang python-stringold"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 31/45] python-docutils: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (29 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 30/45] python-imaging: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 32/45] cracklib: disable building the python module Alexander Kanavin
                   ` (15 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/python/python3-dbus_1.2.4.bb                    | 4 ++--
 .../python/{python-docutils_0.12.bb => python3-docutils_0.12.bb}      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python-docutils_0.12.bb => python3-docutils_0.12.bb} (92%)

diff --git a/meta/recipes-devtools/python/python3-dbus_1.2.4.bb b/meta/recipes-devtools/python/python3-dbus_1.2.4.bb
index c058caf..759512c 100644
--- a/meta/recipes-devtools/python/python3-dbus_1.2.4.bb
+++ b/meta/recipes-devtools/python/python3-dbus_1.2.4.bb
@@ -15,8 +15,8 @@ S = "${WORKDIR}/dbus-python-${PV}"
 inherit distutils3-base autotools pkgconfig
 
 PACKAGECONFIG ?= ""
-PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python-docutils-native"
-PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python-docutils-native python-epydoc-native"
+PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python3-docutils-native"
+PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python3-docutils-native python3-epydoc-native"
 
 do_configure_prepend() {
     export PYTHON=${PYTHON}
diff --git a/meta/recipes-devtools/python/python-docutils_0.12.bb b/meta/recipes-devtools/python/python3-docutils_0.12.bb
similarity index 92%
rename from meta/recipes-devtools/python/python-docutils_0.12.bb
rename to meta/recipes-devtools/python/python3-docutils_0.12.bb
index 8cda88d..e78fa3b 100644
--- a/meta/recipes-devtools/python/python-docutils_0.12.bb
+++ b/meta/recipes-devtools/python/python3-docutils_0.12.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "PSF & BSD-2-Clause & GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=a722fbdc20347db7b69223594dd54574"
 
-DEPENDS = "python"
+DEPENDS = "python3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz"
 SRC_URI[md5sum] = "4622263b62c5c771c03502afa3157768"
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb8
 
 S = "${WORKDIR}/docutils-${PV}"
 
-inherit distutils
+inherit distutils3
 
 BBCLASSEXTEND = "native"
 
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 32/45] cracklib: disable building the python module
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (30 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 31/45] python-docutils: move to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 33/45] libuser: move to Python 3 Alexander Kanavin
                   ` (14 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

It's tricky to convert to Python 3 and isn't required by anything in
oe-core or meta-oe.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 25 +++---------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
index 3bd3f93..c185d23 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
@@ -4,12 +4,9 @@ HOMEPAGE = "http://sourceforge.net/projects/cracklib"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
-DEPENDS = "cracklib-native zlib python"
-RDEPEND_${PN}-python += "python"
+DEPENDS = "cracklib-native zlib"
 
-PACKAGES += "${PN}-python"
-
-EXTRA_OECONF = "--with-python --libdir=${base_libdir}"
+EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \
            file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \
@@ -21,27 +18,11 @@ SRC_URI[sha256sum] = "59ab0138bc8cf90cccb8509b6969a024d5e58d2d02bcbdccbb9ba9b88b
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cracklib/files/cracklib/"
 UPSTREAM_CHECK_REGEX = "/cracklib/(?P<pver>(\d+[\.\-_]*)+)/"
 
-inherit autotools gettext pythonnative python-dir
+inherit autotools gettext
 
 do_install_append_class-target() {
 	create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small
 }
 
-do_install_append() {
-	src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages"
-	rm -f $src_dir/test_cracklib.py*
-
-	if [ "${base_libdir}" != "${libdir}" ] ; then
-	   # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir}
-	   install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/
-	   mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR}
-	   rm -fr ${D}${base_libdir}/${PYTHON_DIR}
-	fi
-}
-
 BBCLASSEXTEND = "native nativesdk"
 
-FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py* \
-	${PYTHON_SITEPACKAGES_DIR}/_cracklib.*"
-
-FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 33/45] libuser: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (31 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 32/45] cracklib: disable building the python module Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 34/45] libnewt-python: " Alexander Kanavin
                   ` (13 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/libuser/libuser_0.62.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/libuser/libuser_0.62.bb b/meta/recipes-extended/libuser/libuser_0.62.bb
index 7a64efe..8590563 100644
--- a/meta/recipes-extended/libuser/libuser_0.62.bb
+++ b/meta/recipes-extended/libuser/libuser_0.62.bb
@@ -20,11 +20,13 @@ SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \
 SRC_URI[md5sum] = "63e5e5c551e99dc5302b40b80bd6d4f2"
 SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3cace20b"
 
-DEPENDS = "popt libpam glib-2.0 docbook-utils-native linuxdoc-tools-native python"
+DEPENDS = "popt libpam glib-2.0 docbook-utils-native linuxdoc-tools-native python3"
 
-inherit autotools gettext pythonnative python-dir pkgconfig
+inherit autotools gettext python3native python3-dir pkgconfig
 
-EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}"
+export PYTHON
+
+EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
 
 PACKAGES += "${PN}-python "
 
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 34/45] libnewt-python: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (32 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 33/45] libuser: move to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 35/45] gnome-doc-utils: remove recipe Alexander Kanavin
                   ` (12 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/newt/libnewt-python_0.52.18.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.18.bb b/meta/recipes-extended/newt/libnewt-python_0.52.18.bb
index ba04757..20369ef 100644
--- a/meta/recipes-extended/newt/libnewt-python_0.52.18.bb
+++ b/meta/recipes-extended/newt/libnewt-python_0.52.18.bb
@@ -1,10 +1,10 @@
 require recipes-extended/newt/libnewt_${PV}.bb
 
 SUMMARY .= " - python"
-DEPENDS = "libnewt python"
-RDEPENDS_${PN} += "python-core"
+DEPENDS = "libnewt python3"
+RDEPENDS_${PN} += "python3-core"
 
-inherit pythonnative python-dir
+inherit python3native python3-dir
 
 EXTRA_OECONF += "--with-python"
 EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 35/45] gnome-doc-utils: remove recipe
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (33 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 34/45] libnewt-python: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 36/45] lttng-tools: move to Python 3 Alexander Kanavin
                   ` (11 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Nothing in oe-core actually requires it.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-gnome/epiphany/epiphany_3.18.4.bb     |  1 -
 .../gnome-desktop/gnome-desktop3_3.18.2.bb         |  2 +-
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       | 29 -------
 .../gnome-doc-utils/sysrooted-pkg-config.patch     | 35 --------
 .../use-usr-bin-env-for-python-in-xml2po.patch     | 30 -------
 .../gnome/gnome-doc-utils/xsltproc_nonet.patch     | 95 ----------------------
 .../recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb | 12 ---
 7 files changed, 1 insertion(+), 203 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils.inc
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.18.4.bb b/meta/recipes-gnome/epiphany/epiphany_3.18.4.bb
index 869569c..f0582ac 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.18.4.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.18.4.bb
@@ -16,7 +16,6 @@ SRC_URI[archive.sha256sum] = "be699d484371111abae754e669187215df73e21533f461e513
 EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO}"
 
 do_configure_prepend() {
-    touch ${S}/gnome-doc-utils.make
     sed -i -e s:help::g ${S}/Makefile.am
 }
 
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb
index 75a99a6..7f00bc6 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb
@@ -10,7 +10,7 @@ inherit gnome pkgconfig upstream-version-is-even gobject-introspection
 SRC_URI[archive.md5sum] = "9a5875247abdb99bad93f1c4230d1d6d"
 SRC_URI[archive.sha256sum] = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56"
 
-DEPENDS += "intltool-native gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils startup-notification xkeyboard-config iso-codes"
+DEPENDS += "intltool-native gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes"
 
 inherit distro_features_check
 REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
deleted file mode 100644
index 0d212c7..0000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "A collection of documentation utilities for the Gnome project"
-DESCRIPTION = "The GNOME Documentation Build Utilities (gnome-doc- \
-utils) were created to make it easier for application developers to \
-include and create documentation in their releases. They include the \
-xml2po tool which makes it easier to translate and keep up to date \
-translations of documentation."
-LICENSE = "GPLv2 & LGPLv2.1"
-DEPENDS = "intltool-native libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0"
-
-inherit gnomebase gettext python-dir pythonnative autotools-brokensep
-
-CLEANBROKEN = "1"
-
-EXTRA_OECONF += "--disable-scrollkeeper"
-
-do_install_append() {
-	chown -R root:root ${D}
-}
-
-do_install_append_class-native () {
-	sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' ${D}${bindir}/xml2po
-}
-
-FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*"
-
-RDEPENDS_${PN} = "bash"
-RDEPENDS_${PN}_class-native = ""
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
deleted file mode 100644
index 416d698..0000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-In cross environment we have to prepend the sysroot to the path found by
-pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
-it ends up using the files from host system. Now usually people have gnome installed
-so the build succeeds but if you dont have gnome installed on build host then
-it wont find the files on host system and packages using gnome-doc-utils wont
-compile.
-
-This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
-will be empty
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
-
-Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
-===================================================================
---- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
-+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
-@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
- _xml2po ?= `which xml2po`
- _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
- 
--_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
--_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
--_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
--_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
--_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
-+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-+_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-+_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
- 
- if ENABLE_SK
- _ENABLE_SK = true
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
deleted file mode 100644
index 0e196c0..0000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-We can't use #!/full/path/to/python -u as this can be longer than shebang
-allows for.  In order to be appropraite for upstream more work would be
-needed to make sure that the main xml2po code doesn't rely on python
-being invoked with -u (force stdin/out/err to be used raw).
-
-Upstream-Status: Inappropriate [Would break behavior on Windows]
-Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
-
-Index: gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
-===================================================================
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/Makefile.am
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
-@@ -7,7 +7,6 @@ CLEANFILES = xml2po
- 
- xml2po: xml2po.py.in
- 	$(AM_V_GEN)sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
--	    -e "s+^#!.*python.*+#!$(PYTHON)+" \
- 	  < $(srcdir)/xml2po.py.in > xml2po
- 	$(AM_V_at)chmod +x xml2po
- 
-Index: gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
-===================================================================
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -u
-+#!/usr/bin/env python
- # -*- encoding: utf-8 -*-
- # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
- # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
deleted file mode 100644
index 9346494..0000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-This adds the -nonet option to xsltproc invocations, which fixes
-compile errors when building the gnome-doc-utils docs.
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
-
-Index: gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
-===================================================================
---- gnome-doc-utils-0.20.10.orig/doc/xslt/Makefile.am
-+++ gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
-@@ -21,14 +21,14 @@ all: $(xsldoc_docs) $(xsldoc_xmls)
- 
- $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
- 	$(AM_V_GEN)$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
--	| xsltproc -o "$@" \
-+	| xsltproc -nonet -o "$@" \
- 	--stringparam basename "$(basename $(notdir $@))" \
- 	--stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
- 	"$(srcdir)/xsldoc-fill.xsl" -
- 
- $(xsldoc_xmls): xsldoc-docbook.xsl
- $(xsldoc_xmls): C/%.xml : C/%.xsldoc
--	$(AM_V_GEN)xsltproc -o "$@" \
-+	$(AM_V_GEN)xsltproc -nonet -o "$@" \
- 	--stringparam basename "$(basename $(notdir $@))" \
- 	--stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
- 	"$(srcdir)/xsldoc-docbook.xsl" "$<"
-@@ -62,7 +62,7 @@ gnome-doc-xslt-check-includes:
- gnome-doc-xslt-check-xsldoc: $(xsldoc_docs)
- 	@echo "Running xsldoc checks";
- 	@(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \
--	| xsltproc "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
-+	| xsltproc -nonet "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
- 
- .PHONY: clean-xsldoc
- clean-local: clean_xsldoc
-Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
-===================================================================
---- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
-+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
-@@ -37,7 +37,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
- 	list='$(DOC_H_DOCS)'; for doc in $$list; do \
- 	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
- 	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
--	  xsltproc --path "$$xmlpath" $(_credits) $$doc; \
-+	  xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \
- 	done | sort | uniq \
- 	  | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
- 	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
-@@ -50,7 +50,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
- 	  docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
- 	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
- 	  echo $$xmlpath; \
--	  ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
-+	  ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
- 	  for id in $$ids; do \
- 	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
- 	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
-@@ -197,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %
- 	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
- 	  echo "Please check your ScrollKeeper installation." >&2;		\
- 	  exit 1; }
--	$(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
-+	$(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
- 
- ## @ _DOC_OMF_HTML
- ## The OMF files for HTML output
-@@ -212,7 +212,7 @@ if ENABLE_SK
- 	  echo "Please check your ScrollKeeper installation." >&2;		\
- 	  exit 1; }
- endif
--	$(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
-+	$(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
- 
- ## @ _DOC_OMF_ALL
- ## All OMF output files to be built
-@@ -267,7 +267,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),
- ## All HTML documentation in the C locale
- # FIXME: probably have to shell escape to determine the file names
- _DOC_C_HTML = $(foreach f,						\
--	$(shell xsltproc --xinclude 					\
-+	$(shell xsltproc -nonet --xinclude 					\
- 	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
- 	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
- 	C/$(f).xhtml)
-@@ -393,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,
- _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
- 
- $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
--	$(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-+	$(GDU_V_DB2HTM)xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
- 
- 
- ################################################################################
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
deleted file mode 100644
index ed01ea7..0000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require gnome-doc-utils.inc
-LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
-		    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-SRC_URI += "file://xsltproc_nonet.patch \
-            file://use-usr-bin-env-for-python-in-xml2po.patch \
-            file://sysrooted-pkg-config.patch \
-            file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \
-           "
-
-SRC_URI[archive.md5sum] = "3c64ad7bacd617b04999e4a168afaac5"
-SRC_URI[archive.sha256sum] = "cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 36/45] lttng-tools: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (34 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 35/45] gnome-doc-utils: remove recipe Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 37/45] lttng-ust: " Alexander Kanavin
                   ` (10 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...d-look-for-python-3.0-when-building-pytho.patch | 30 ----------------------
 meta/recipes-kernel/lttng/lttng-tools_git.bb       |  7 +++--
 2 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch

diff --git a/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch b/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch
deleted file mode 100644
index d05c04c..0000000
--- a/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Fri, 4 Dec 2015 16:11:41 +0000
-Subject: [PATCH] Revert "Build: look for python >= 3.0 when building python bindings"
-Organization: O.S. Systems Software LTDA.
-
-This reverts commit 227703a2ceada3c104edd56756d48455ca4c271a.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4dee4b4..6608bcd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -339,7 +339,7 @@ AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes])
- 
- if test "x${enable_python_binding:-yes}" = xyes; then
-   AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
--  AM_PATH_PYTHON([3.0])
-+  AM_PATH_PYTHON
- 
-   AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
-   AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
--- 
-2.1.4
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index 8ef267c..da2b685 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -18,16 +18,15 @@ PV = "2.7.1+git${SRCPV}"
 
 PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
                  am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
-                 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \
+                 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \
 "
 PACKAGECONFIG ??= "lttng-ust"
-PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native"
+PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
 PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"
 PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
 PACKAGECONFIG_remove_libc-musl = "lttng-ust"
 
 SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
-           file://Revert-Build-look-for-python-3.0-when-building-pytho.patch \
            file://stop-using-SIGUNUSED.patch \
            file://runtest-2.4.0.patch \
            file://0001-lttng-tools-filter-random-filename-of-tests-output.patch \
@@ -35,7 +34,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
 
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep ptest pkgconfig useradd python-dir
+inherit autotools-brokensep ptest pkgconfig useradd python3-dir
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "tracing"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 37/45] lttng-ust: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (35 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 36/45] lttng-tools: move to Python 3 Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 38/45] systemtap: " Alexander Kanavin
                   ` (9 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/lttng/lttng-ust_git.bb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/lttng/lttng-ust_git.bb b/meta/recipes-kernel/lttng/lttng-ust_git.bb
index 15d925d..f5a12b1 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_git.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
 inherit autotools lib_package
 
 DEPENDS = "liburcu util-linux"
-RDEPENDS_${PN}-bin = "python-core"
+RDEPENDS_${PN}-bin = "python3-core"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "lttng2-ust"
@@ -27,6 +27,13 @@ SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.7 \
            file://lttng-ust-add-support-for-aarch64_be.patch \
           "
 
+do_install_append() {
+        # Patch python tools to use Python 3; they should be source compatible, but
+        # still refer to Python 2 in the shebang
+        sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp
+}
+
+
 S = "${WORKDIR}/git"
 
 do_configure_prepend () {
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 38/45] systemtap: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (36 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 37/45] lttng-ust: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 39/45] libcap-ng: " Alexander Kanavin
                   ` (8 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 97064b8..cf6a96a 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -6,13 +6,12 @@ DEPENDS = "elfutils sqlite3 systemtap-native"
 DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native"
 DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
 
-RDEPENDS_${PN} += "python bash"
-RDEPENDS_${PN}_class-native += "python-native"
-RDEPENDS_${PN}_class-nativesdk += "python-native"
+RDEPENDS_${PN} += "python3-core bash"
 
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
             --without-nss --without-avahi --without-dyninst \
             --disable-server --disable-grapher --enable-prologues \
+            --with-python3 \
             ac_cv_prog_have_javac=no \
             ac_cv_prog_have_jar=no "
 
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 39/45] libcap-ng: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (37 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 38/45] systemtap: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 40/45] hwlatdetect: " Alexander Kanavin
                   ` (7 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb
index 5715467..5608f49 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb
+++ b/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb
@@ -10,16 +10,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
            file://python.patch"
 
-inherit lib_package autotools pythonnative
+inherit lib_package autotools python3native
 
 SRC_URI[md5sum] = "3d7d126b29e2869a0257c17c8b0d9b2e"
 SRC_URI[sha256sum] = "615549ce39b333f6b78baee0c0b4ef18bc726c6bf1cca123dfd89dd963f6d06b"
 
-DEPENDS += "swig-native python"
+DEPENDS += "swig-native python3"
 
-EXTRA_OECONF += "--without-python3"
-
-EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'"
+export PYTHON
+export STAGING_INCDIR
+export STAGING_LIBDIR
+EXTRA_OECONF += "--with-python --with-python3"
+EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'"
 
 PACKAGES += "${PN}-python"
 
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 40/45] hwlatdetect: move to Python 3
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (38 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 39/45] libcap-ng: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 41/45] python3-mako: add a Python 3 recipe Alexander Kanavin
                   ` (6 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
index 025eb63..012b2dd 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
+++ b/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 require rt-tests.inc
-inherit python-dir
+inherit python3-dir
 
 EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages"
 
@@ -17,8 +17,10 @@ do_compile() {
 do_install() {
         oe_runmake install_hwlatdetect DESTDIR=${D} SBINDIR=${sbindir} \
 	           MANDIR=${mandir} INCLUDEDIR=${includedir}
+
+        sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py
 }
 
 FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py"
-RDEPENDS_${PN} = "python python-subprocess python-textutils"
+RDEPENDS_${PN} = "python3 python3-subprocess python3-textutils"
 RRECOMMENDS_${PN} = "kernel-module-hwlat-detector"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 41/45] python3-mako: add a Python 3 recipe
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (39 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 40/45] hwlatdetect: " Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 42/45] python3-nose: add a recipe Alexander Kanavin
                   ` (5 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

This will be necessary for transiting piglit to Python 3.
Python 2 recipe should be kept as it is used by mesa (and
gobject-introspection, for now).

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/python/python-mako_1.0.3.bb  |  6 ++++++
 meta/recipes-devtools/python/python3-mako_1.0.3.bb | 24 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-mako_1.0.3.bb

diff --git a/meta/recipes-devtools/python/python-mako_1.0.3.bb b/meta/recipes-devtools/python/python-mako_1.0.3.bb
index 9efd700..d4f426d 100644
--- a/meta/recipes-devtools/python/python-mako_1.0.3.bb
+++ b/meta/recipes-devtools/python/python-mako_1.0.3.bb
@@ -22,3 +22,9 @@ RDEPENDS_${PN} = "python-threading \
 RDEPENDS_${PN}_class-native = ""
 
 BBCLASSEXTEND = "native nativesdk"
+
+# The same utility is packaged in python3-mako, so it would conflict
+do_install_append() {
+    rm -f ${D}${bindir}/mako-render
+    rm -df ${D}${bindir}
+}
diff --git a/meta/recipes-devtools/python/python3-mako_1.0.3.bb b/meta/recipes-devtools/python/python3-mako_1.0.3.bb
new file mode 100644
index 0000000..c770603
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-mako_1.0.3.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Templating library for Python"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=deb3ff8e4c17aaf7b80889b6b2bf4c83"
+
+SRC_URI = "https://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "a78f20f6366a8a0659ce5532f8614e53"
+SRC_URI[sha256sum] = "7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/mako/"
+UPSTREAM_CHECK_REGEX = "/Mako/(?P<pver>(\d+[\.\-_]*)+)"
+
+S = "${WORKDIR}/Mako-${PV}"
+
+inherit setuptools3
+
+RDEPENDS_${PN} = "python3-threading \
+                  python3-netclient \
+                  python3-html \
+"
+RDEPENDS_${PN}_class-native = ""
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 42/45] python3-nose: add a recipe
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (40 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 41/45] python3-mako: add a Python 3 recipe Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 43/45] python3: add = to -L linking option only when the path is absolute Alexander Kanavin
                   ` (4 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

This is needed for updating piglit to use Python 3.
Python 2 based recipe can be later moved to meta-oe.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/python/python3-nose_1.3.7.bb | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-nose_1.3.7.bb

diff --git a/meta/recipes-devtools/python/python3-nose_1.3.7.bb b/meta/recipes-devtools/python/python3-nose_1.3.7.bb
new file mode 100644
index 0000000..a45d2f2
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-nose_1.3.7.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Extends Python unittest to make testing easier"
+DESCRIPTION = "nose extends the test loading and running features of unittest, \
+making it easier to write, find and run tests."
+SECTION = "devel/python"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://lgpl.txt;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
+SRC_URI = "http://pypi.python.org/packages/source/n/nose/nose-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "4d3ad0ff07b61373d2cefc89c5d0b20b"
+SRC_URI[sha256sum] = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/nose/"
+UPSTREAM_CHECK_REGEX = "/nose/(?P<pver>(\d+[\.\-_]*)+)"
+
+S = "${WORKDIR}/nose-${PV}"
+
+inherit setuptools3
+
+RDEPENDS_${PN}_class-target = "\
+  python3-unittest \
+  "
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 43/45] python3: add = to -L linking option only when the path is absolute
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (41 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 42/45] python3-nose: add a recipe Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 44/45] python-numpy: move recipe to own directory Alexander Kanavin
                   ` (3 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

Previously it was added also when the path was relative and not
prefixed with ./, which was causing issues with building numpy.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/python/python3/unixccompiler.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/python/python3/unixccompiler.patch b/meta/recipes-devtools/python/python3/unixccompiler.patch
index 7b90f13..3e2b1d1 100644
--- a/meta/recipes-devtools/python/python3/unixccompiler.patch
+++ b/meta/recipes-devtools/python/python3/unixccompiler.patch
@@ -18,9 +18,9 @@ Index: Python-3.3.2/Lib/distutils/unixccompiler.py
  
      def library_dir_option(self, dir):
 -        return "-L" + dir
-+        if dir.startswith("."):
-+            return "-L" + dir
-+        return "-L=" + dir
++        if dir.startswith("/"):
++            return "-L=" + dir
++        return "-L" + dir
  
      def _is_gcc(self, compiler_name):
          return "gcc" in compiler_name or "g++" in compiler_name
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* [PATCH 44/45] python-numpy: move recipe to own directory
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (42 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 43/45] python3: add = to -L linking option only when the path is absolute Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 11:54 ` [PATCH 45/45] python3-numpy: add a recipe Alexander Kanavin
                   ` (2 subsequent siblings)
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

This is done so that patches can be shared with python3-numpy

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch       | 0
 .../{python/python-numpy => python-numpy/files}/aarch64/_numpyconfig.h    | 0
 .../python-numpy/powerpc64 => python-numpy/files/aarch64}/config.h        | 0
 .../{python/python-numpy => python-numpy/files}/add-glibc-check.patch     | 0
 .../{python/python-numpy/mipsel => python-numpy/files/arm}/config.h       | 0
 .../{python/python-numpy/mipsel => python-numpy/files/arm}/numpyconfig.h  | 0
 .../{python/python-numpy => python-numpy/files}/armeb/config.h            | 0
 .../{python/python-numpy => python-numpy/files}/armeb/numpyconfig.h       | 0
 .../{python/python-numpy => python-numpy/files}/mips/_numpyconfig.h       | 0
 .../{python/python-numpy => python-numpy/files}/mips/config.h             | 0
 .../python-numpy/powerpc64 => python-numpy/files/mips64}/_numpyconfig.h   | 0
 .../{python/python-numpy/mips64n32 => python-numpy/files/mips64}/config.h | 0
 .../{python/python-numpy => python-numpy/files}/mips64n32/_numpyconfig.h  | 0
 .../{python/python-numpy/mips64 => python-numpy/files/mips64n32}/config.h | 0
 .../{python/python-numpy/arm => python-numpy/files/mipsel}/config.h       | 0
 .../{python/python-numpy/arm => python-numpy/files/mipsel}/numpyconfig.h  | 0
 .../{python/python-numpy => python-numpy/files}/powerpc/_numpyconfig.h    | 0
 .../{python/python-numpy => python-numpy/files}/powerpc/config.h          | 0
 .../python-numpy/mips64 => python-numpy/files/powerpc64}/_numpyconfig.h   | 0
 .../python-numpy/aarch64 => python-numpy/files/powerpc64}/config.h        | 0
 .../files}/remove-build-path-in-comments.patch                            | 0
 .../{python/python-numpy => python-numpy/files}/x86-64/_numpyconfig.h     | 0
 .../{python/python-numpy => python-numpy/files}/x86-64/config.h           | 0
 .../{python/python-numpy => python-numpy/files}/x86/config.h              | 0
 .../{python/python-numpy => python-numpy/files}/x86/numpyconfig.h         | 0
 meta/recipes-devtools/{python => python-numpy}/python-numpy_1.10.4.bb     | 0
 26 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/aarch64/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/powerpc64 => python-numpy/files/aarch64}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/add-glibc-check.patch (100%)
 rename meta/recipes-devtools/{python/python-numpy/mipsel => python-numpy/files/arm}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/mipsel => python-numpy/files/arm}/numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/armeb/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/armeb/numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/powerpc64 => python-numpy/files/mips64}/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/mips64n32 => python-numpy/files/mips64}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips64n32/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/mips64 => python-numpy/files/mips64n32}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/arm => python-numpy/files/mipsel}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/arm => python-numpy/files/mipsel}/numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/powerpc/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/powerpc/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/mips64 => python-numpy/files/powerpc64}/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy/aarch64 => python-numpy/files/powerpc64}/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/remove-build-path-in-comments.patch (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86-64/_numpyconfig.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86-64/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86/config.h (100%)
 rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86/numpyconfig.h (100%)
 rename meta/recipes-devtools/{python => python-numpy}/python-numpy_1.10.4.bb (100%)

diff --git a/meta/recipes-devtools/python/python-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
rename to meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
diff --git a/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/powerpc64/config.h b/meta/recipes-devtools/python-numpy/files/aarch64/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/powerpc64/config.h
rename to meta/recipes-devtools/python-numpy/files/aarch64/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/add-glibc-check.patch b/meta/recipes-devtools/python-numpy/files/add-glibc-check.patch
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/add-glibc-check.patch
rename to meta/recipes-devtools/python-numpy/files/add-glibc-check.patch
diff --git a/meta/recipes-devtools/python/python-numpy/mipsel/config.h b/meta/recipes-devtools/python-numpy/files/arm/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/mipsel/config.h
rename to meta/recipes-devtools/python-numpy/files/arm/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h b/meta/recipes-devtools/python-numpy/files/arm/numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/arm/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/armeb/config.h b/meta/recipes-devtools/python-numpy/files/armeb/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/armeb/config.h
rename to meta/recipes-devtools/python-numpy/files/armeb/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h b/meta/recipes-devtools/python-numpy/files/armeb/numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/armeb/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mips/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mips/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips/config.h b/meta/recipes-devtools/python-numpy/files/mips/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/mips/config.h
rename to meta/recipes-devtools/python-numpy/files/mips/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips64n32/config.h b/meta/recipes-devtools/python-numpy/files/mips64/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/mips64n32/config.h
rename to meta/recipes-devtools/python-numpy/files/mips64/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips64/config.h b/meta/recipes-devtools/python-numpy/files/mips64n32/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/mips64/config.h
rename to meta/recipes-devtools/python-numpy/files/mips64n32/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/arm/config.h b/meta/recipes-devtools/python-numpy/files/mipsel/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/arm/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsel/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsel/numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsel/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/powerpc/config.h b/meta/recipes-devtools/python-numpy/files/powerpc/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/powerpc/config.h
rename to meta/recipes-devtools/python-numpy/files/powerpc/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/aarch64/config.h b/meta/recipes-devtools/python-numpy/files/powerpc64/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/aarch64/config.h
rename to meta/recipes-devtools/python-numpy/files/powerpc64/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/remove-build-path-in-comments.patch b/meta/recipes-devtools/python-numpy/files/remove-build-path-in-comments.patch
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/remove-build-path-in-comments.patch
rename to meta/recipes-devtools/python-numpy/files/remove-build-path-in-comments.patch
diff --git a/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/x86-64/config.h b/meta/recipes-devtools/python-numpy/files/x86-64/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/x86-64/config.h
rename to meta/recipes-devtools/python-numpy/files/x86-64/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/x86/config.h b/meta/recipes-devtools/python-numpy/files/x86/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/x86/config.h
rename to meta/recipes-devtools/python-numpy/files/x86/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h b/meta/recipes-devtools/python-numpy/files/x86/numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/x86/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy_1.10.4.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.10.4.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy_1.10.4.bb
rename to meta/recipes-devtools/python-numpy/python-numpy_1.10.4.bb
-- 
2.8.1



^ permalink raw reply	[flat|nested] 63+ messages in thread

* [PATCH 45/45] python3-numpy: add a recipe
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (43 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 44/45] python-numpy: move recipe to own directory Alexander Kanavin
@ 2016-05-24 11:54 ` Alexander Kanavin
  2016-05-24 20:59 ` [PATCH 00/45] Move recipes to use Python 3 whenever possible Mark Hatle
  2016-05-31  7:44 ` Richard Purdie
  46 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-24 11:54 UTC (permalink / raw)
  To: openembedded-core

This is needed for updating piglit to use Python 3.
Python 2 based recipe can be later moved to meta-oe.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../python-numpy/python3-numpy_1.10.4.bb           | 101 +++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb

diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb
new file mode 100644
index 0000000..dcd23ac
--- /dev/null
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb
@@ -0,0 +1,101 @@
+SUMMARY = "A sophisticated Numeric Processing Package for Python"
+SECTION = "devel/python"
+LICENSE = "PSF"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9f4e88b5748e8313caaf33d081ce65a3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
+           file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
+           file://remove-build-path-in-comments.patch \
+           file://add-glibc-check.patch \
+           ${CONFIGFILESURI} "
+
+CONFIGFILESURI ?= ""
+
+CONFIGFILESURI_aarch64 = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_arm = " \
+    file://config.h \
+    file://numpyconfig.h \
+"
+CONFIGFILESURI_armeb = " \
+    file://config.h \
+    file://numpyconfig.h \
+"
+CONFIGFILESURI_mipsel = " \
+    file://config.h \
+    file://numpyconfig.h \
+"
+CONFIGFILESURI_x86 = " \
+    file://config.h \
+    file://numpyconfig.h \
+"
+CONFIGFILESURI_x86-64 = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_mips = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_powerpc = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_powerpc64 = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_mips64 = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_mips64n32 = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+
+S = "${WORKDIR}/numpy-${PV}"
+
+inherit distutils3
+
+# Make the build fail and replace *config.h with proper one
+# This is a ugly, ugly hack - Koen
+do_compile_prepend_class-target() {
+    ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py build ${DISTUTILS_BUILD_ARGS} || \
+    true
+    cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/
+}
+
+FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
+
+SRC_URI[md5sum] = "90bb9034652cefbada19cf7d141a6a61"
+SRC_URI[sha256sum] = "f7f91842056a7cf680b0eaf8cefc5e46c69e2521e651128d2e6aaaccec8652ae"
+
+# install what is needed for numpy.test()
+RDEPENDS_${PN} = "python3-unittest \
+                  python3-difflib \
+                  python3-pprint \
+                  python3-pickle \
+                  python3-shell \
+                  python3-nose \
+                  python3-doctest \
+                  python3-datetime \
+                  python3-distutils \
+                  python3-misc \
+                  python3-mmap \
+                  python3-netclient \
+                  python3-numbers \
+                  python3-pydoc \
+                  python3-pkgutil \
+                  python3-email \
+                  python3-subprocess \
+                  python3-compression \
+                  python3-ctypes \
+                  python3-threading \
+"
+
+RDEPENDS_${PN}_class-native = ""
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 63+ messages in thread

* Re: [PATCH 09/45] python3: manipulate all of the config*/Makefile files, not just config/Makefile
  2016-05-24 11:53 ` [PATCH 09/45] python3: manipulate all of the config*/Makefile files, not just config/Makefile Alexander Kanavin
@ 2016-05-24 12:50   ` Martin Jansa
  2016-05-25 12:37     ` alexander.kanavin
  0 siblings, 1 reply; 63+ messages in thread
From: Martin Jansa @ 2016-05-24 12:50 UTC (permalink / raw)
  To: Alexander Kanavin; +Cc: openembedded-core

[-- Attachment #1: Type: text/plain, Size: 2173 bytes --]

On Tue, May 24, 2016 at 02:53:58PM +0300, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-devtools/python/python3_3.5.1.bb | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb
> index 26d05c7..1c8fe2f 100644
> --- a/meta/recipes-devtools/python/python3_3.5.1.bb
> +++ b/meta/recipes-devtools/python/python3_3.5.1.bb
> @@ -164,6 +164,7 @@ do_install() {
>  	rm -f ${D}/${bindir}/2to3
>  
>  	install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
> +	install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile

Shouldn't it use "PYTHON_ABI" variable instead of "m"?

>  	if [ -e ${WORKDIR}/sitecustomize.py ]; then
>  		install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
> @@ -182,9 +183,11 @@ PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess"
>  py_package_preprocess () {
>  	# copy back the old Makefile to fix target package
>  	install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile

Shouldn't it use "PYTHON_ABI" variable instead of "m"?

> +	install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile
>  	# Remove references to buildmachine paths in target Makefile and _sysconfigdata
>  	sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
>  		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \
> +		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile \

Shouldn't it use "PYTHON_ABI" variable instead of "m"?

>  		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py
>  }
>  
> -- 
> 2.8.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 05/45] sip.bbclass: remove
  2016-05-24 11:53 ` [PATCH 05/45] sip.bbclass: remove Alexander Kanavin
@ 2016-05-24 16:35   ` Philip Balister
  2016-05-25 12:41     ` alexander.kanavin
  0 siblings, 1 reply; 63+ messages in thread
From: Philip Balister @ 2016-05-24 16:35 UTC (permalink / raw)
  To: Alexander Kanavin, openembedded-core

The pyqt recipe in meta-qt4 uses sip.

Philip

On 05/24/2016 07:53 AM, Alexander Kanavin wrote:
> Nothing is requiring it in oe-core or meta-oe.
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/classes/sip.bbclass | 61 ------------------------------------------------
>  1 file changed, 61 deletions(-)
>  delete mode 100644 meta/classes/sip.bbclass
> 
> diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
> deleted file mode 100644
> index 6ed2a13..0000000
> --- a/meta/classes/sip.bbclass
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -# Build Class for Sip based Python Bindings
> -# (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
> -#
> -STAGING_SIPDIR ?= "${STAGING_DATADIR_NATIVE}/sip"
> -
> -DEPENDS  =+ "sip-native"
> -RDEPENDS_${PN} += "python-sip"
> -
> -# default stuff, do not uncomment
> -# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
> -
> -# do_generate is before do_configure so ensure that sip_native is populated in sysroot before executing it
> -do_generate[depends] += "sip-native:do_populate_sysroot"
> -
> -sip_do_generate() {
> -	if [ -z "${SIP_MODULES}" ]; then 
> -		MODULES="`ls sip/*mod.sip`"
> -	else
> -		MODULES="${SIP_MODULES}"
> -	fi
> -
> -	if [ -z "$MODULES" ]; then
> -		die "SIP_MODULES not set and no modules found in $PWD"
> -        else
> -		bbnote "using modules '${SIP_MODULES}' and tags '${EXTRA_SIPTAGS}'"
> -	fi
> -
> -	if [ -z "${EXTRA_SIPTAGS}" ]; then
> -		die "EXTRA_SIPTAGS needs to be set!"
> -	else
> -		SIPTAGS="${EXTRA_SIPTAGS}"
> -	fi
> -
> -	if [ ! -z "${SIP_FEATURES}" ]; then
> -		FEATURES="-z ${SIP_FEATURES}"
> -		bbnote "sip feature file: ${SIP_FEATURES}"
> -	fi
> -
> -	for module in $MODULES
> -	do
> -		install -d ${module}/
> -		echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
> -		sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
> -			sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
> -		sed -e 's,target,TARGET,' -e 's,sources,SOURCES,' -e 's,headers,HEADERS,' \
> -			${module}/${module}.sbf | sed s,"moc_HEADERS =","HEADERS +=", \
> -			>${module}/${module}.pro
> -		echo "TEMPLATE=lib" >>${module}/${module}.pro
> -		[ "${module}" = "qt" ] 		&& echo "" 		>>${module}/${module}.pro
> -		[ "${module}" = "qtcanvas" ] 	&& echo ""		>>${module}/${module}.pro
> -		[ "${module}" = "qttable" ] 	&& echo ""		>>${module}/${module}.pro
> -		[ "${module}" = "qwt" ] 	&& echo ""		>>${module}/${module}.pro
> -		[ "${module}" = "qtpe" ]        && echo ""		>>${module}/${module}.pro
> -		[ "${module}" = "qtpe" ]        && echo "LIBS+=-lqpe"	>>${module}/${module}.pro
> -		true
> -	done
> -}
> -
> -EXPORT_FUNCTIONS do_generate
> -
> -addtask generate after do_unpack do_patch before do_configure
> 


^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 28/45] swig: move to Python 3
  2016-05-24 11:54 ` [PATCH 28/45] swig: move to Python 3 Alexander Kanavin
@ 2016-05-24 16:38   ` Philip Balister
  2016-05-25 12:45     ` alexander.kanavin
  0 siblings, 1 reply; 63+ messages in thread
From: Philip Balister @ 2016-05-24 16:38 UTC (permalink / raw)
  To: Alexander Kanavin, openembedded-core

I'm trying to get my head around how this change will impact python2
based programs that use swig, such as gnuradio.

Does this mean all programs that use swig will need to move to python3 now?

Philip

On 05/24/2016 07:54 AM, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-devtools/swig/swig.inc | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-devtools/swig/swig.inc b/meta/recipes-devtools/swig/swig.inc
> index 9da40df..704bb27 100644
> --- a/meta/recipes-devtools/swig/swig.inc
> +++ b/meta/recipes-devtools/swig/swig.inc
> @@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
>  
>  SECTION = "devel"
>  
> -DEPENDS = "libpcre python"
> +DEPENDS = "libpcre python3"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
>  
> -inherit autotools pythonnative
> +inherit autotools python3native
>  
>  EXTRA_OECONF = " \
> -    --with-python=${PYTHON} \
> +    --with-python3=${PYTHON} \
>      --without-allegrocl \
>      --without-android \
>      --without-boost \
> @@ -33,7 +33,6 @@ EXTRA_OECONF = " \
>      --without-perl5 \
>      --without-pike \
>      --without-php \
> -    --without-python3 \
>      --without-r \
>      --without-ruby \
>      --without-tcl \
> 


^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 00/45] Move recipes to use Python 3 whenever possible
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (44 preceding siblings ...)
  2016-05-24 11:54 ` [PATCH 45/45] python3-numpy: add a recipe Alexander Kanavin
@ 2016-05-24 20:59 ` Mark Hatle
  2016-05-25 13:01   ` alexander.kanavin
  2016-05-31  7:44 ` Richard Purdie
  46 siblings, 1 reply; 63+ messages in thread
From: Mark Hatle @ 2016-05-24 20:59 UTC (permalink / raw)
  To: Alexander Kanavin, openembedded-core

On 5/24/16 6:53 AM, Alexander Kanavin wrote:
> This patchset updates recipes to use Python 3 whenever possible. A few items
> cannot be moved at the moment for various reasons, here they are:
> 
> 1) Smartpm package manager has not been ported to Python 3 and it is unlikely
> to happen:
> https://github.com/smartpm/smart/issues/4
> We need to look into alternatives such as yum or dnf (the 'next generation' fork of yum).
> 
> Consequently, rpm's python bindings (required by smartpm) stay at python 2 as well
> for now, even tough python 3 seems to be supported.

Is there a porting guide or similar that can used to help identify what types of
changes are needed.  I am not at all familiar with what python 3 needs
specifically, but I do expect we will need to port these items.

> 2) Scons build system is python 2 only, due to lack of resources.
> 
> 3) createrepo recipe is using an upstream version from 2007, before createrepo was
> rewritten on top of yum's python modules.
> 
> We need to look into adding yum recipe which will allow updating createrepo to latest upstream.
> Also, libxml2 is currently a createrepo dependency, and so stays at Python 2 for now.

The yum version of createrepo will not work.  We need to port forward the
component as appropriate -- or modify smartpm to use a newer version -- assuming
we can add missing pieces, as necessary.  (key is smartpm and createrepo need to
be kept in sync.)

Please create one (or three) defects and assign them to me for smartpm,
createrepo, and rpm python3 support.  (I doubt I'll be the one doing the work,
but I'll do my best to find someone to do the work.)

> 4) varous recipes that haven't been ported: kconfig-frontends, mklibs, opkg-utils,
> ltp, mc, parted, libepoxy, mesa, perf, rt-tests, webkitgtk.
> 
> 5) LSB spec is implicitly requiring Python 2 (via requirement for '/usr/bin/python').

I expect the LSB will require python 2 for a while.  So we will need to continue
to ensure that python 2 works, as well as python3.

Thanks for the update above.

--Mark

> 6) gobject introspection has been ported to Python 3 in release 1.48. I'll send this
> update separately, as a part of normal version update patches.
> 
> 7) piglit has been ported to Python 3 as well in the latest upstream releases, Jussi
> Kukkonen should take care of it. I've added piglit's python dependencies in their
> Python 3 versions - python3-mako and python3-numpy, so that the task should be a little
> easier.
> 
> The following changes since commit c7e614c438706fb3ed7520b4990ebb3973366942:
> 
>   useradd: Fix infinite build loop (2016-05-23 10:33:45 +0100)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib akanavin/deprecate-python2
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/deprecate-python2
> 
> Alexander Kanavin (45):
>   python-native, python3-native: remove the use of exported HOST_SYS and
>     BUILD_SYS variables
>   distutils-native-base.bbclass, distutils3-native-base.bbclass: remove
>   python3-dir.bbclass: add a separate class for Python 3
>   default-versions.inc: drop python-related defaults
>   sip.bbclass: remove
>   avahi-ui: remove support for building a python module
>   bind: switch Python dependency to Python 3.x
>   python-dbus: update to 1.2.4, port to python 3
>   python3: manipulate all of the config*/Makefile files, not just
>     config/Makefile
>   python3: drop 110-enable-zlib.patch
>   glib: move to Python 3
>   dbus-test: remove unneeded pygobject dependency
>   python-pygobject: port to Python 3
>   neard: do not package python test scripts
>   bluez5: switch to Python 3
>   connman: do not install Python test scripts
>   ofono: drop the custom-made revert to Python 2 from Python 3
>   packagegroup-core-full-cmdline: drop python-dbus from the list of
>     services
>   nfs-utils: switch to Python 3
>   systemd: drop python dependency for ptests
>   util-linux: move to Python 3
>   python-pycairo: move to Python 3
>   bootchart2: move to Python 3
>   gdb: move to Python 3
>   git: remove Python package (to which nothing was packaged)
>   qemu: remove runtime python dependency
>   subversion: remove unnecessary python dependency
>   swig: move to Python 3
>   python-pyrex: remove unused recipe
>   python-imaging: remove unused recipe
>   python-docutils: move to Python 3
>   cracklib: disable building the python module
>   libuser: move to Python 3
>   libnewt-python: move to Python 3
>   gnome-doc-utils: remove recipe
>   lttng-tools: move to Python 3
>   lttng-ust: move to Python 3
>   systemtap: move to Python 3
>   libcap-ng: move to Python 3
>   hwlatdetect: move to Python 3
>   python3-mako: add a Python 3 recipe
>   python3-nose: add a recipe
>   python3: add = to -L linking option only when the path is absolute
>   python-numpy: move recipe to own directory
>   python3-numpy: add a recipe
> 
>  meta/classes/distutils-common-base.bbclass         |    2 -
>  meta/classes/distutils-native-base.bbclass         |    3 -
>  meta/classes/distutils-tools.bbclass               |    4 -
>  meta/classes/distutils.bbclass                     |    4 -
>  meta/classes/distutils3-base.bbclass               |    3 -
>  meta/classes/distutils3-native-base.bbclass        |    4 -
>  meta/classes/distutils3.bbclass                    |   24 -
>  meta/classes/gobject-introspection.bbclass         |    2 -
>  meta/classes/python-dir.bbclass                    |    6 +-
>  meta/classes/python3-dir.bbclass                   |    5 +
>  meta/classes/python3native.bbclass                 |    4 +-
>  meta/classes/sip.bbclass                           |   61 -
>  meta/conf/distro/include/default-versions.inc      |    5 -
>  meta/conf/distro/include/distro_alias.inc          |    2 -
>  meta/conf/distro/include/security_flags.inc        |    1 -
>  meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb |   11 +-
>  meta/recipes-connectivity/bind/bind_9.10.3-P3.bb   |    4 +-
>  meta/recipes-connectivity/bluez5/bluez5.inc        |    6 +-
>  meta/recipes-connectivity/connman/connman.inc      |    6 +-
>  meta/recipes-connectivity/neard/neard_0.15.bb      |   13 +-
>  .../nfs-utils/nfs-utils_1.3.3.bb                   |    6 +-
>  meta/recipes-connectivity/ofono/ofono.inc          |    6 +-
>  .../ofono/Revert-test-Convert-to-Python-3.patch    | 1270 --------------------
>  meta/recipes-connectivity/ofono/ofono_1.17.bb      |    1 -
>  meta/recipes-core/dbus/dbus-test_1.10.6.bb         |    2 +-
>  meta/recipes-core/glib-2.0/glib.inc                |   11 +-
>  meta/recipes-core/libxml/libxml2_2.9.3.bb          |    2 -
>  meta/recipes-core/systemd/systemd_229.bb           |    2 +-
>  meta/recipes-core/util-linux/util-linux.inc        |   11 +-
>  .../bootchart2/bootchart2_0.14.8.bb                |   16 +-
>  meta/recipes-devtools/gdb/gdb-common.inc           |    2 +-
>  meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |   12 +-
>  meta/recipes-devtools/gdb/gdb-cross.inc            |    6 +-
>  meta/recipes-devtools/gdb/gdb_7.11.bb              |    6 +-
>  meta/recipes-devtools/git/git.inc                  |    7 +-
>  ...h-usr-and-so-on-for-libraries-by-default-.patch |    0
>  .../files}/aarch64/_numpyconfig.h                  |    0
>  .../files/aarch64}/config.h                        |    0
>  .../files}/add-glibc-check.patch                   |    0
>  .../mipsel => python-numpy/files/arm}/config.h     |    0
>  .../files/arm}/numpyconfig.h                       |    0
>  .../files}/armeb/config.h                          |    0
>  .../files}/armeb/numpyconfig.h                     |    0
>  .../files}/mips/_numpyconfig.h                     |    0
>  .../files}/mips/config.h                           |    0
>  .../files/mips64}/_numpyconfig.h                   |    0
>  .../files/mips64}/config.h                         |    0
>  .../files}/mips64n32/_numpyconfig.h                |    0
>  .../files/mips64n32}/config.h                      |    0
>  .../arm => python-numpy/files/mipsel}/config.h     |    0
>  .../files/mipsel}/numpyconfig.h                    |    0
>  .../files}/powerpc/_numpyconfig.h                  |    0
>  .../files}/powerpc/config.h                        |    0
>  .../files/powerpc64}/_numpyconfig.h                |    0
>  .../files/powerpc64}/config.h                      |    0
>  .../files}/remove-build-path-in-comments.patch     |    0
>  .../files}/x86-64/_numpyconfig.h                   |    0
>  .../files}/x86-64/config.h                         |    0
>  .../files}/x86/config.h                            |    0
>  .../files}/x86/numpyconfig.h                       |    0
>  .../python-numpy_1.10.4.bb                         |    1 -
>  .../python-numpy/python3-numpy_1.10.4.bb           |  101 ++
>  ...ing-setup.py-force-paths-for-zlib-freetyp.patch |   55 -
>  .../allow.to.disable.some.features.patch           |   65 -
>  .../python-imaging/fix-freetype-includes.patch     |   30 -
>  .../python/python-imaging_1.1.7.bb                 |   45 -
>  meta/recipes-devtools/python/python-mako_1.0.3.bb  |    6 +
>  ...2-distutils-prefix-is-inside-staging-area.patch |   65 -
>  .../python/python-native_2.7.11.bb                 |    4 +-
>  .../python/python-pycairo_1.10.0.bb                |   41 -
>  .../python/python-pyrex-native_0.9.9.bb            |    5 -
>  .../python-pyrex/pyrex-fix-optimized-mode.patch    |   15 -
>  meta/recipes-devtools/python/python-pyrex_0.9.9.bb |   22 -
>  ...et-the-prefix-to-be-inside-staging-direct.patch |   51 +
>  ...{python-dbus_1.2.0.bb => python3-dbus_1.2.4.bb} |   22 +-
>  ...n-docutils_0.12.bb => python3-docutils_0.12.bb} |    4 +-
>  meta/recipes-devtools/python/python3-mako_1.0.3.bb |   24 +
>  .../python/python3-native_3.5.1.bb                 |    3 -
>  meta/recipes-devtools/python/python3-nose_1.3.7.bb |   24 +
>  .../python/python3-pycairo_1.10.0.bb               |   40 +
>  ...c-add-sysroot-path-to-GI_DATADIR-don-t-se.patch |    0
>  ...bject_3.18.2.bb => python3-pygobject_3.18.2.bb} |    8 +-
>  .../python/python3/110-enable-zlib.patch           |   21 -
>  ...2-distutils-prefix-is-inside-staging-area.patch |   49 +-
>  .../python/python3/unixccompiler.patch             |    6 +-
>  meta/recipes-devtools/python/python3_3.5.1.bb      |    8 +-
>  meta/recipes-devtools/python/python_2.7.11.bb      |    3 -
>  meta/recipes-devtools/qemu/qemu.inc                |    2 +-
>  meta/recipes-devtools/rpm/rpm_5.4+cvs.bb           |    2 +-
>  meta/recipes-devtools/rpm/rpm_5.4.16.bb            |    2 +-
>  .../subversion/subversion_1.9.3.bb                 |    2 +-
>  meta/recipes-devtools/swig/swig.inc                |    7 +-
>  meta/recipes-extended/cracklib/cracklib_2.9.5.bb   |   25 +-
>  meta/recipes-extended/libuser/libuser_0.62.bb      |    8 +-
>  .../newt/libnewt-python_0.52.18.bb                 |    6 +-
>  meta/recipes-extended/newt/libnewt_0.52.18.bb      |    3 -
>  .../packagegroup-core-full-cmdline.bb              |    1 -
>  meta/recipes-gnome/epiphany/epiphany_3.18.4.bb     |    1 -
>  .../gnome-desktop/gnome-desktop3_3.18.2.bb         |    2 +-
>  meta/recipes-gnome/gnome/gnome-doc-utils.inc       |   29 -
>  .../gnome-doc-utils/sysrooted-pkg-config.patch     |   35 -
>  .../use-usr-bin-env-for-python-in-xml2po.patch     |   30 -
>  .../gnome/gnome-doc-utils/xsltproc_nonet.patch     |   95 --
>  .../recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb |   12 -
>  .../gobject-introspection_1.46.0.bb                |    2 -
>  ...d-look-for-python-3.0-when-building-pytho.patch |   30 -
>  meta/recipes-kernel/lttng/lttng-tools_git.bb       |    7 +-
>  meta/recipes-kernel/lttng/lttng-ust_git.bb         |    9 +-
>  meta/recipes-kernel/perf/perf.bb                   |    2 -
>  meta/recipes-kernel/systemtap/systemtap_git.bb     |    5 +-
>  meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb       |    5 +-
>  meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb  |   12 +-
>  112 files changed, 384 insertions(+), 2198 deletions(-)
>  delete mode 100644 meta/classes/distutils-native-base.bbclass
>  delete mode 100644 meta/classes/distutils3-native-base.bbclass
>  create mode 100644 meta/classes/python3-dir.bbclass
>  delete mode 100644 meta/classes/sip.bbclass
>  delete mode 100644 meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/aarch64/_numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/powerpc64 => python-numpy/files/aarch64}/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/add-glibc-check.patch (100%)
>  rename meta/recipes-devtools/{python/python-numpy/mipsel => python-numpy/files/arm}/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/mipsel => python-numpy/files/arm}/numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/armeb/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/armeb/numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips/_numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/powerpc64 => python-numpy/files/mips64}/_numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/mips64n32 => python-numpy/files/mips64}/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/mips64n32/_numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/mips64 => python-numpy/files/mips64n32}/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/arm => python-numpy/files/mipsel}/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/arm => python-numpy/files/mipsel}/numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/powerpc/_numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/powerpc/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/mips64 => python-numpy/files/powerpc64}/_numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy/aarch64 => python-numpy/files/powerpc64}/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/remove-build-path-in-comments.patch (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86-64/_numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86-64/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86/config.h (100%)
>  rename meta/recipes-devtools/{python/python-numpy => python-numpy/files}/x86/numpyconfig.h (100%)
>  rename meta/recipes-devtools/{python => python-numpy}/python-numpy_1.10.4.bb (98%)
>  create mode 100644 meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb
>  delete mode 100644 meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
>  delete mode 100644 meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
>  delete mode 100644 meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
>  delete mode 100644 meta/recipes-devtools/python/python-imaging_1.1.7.bb
>  delete mode 100644 meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
>  delete mode 100644 meta/recipes-devtools/python/python-pycairo_1.10.0.bb
>  delete mode 100644 meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
>  delete mode 100644 meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
>  delete mode 100644 meta/recipes-devtools/python/python-pyrex_0.9.9.bb
>  create mode 100644 meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
>  rename meta/recipes-devtools/python/{python-dbus_1.2.0.bb => python3-dbus_1.2.4.bb} (53%)
>  rename meta/recipes-devtools/python/{python-docutils_0.12.bb => python3-docutils_0.12.bb} (92%)
>  create mode 100644 meta/recipes-devtools/python/python3-mako_1.0.3.bb
>  create mode 100644 meta/recipes-devtools/python/python3-nose_1.3.7.bb
>  create mode 100644 meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
>  rename meta/recipes-devtools/python/{python-pygobject => python3-pygobject}/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch (100%)
>  rename meta/recipes-devtools/python/{python-pygobject_3.18.2.bb => python3-pygobject_3.18.2.bb} (72%)
>  delete mode 100644 meta/recipes-devtools/python/python3/110-enable-zlib.patch
>  delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils.inc
>  delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
>  delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
>  delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
>  delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
>  delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch
> 



^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 09/45] python3: manipulate all of the config*/Makefile files, not just config/Makefile
  2016-05-24 12:50   ` Martin Jansa
@ 2016-05-25 12:37     ` alexander.kanavin
  0 siblings, 0 replies; 63+ messages in thread
From: alexander.kanavin @ 2016-05-25 12:37 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembedded-core

>>  	install -m 0644 Makefile.sysroot
>> ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
>> +	install -m 0644 Makefile.sysroot
>> ${D}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile
>
> Shouldn't it use "PYTHON_ABI" variable instead of "m"?

Thanks, I fixed it in the repo (will push a bit later).

Alex



^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 05/45] sip.bbclass: remove
  2016-05-24 16:35   ` Philip Balister
@ 2016-05-25 12:41     ` alexander.kanavin
  0 siblings, 0 replies; 63+ messages in thread
From: alexander.kanavin @ 2016-05-25 12:41 UTC (permalink / raw)
  To: Philip Balister; +Cc: openembedded-core

> The pyqt recipe in meta-qt4 uses sip.

It's using the sip recipe, but not the sip class. I don't see anything in
meta-qt4 that is using the class, do you?


Alex


^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 28/45] swig: move to Python 3
  2016-05-24 16:38   ` Philip Balister
@ 2016-05-25 12:45     ` alexander.kanavin
  2016-05-25 14:24       ` Philip Balister
  2016-05-27 13:21       ` Mike Looijmans
  0 siblings, 2 replies; 63+ messages in thread
From: alexander.kanavin @ 2016-05-25 12:45 UTC (permalink / raw)
  To: Philip Balister; +Cc: openembedded-core

> I'm trying to get my head around how this change will impact python2
> based programs that use swig, such as gnuradio.
>
> Does this mean all programs that use swig will need to move to python3
> now?

Probably. At least nothing in meta-oe or oe-core was impacted by this, as
far as I see, but if GNU radio isn't building properly anymore, then
copy-paste the error, and we'll work out a solution.

Alex



^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 00/45] Move recipes to use Python 3 whenever possible
  2016-05-24 20:59 ` [PATCH 00/45] Move recipes to use Python 3 whenever possible Mark Hatle
@ 2016-05-25 13:01   ` alexander.kanavin
  2016-05-25 13:47     ` alexander.kanavin
  2016-05-26 13:39     ` Mark Hatle
  0 siblings, 2 replies; 63+ messages in thread
From: alexander.kanavin @ 2016-05-25 13:01 UTC (permalink / raw)
  To: Mark Hatle; +Cc: openembedded-core

>> Consequently, rpm's python bindings (required by smartpm) stay at python
>> 2 as well
>> for now, even tough python 3 seems to be supported.
>
> Is there a porting guide or similar that can used to help identify what
> types of
> changes are needed.  I am not at all familiar with what python 3 needs
> specifically, but I do expect we will need to port these items.

Of course, there's a ton of such guides on the net. Here's the official one:
https://docs.python.org/3/howto/pyporting.html

> The yum version of createrepo will not work.  We need to port forward the
> component as appropriate -- or modify smartpm to use a newer version --
> assuming
> we can add missing pieces, as necessary.  (key is smartpm and createrepo
> need to
> be kept in sync.)

Can you say why it won't work, specifically, if we also replace smartpm
with yum or dnf at the same time? The only alternative I see is that we
have to fork the old version of createrepo and the abandoned upstream of
smartpm, port them to Python 3, and maintain them going forward - not a
light undertaking.

> Please create one (or three) defects and assign them to me for smartpm,
> createrepo, and rpm python3 support.  (I doubt I'll be the one doing the
> work,
> but I'll do my best to find someone to do the work.)

Yes, I'll do that now.

>> 5) LSB spec is implicitly requiring Python 2 (via requirement for
>> '/usr/bin/python').
>
> I expect the LSB will require python 2 for a while.  So we will need to
> continue
> to ensure that python 2 works, as well as python3.

Of course, Python 2 will be supported by upstream at least until 2020, and
so it'll be provided by oe-core at least until then. 2.7.12 should appear
soon.

Alex



^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 00/45] Move recipes to use Python 3 whenever possible
  2016-05-25 13:01   ` alexander.kanavin
@ 2016-05-25 13:47     ` alexander.kanavin
  2016-05-26 13:39     ` Mark Hatle
  1 sibling, 0 replies; 63+ messages in thread
From: alexander.kanavin @ 2016-05-25 13:47 UTC (permalink / raw)
  To: alexander.kanavin; +Cc: openembedded-core

>> Please create one (or three) defects and assign them to me for smartpm,
>> createrepo, and rpm python3 support.  (I doubt I'll be the one doing the
>> work,
>> but I'll do my best to find someone to do the work.)
>
> Yes, I'll do that now.

Filed at https://bugzilla.yoctoproject.org/show_bug.cgi?id=9675

Alex


^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 28/45] swig: move to Python 3
  2016-05-25 12:45     ` alexander.kanavin
@ 2016-05-25 14:24       ` Philip Balister
  2016-05-26 10:05         ` alexander.kanavin
  2016-05-27 13:21       ` Mike Looijmans
  1 sibling, 1 reply; 63+ messages in thread
From: Philip Balister @ 2016-05-25 14:24 UTC (permalink / raw)
  To: alexander.kanavin; +Cc: openembedded-core

On 05/25/2016 08:45 AM, alexander.kanavin@linux.intel.com wrote:
>> I'm trying to get my head around how this change will impact python2
>> based programs that use swig, such as gnuradio.
>>
>> Does this mean all programs that use swig will need to move to python3
>> now?
> 
> Probably. At least nothing in meta-oe or oe-core was impacted by this, as
> far as I see, but if GNU radio isn't building properly anymore, then
> copy-paste the error, and we'll work out a solution.

I did a quick read of the swig manual and it seems that swig built for
python3 will generate code that runs with both.

It would be nice to use PACKAGECONFIG to select 2 versus 3 so we can
build sdks that only have python2.

Philip

> 
> Alex
> 
> 


^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 28/45] swig: move to Python 3
  2016-05-25 14:24       ` Philip Balister
@ 2016-05-26 10:05         ` alexander.kanavin
  0 siblings, 0 replies; 63+ messages in thread
From: alexander.kanavin @ 2016-05-26 10:05 UTC (permalink / raw)
  To: Philip Balister; +Cc: openembedded-core

>
> It would be nice to use PACKAGECONFIG to select 2 versus 3 so we can
> build sdks that only have python2.

This requires a conditional class inherit (pythonnative vs.
python3native), which you can't at the moment do with PACKAGECONFIG.

If you really need this, make a swig-python2 recipe.

Alex


^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 00/45] Move recipes to use Python 3 whenever possible
  2016-05-25 13:01   ` alexander.kanavin
  2016-05-25 13:47     ` alexander.kanavin
@ 2016-05-26 13:39     ` Mark Hatle
  2016-05-26 13:49       ` Alexander Kanavin
  1 sibling, 1 reply; 63+ messages in thread
From: Mark Hatle @ 2016-05-26 13:39 UTC (permalink / raw)
  To: alexander.kanavin; +Cc: openembedded-core

On 5/25/16 8:01 AM, alexander.kanavin@linux.intel.com wrote:
>>> Consequently, rpm's python bindings (required by smartpm) stay at python
>>> 2 as well
>>> for now, even tough python 3 seems to be supported.
>>
>> Is there a porting guide or similar that can used to help identify what
>> types of
>> changes are needed.  I am not at all familiar with what python 3 needs
>> specifically, but I do expect we will need to port these items.
> 
> Of course, there's a ton of such guides on the net. Here's the official one:
> https://docs.python.org/3/howto/pyporting.html
> 
>> The yum version of createrepo will not work.  We need to port forward the
>> component as appropriate -- or modify smartpm to use a newer version --
>> assuming
>> we can add missing pieces, as necessary.  (key is smartpm and createrepo
>> need to
>> be kept in sync.)
> 
> Can you say why it won't work, specifically, if we also replace smartpm
> with yum or dnf at the same time? The only alternative I see is that we
> have to fork the old version of createrepo and the abandoned upstream of
> smartpm, port them to Python 3, and maintain them going forward - not a
> light undertaking.

The interchange format of the newer createrepo is very different then the older
format the smartpm uses.  Thus they have to be kept in sync.  The new format
also does not have the extensions we added for the recommended package syntax.

createrepo is very small, and it's not YUM dependent.  It simply reads the
metadata (via the rpm interface) and dumps out data in an XML format.. then does
a few more things as well.  So porting the existing one forward shouldn't be
difficult.  It's just not clear at this point what the best behavior will be to
do.. port createrepo forward -- or update smartpm to support the newer format
(with appropriate extensions.)

--Mark

>> Please create one (or three) defects and assign them to me for smartpm,
>> createrepo, and rpm python3 support.  (I doubt I'll be the one doing the
>> work,
>> but I'll do my best to find someone to do the work.)
> 
> Yes, I'll do that now.
> 
>>> 5) LSB spec is implicitly requiring Python 2 (via requirement for
>>> '/usr/bin/python').
>>
>> I expect the LSB will require python 2 for a while.  So we will need to
>> continue
>> to ensure that python 2 works, as well as python3.
> 
> Of course, Python 2 will be supported by upstream at least until 2020, and
> so it'll be provided by oe-core at least until then. 2.7.12 should appear
> soon.
> 
> Alex
> 



^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 00/45] Move recipes to use Python 3 whenever possible
  2016-05-26 13:39     ` Mark Hatle
@ 2016-05-26 13:49       ` Alexander Kanavin
  2016-05-26 14:02         ` Mark Hatle
  0 siblings, 1 reply; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-26 13:49 UTC (permalink / raw)
  To: Mark Hatle; +Cc: openembedded-core

On 05/26/2016 04:39 PM, Mark Hatle wrote:

> The interchange format of the newer createrepo is very different then the older
> format the smartpm uses.  Thus they have to be kept in sync.  The new format
> also does not have the extensions we added for the recommended package syntax.
>
> createrepo is very small, and it's not YUM dependent.  It simply reads the
> metadata (via the rpm interface) and dumps out data in an XML format.. then does
> a few more things as well.  So porting the existing one forward shouldn't be
> difficult.  It's just not clear at this point what the best behavior will be to
> do.. port createrepo forward -- or update smartpm to support the newer format
> (with appropriate extensions.)

I still don't understand why introducing yum/dnf as a replacement for 
smartpm should be avoided at all costs. Like smartpm, it's fully written 
in Python, so that theoretically should be less painful that building 
working binaries.

Alex



^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 00/45] Move recipes to use Python 3 whenever possible
  2016-05-26 13:49       ` Alexander Kanavin
@ 2016-05-26 14:02         ` Mark Hatle
  0 siblings, 0 replies; 63+ messages in thread
From: Mark Hatle @ 2016-05-26 14:02 UTC (permalink / raw)
  To: Alexander Kanavin; +Cc: openembedded-core

On 5/26/16 8:49 AM, Alexander Kanavin wrote:
> On 05/26/2016 04:39 PM, Mark Hatle wrote:
> 
>> The interchange format of the newer createrepo is very different then the older
>> format the smartpm uses.  Thus they have to be kept in sync.  The new format
>> also does not have the extensions we added for the recommended package syntax.
>>
>> createrepo is very small, and it's not YUM dependent.  It simply reads the
>> metadata (via the rpm interface) and dumps out data in an XML format.. then does
>> a few more things as well.  So porting the existing one forward shouldn't be
>> difficult.  It's just not clear at this point what the best behavior will be to
>> do.. port createrepo forward -- or update smartpm to support the newer format
>> (with appropriate extensions.)
> 
> I still don't understand why introducing yum/dnf as a replacement for 
> smartpm should be avoided at all costs. Like smartpm, it's fully written 
> in Python, so that theoretically should be less painful that building 
> working binaries.

I never said it should be avoided at all costs.  Yum is dead.  So any
discussions would be on DNF.

DNF has many library dependencies that smartpm does not have.  It also has a
larger overhead for other resources.  (But with that said, it also has other
advantages in some cases, like support for DeltaRPM.)

We should investigate DNF, but at present DNF [and the index format] do not
understand the recommended syntax that is used by OE/RPM5.  DNF also has some
issues with the other items that RPM5 has implemented (self-signed packages,
package arch is not 'statically defined', etc.)  Smartpm does not have a problem
with any of these, and is quite small.

Smartpm however does have an issue (maybe) in that it's resolution code is
written in python and likely is much slower then using libsolv [which DNF uses].

So it's not that I'm dismissing DNF, it's that we need to determine what is
necessary to move smartpm forward.  We need to investigate what it will take to
port over DNF... and we need to understand performance impacts (runtime, disk
space, and dependency needs.)

--Mark

> Alex
> 



^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 28/45] swig: move to Python 3
  2016-05-25 12:45     ` alexander.kanavin
  2016-05-25 14:24       ` Philip Balister
@ 2016-05-27 13:21       ` Mike Looijmans
  2016-05-30  9:06         ` Alexander Kanavin
  1 sibling, 1 reply; 63+ messages in thread
From: Mike Looijmans @ 2016-05-27 13:21 UTC (permalink / raw)
  To: openembedded-core

On 25-05-16 14:45, alexander.kanavin@linux.intel.com wrote:
>> I'm trying to get my head around how this change will impact python2
>> based programs that use swig, such as gnuradio.
>>
>> Does this mean all programs that use swig will need to move to python3
>> now?
>
> Probably. At least nothing in meta-oe or oe-core was impacted by this, as
> far as I see, but if GNU radio isn't building properly anymore, then
> copy-paste the error, and we'll work out a solution.

This probably means that projects using Python 2 extensively will be forced to 
either "freeze" the OE version to the state before the transition or attempt 
to maintain a "python-2" fork.




Kind regards,

Mike Looijmans
System Expert

TOPIC Embedded Products
Eindhovenseweg 32-C, NL-5683 KH Best
Postbus 440, NL-5680 AK Best
Telefoon: +31 (0) 499 33 69 79
E-mail: mike.looijmans@topicproducts.com
Website: www.topicproducts.com

Please consider the environment before printing this e-mail







^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 28/45] swig: move to Python 3
  2016-05-27 13:21       ` Mike Looijmans
@ 2016-05-30  9:06         ` Alexander Kanavin
  0 siblings, 0 replies; 63+ messages in thread
From: Alexander Kanavin @ 2016-05-30  9:06 UTC (permalink / raw)
  To: openembedded-core

On 05/27/2016 04:21 PM, Mike Looijmans wrote:

> This probably means that projects using Python 2 extensively will be
> forced to either "freeze" the OE version to the state before the
> transition or attempt to maintain a "python-2" fork.

Not at all. Oe-core will continue to provide python 2 recipes, swig is 
now compatible with both 2 and 3, the supporting 3rd party py2 libraries 
that will be removed from oe-core will be added to meta-oe at the same 
time (python-dbus), or should be trivial to add, if anyone actually 
needs them (python-git). Python 2 users should be able to continue with 
minimal (or zero) tweaks.

That said, we want to make it clear that it's time to get serious about 
moving to Python 3. It's been out for many years, the only excuses left 
are the bad ones.

Alex


^ permalink raw reply	[flat|nested] 63+ messages in thread

* Re: [PATCH 00/45] Move recipes to use Python 3 whenever possible
  2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
                   ` (45 preceding siblings ...)
  2016-05-24 20:59 ` [PATCH 00/45] Move recipes to use Python 3 whenever possible Mark Hatle
@ 2016-05-31  7:44 ` Richard Purdie
  46 siblings, 0 replies; 63+ messages in thread
From: Richard Purdie @ 2016-05-31  7:44 UTC (permalink / raw)
  To: Alexander Kanavin, openembedded-core

On Tue, 2016-05-24 at 14:53 +0300, Alexander Kanavin wrote:
> This patchset updates recipes to use Python 3 whenever possible. A
> few items
> cannot be moved at the moment for various reasons, here they are:

I put this through a round of testing on the autobuilder overnight.

I just replied to Maxin about the gst-plugins-bad/bluez issue, the
world build also is a bit of a mess:

https://autobuilder.yoctoproject.org/main/builders/nightly-world-lsb/bu
ilds/528/steps/BuildImages/logs/stdio

python3-numpy looks like it can't find various symbols it thinks it
should be able to.

There are more gdbus-codegen issues - perhaps that isn't bluez but
something else causing them? (triggered gtk3+ and libsecret to fail
too) Since various pieces did build is this a dependency issue?

python3-dbus doesn't build on x32:

https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds/7
98/steps/BuildImages/logs/stdio

Cheers,

Richard





^ permalink raw reply	[flat|nested] 63+ messages in thread

end of thread, other threads:[~2016-05-31  7:44 UTC | newest]

Thread overview: 63+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-24 11:53 [PATCH 00/45] Move recipes to use Python 3 whenever possible Alexander Kanavin
2016-05-24 11:53 ` [PATCH 01/45] python-native, python3-native: remove the use of exported HOST_SYS and BUILD_SYS variables Alexander Kanavin
2016-05-24 11:53 ` [PATCH 02/45] distutils-native-base.bbclass, distutils3-native-base.bbclass: remove Alexander Kanavin
2016-05-24 11:53 ` [PATCH 03/45] python3-dir.bbclass: add a separate class for Python 3 Alexander Kanavin
2016-05-24 11:53 ` [PATCH 04/45] default-versions.inc: drop python-related defaults Alexander Kanavin
2016-05-24 11:53 ` [PATCH 05/45] sip.bbclass: remove Alexander Kanavin
2016-05-24 16:35   ` Philip Balister
2016-05-25 12:41     ` alexander.kanavin
2016-05-24 11:53 ` [PATCH 06/45] avahi-ui: remove support for building a python module Alexander Kanavin
2016-05-24 11:53 ` [PATCH 07/45] bind: switch Python dependency to Python 3.x Alexander Kanavin
2016-05-24 11:53 ` [PATCH 08/45] python-dbus: update to 1.2.4, port to python 3 Alexander Kanavin
2016-05-24 11:53 ` [PATCH 09/45] python3: manipulate all of the config*/Makefile files, not just config/Makefile Alexander Kanavin
2016-05-24 12:50   ` Martin Jansa
2016-05-25 12:37     ` alexander.kanavin
2016-05-24 11:53 ` [PATCH 10/45] python3: drop 110-enable-zlib.patch Alexander Kanavin
2016-05-24 11:54 ` [PATCH 11/45] glib: move to Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 12/45] dbus-test: remove unneeded pygobject dependency Alexander Kanavin
2016-05-24 11:54 ` [PATCH 13/45] python-pygobject: port to Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 14/45] neard: do not package python test scripts Alexander Kanavin
2016-05-24 11:54 ` [PATCH 15/45] bluez5: switch to Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 16/45] connman: do not install Python test scripts Alexander Kanavin
2016-05-24 11:54 ` [PATCH 17/45] ofono: drop the custom-made revert to Python 2 from Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 18/45] packagegroup-core-full-cmdline: drop python-dbus from the list of services Alexander Kanavin
2016-05-24 11:54 ` [PATCH 19/45] nfs-utils: switch to Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 20/45] systemd: drop python dependency for ptests Alexander Kanavin
2016-05-24 11:54 ` [PATCH 21/45] util-linux: move to Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 22/45] python-pycairo: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 23/45] bootchart2: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 24/45] gdb: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 25/45] git: remove Python package (to which nothing was packaged) Alexander Kanavin
2016-05-24 11:54 ` [PATCH 26/45] qemu: remove runtime python dependency Alexander Kanavin
2016-05-24 11:54 ` [PATCH 27/45] subversion: remove unnecessary " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 28/45] swig: move to Python 3 Alexander Kanavin
2016-05-24 16:38   ` Philip Balister
2016-05-25 12:45     ` alexander.kanavin
2016-05-25 14:24       ` Philip Balister
2016-05-26 10:05         ` alexander.kanavin
2016-05-27 13:21       ` Mike Looijmans
2016-05-30  9:06         ` Alexander Kanavin
2016-05-24 11:54 ` [PATCH 29/45] python-pyrex: remove unused recipe Alexander Kanavin
2016-05-24 11:54 ` [PATCH 30/45] python-imaging: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 31/45] python-docutils: move to Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 32/45] cracklib: disable building the python module Alexander Kanavin
2016-05-24 11:54 ` [PATCH 33/45] libuser: move to Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 34/45] libnewt-python: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 35/45] gnome-doc-utils: remove recipe Alexander Kanavin
2016-05-24 11:54 ` [PATCH 36/45] lttng-tools: move to Python 3 Alexander Kanavin
2016-05-24 11:54 ` [PATCH 37/45] lttng-ust: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 38/45] systemtap: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 39/45] libcap-ng: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 40/45] hwlatdetect: " Alexander Kanavin
2016-05-24 11:54 ` [PATCH 41/45] python3-mako: add a Python 3 recipe Alexander Kanavin
2016-05-24 11:54 ` [PATCH 42/45] python3-nose: add a recipe Alexander Kanavin
2016-05-24 11:54 ` [PATCH 43/45] python3: add = to -L linking option only when the path is absolute Alexander Kanavin
2016-05-24 11:54 ` [PATCH 44/45] python-numpy: move recipe to own directory Alexander Kanavin
2016-05-24 11:54 ` [PATCH 45/45] python3-numpy: add a recipe Alexander Kanavin
2016-05-24 20:59 ` [PATCH 00/45] Move recipes to use Python 3 whenever possible Mark Hatle
2016-05-25 13:01   ` alexander.kanavin
2016-05-25 13:47     ` alexander.kanavin
2016-05-26 13:39     ` Mark Hatle
2016-05-26 13:49       ` Alexander Kanavin
2016-05-26 14:02         ` Mark Hatle
2016-05-31  7:44 ` Richard Purdie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox