[Buildroot] [PATCH 000/107] Drop python 2.7

[Buildroot] [PATCH 000/107] Drop python 2.7

[Peter Korsgaard]

Python 2.7 is EOL since April 2020 and almost all packages support
python 3, so drop it before the 2022.02 release.

It is a big series, but the changes are mainly mechanical in nature.

There is still some cleanup to do, E.G. the python2 support in
pkg-python and the host python-setuptools package - But this is IMHO
the minimum changes before -rc1.

Peter Korsgaard (107):
  support/testing: drop python2 tests
  package/python: drop target package
  package/alsa-lib: drop python2 support
  package/bmap-tools: drop python2 support
  package/boost: drop python2 support
  package/cifs-utils: drop python2 support
  package/cracklib: move python support to python3
  package/crudini: drop python2 support
  package/dbus-python: drop python2 support
  package/docker-compose: drop reference to BR2_PACKAGE_PYTHON
  package/dstat: drop python2 support
  package/evemu: drop python2 support
  package/fail2ban: drop python2 support
  package/glsandbox-player: drop reference to python2
  package/gpsd: drop python2 support
  package/gst1-devtools: drop python2 support
  package/i2c-tools: drop python2 support
  package/iotop: drop python2 support
  package/jack2: drop python2 support
  package/kmod: drop python2 support
  package/libcec: drop python2 support
  package/libevent: drop python2 support
  package/libftdi1: drop python2 support
  package/libiio: drop python2 support
  package/libpwquality: drop python2 support
  package/libsigrokdecode: drop reference to python2
  package/libsoc: drop python2 support
  package/lttng-libust: drop python2 support
  package/networkd-dispatcher: drop reference to python2
  package/nftables: drop python2 support
  package/ogre: drop python2 support
  package/opkg-utils: drop reference to python2
  package/owfs: drop python support
  package/python-aenum: drop python2 support
  package/python-argon2-cffi: drop python2 support
  package/python-bsdiff4: drop python2 support
  package/python-can: drop python2 support
  package/python-couchdb: drop python2 support
  package/python-dicttoxml: drop python2 support
  package/python-dpkt: drop python2 support
  package/python-esptool: drop python2 support
  package/python-fire: drop python2 support
  package/python-flask: drop python2 support
  package/python-jsonschema: drop python2 support
  package/python-libconfig: drop python2 support
  package/python-logbook: drop python2 support
  package/python-lxml: drop python2 support
  package/python-m2crypto: drop python2 support
  package/python-pexpect: drop python2 support
  package/python-pickleshare: drop python2 support
  package/python-pymodbus: drop python2 support
  package/python-pyqrcode: drop python2 support
  package/python-pyqt5: drop python2 support
  package/python-pyroute2: drop python2 support
  package/python-pyudev: drop python2 support
  package/python-raven: drop python2 support
  package/python-reentry: drop python2 support
  package/python-remi: drop python2 support
  package/python-scapy: drop python2 support
  package/python-sentry-sdk: drop python2 support
  package/python-setuptools: drop python2 support
  package/python-sip: drop python2 support
  package/python-txtorcon: drop python2 support
  package/python-typing-extensions: drop python2 support
  package/python-urllib3: drop python2 support
  package/python-web2py: drop python2 support
  package/python-webob: drop python2 support
  package/python-websocket-client: drop python2 support
  package/python-werkzeug: drop python2 support
  package/python-whoosh: drop python2 support
  package/python-xlrd: drop python2 support
  package/python-xmltodict: drop python2 support
  package/python3: drop references to python2
  package/ranger: drop python2 support
  package/selinux-python: drop reference to python2
  package/snmpclitools: drop python2 support
  package/supervisor: drop python2 support
  package/suricata: drop python2 support
  package/syslog-ng: drop python2 support
  package/tovid: drop python2 support
  package/trace-cmd: drop python2 support
  package/util-linux: drop python2 support
  package/zfs: drop python2 support
  package/python: drop host package
  package/python-backports-abc: drop python2 specific package
  package/python-backports-shutil-get-terminal-size: drop python2
    specific package
  package/python-backports-ssl-match-hostname: drop python2 specific
    package
  package/python-futures: drop python2 specific package
  package/python-id3: drop python2 specific package
  package/python-ipaddr: drop python2 specific package
  package/python-ipaddress: drop python2 specific package
  package/python-mad: drop python2 specific package
  package/python-nfc: drop python2 specific package
  package/python-pam: drop python2 specific package
  package/python-pathlib2: drop python2 specific package
  package/python-pypcap: drop python2 specific package
  package/python-pyro: drop python2 specific package
  package/python-singledispatch: drop python2 specific package
  package/python-subprocess32: drop python2 specific package
  package/python-typing: drop python2 specific package
  package/python-yieldfrom: drop python2 specific package
  package/python-configobj: drop python2 specific package
  package/python-dialog: drop python2 specific package
  package/python-enum: drop python2 specific package
  package/python-enum34: drop python2 specific package
  package/python-functools32: drop python2 specific package
  docs/manual: drop python2 references

 Config.in.legacy                              | 140 ++++++++
 DEVELOPERS                                    |  15 -
 docs/manual/adding-packages-python.txt        |   8 -
 docs/manual/writing-rules.txt                 |   8 +-
 package/Config.in                             |  25 +-
 package/Config.in.host                        |   1 -
 package/alsa-lib/Config.in                    |   2 +-
 package/alsa-lib/alsa-lib.mk                  |  11 +-
 package/bmap-tools/Config.in                  |   5 +-
 package/boost/Config.in                       |   2 +-
 package/boost/boost.mk                        |  11 +-
 package/cifs-utils/Config.in                  |   2 +-
 package/cracklib/cracklib.mk                  |   7 +-
 package/crudini/Config.in                     |   2 +-
 package/dbus-python/Config.in                 |   8 +-
 package/dbus-python/dbus-python.mk            |  28 +-
 package/docker-compose/Config.in              |   9 +-
 package/dstat/Config.in                       |  10 +-
 package/evemu/evemu.mk                        |   4 +-
 package/fail2ban/Config.in                    |   2 +-
 package/fail2ban/fail2ban.mk                  |   7 +-
 package/glslsandbox-player/Config.in          |   1 -
 package/gpsd/Config.in                        |   4 +-
 package/gpsd/gpsd.mk                          |   4 -
 package/gstreamer1/gst1-devtools/Config.in    |   6 +-
 package/i2c-tools/i2c-tools.mk                |   8 +-
 package/iotop/Config.in                       |   9 +-
 package/jack2/Config.in                       |   5 +-
 package/kmod/kmod.mk                          |   4 +-
 package/libcec/libcec.mk                      |   4 +-
 package/libevent/libevent.mk                  |   2 +-
 package/libftdi1/Config.in                    |   2 +-
 package/libftdi1/libftdi1.mk                  |   2 +-
 package/libiio/Config.in                      |   2 +-
 package/libiio/libiio.mk                      |  10 +-
 package/libpwquality/libpwquality.mk          |   4 +-
 package/libsigrokdecode/Config.in             |   6 -
 package/libsoc/libsoc.mk                      |   6 +-
 package/lttng-libust/lttng-libust.mk          |   5 +-
 package/networkd-dispatcher/Config.in         |   2 -
 package/nftables/nftables.mk                  |   4 +-
 package/ogre/ogre.mk                          |   5 +-
 package/opkg-utils/Config.in                  |   6 -
 package/owfs/owfs.mk                          |  24 +-
 package/python-aenum/python-aenum.mk          |   9 -
 package/python-argon2-cffi/Config.in          |   1 -
 package/python-backports-abc/Config.in        |   8 -
 .../python-backports-abc.hash                 |   5 -
 .../python-backports-abc.mk                   |  14 -
 .../Config.in                                 |   8 -
 ...on-backports-shutil-get-terminal-size.hash |   5 -
 ...thon-backports-shutil-get-terminal-size.mk |  14 -
 .../Config.in                                 |   7 -
 .../python-backports-ssl-match-hostname.hash  |   5 -
 .../python-backports-ssl-match-hostname.mk    |  14 -
 package/python-bsdiff4/Config.in              |   3 +-
 package/python-can/Config.in                  |   7 +-
 package/python-configobj/Config.in            |  10 -
 .../python-configobj/python-configobj.hash    |   3 -
 package/python-configobj/python-configobj.mk  |  14 -
 package/python-couchdb/Config.in              |   3 +-
 package/python-dialog/Config.in               |  10 -
 package/python-dialog/python-dialog.hash      |   5 -
 package/python-dialog/python-dialog.mk        |  15 -
 package/python-dicttoxml/Config.in            |   3 +-
 package/python-dpkt/Config.in                 |   3 +-
 package/python-enum/Config.in                 |  12 -
 package/python-enum/python-enum.hash          |   5 -
 package/python-enum/python-enum.mk            |  14 -
 package/python-enum34/Config.in               |  12 -
 package/python-enum34/python-enum34.hash      |   5 -
 package/python-enum34/python-enum34.mk        |  17 -
 package/python-esptool/Config.in              |   3 +-
 package/python-fire/Config.in                 |   1 -
 package/python-fire/python-fire.mk            |   9 -
 package/python-flask/Config.in                |   7 +-
 package/python-functools32/Config.in          |   8 -
 .../python-functools32.hash                   |   4 -
 .../python-functools32/python-functools32.mk  |  14 -
 package/python-futures/Config.in              |   7 -
 package/python-futures/python-futures.hash    |   5 -
 package/python-futures/python-futures.mk      |  14 -
 package/python-id3/Config.in                  |   9 -
 package/python-id3/python-id3.hash            |   3 -
 package/python-id3/python-id3.mk              |  14 -
 package/python-ipaddr/Config.in               |   9 -
 package/python-ipaddr/python-ipaddr.hash      |   5 -
 package/python-ipaddr/python-ipaddr.mk        |  14 -
 package/python-ipaddress/Config.in            |   7 -
 .../python-ipaddress/python-ipaddress.hash    |   5 -
 package/python-ipaddress/python-ipaddress.mk  |  14 -
 package/python-jsonschema/Config.in           |   1 -
 package/python-libconfig/python-libconfig.mk  |   8 +-
 package/python-logbook/Config.in              |   3 +-
 package/python-lxml/Config.in                 |   3 +-
 package/python-m2crypto/Config.in             |   7 +-
 package/python-mad/Config.in                  |   9 -
 package/python-mad/python-mad.hash            |   3 -
 package/python-mad/python-mad.mk              |  29 --
 package/python-nfc/Config.in                  |  16 -
 package/python-nfc/python-nfc.hash            |   3 -
 package/python-nfc/python-nfc.mk              |  14 -
 package/python-pam/0001-dealloc.patch         |  25 --
 package/python-pam/0002-nofree.patch          |  68 ----
 .../0003-memory-errors-CVE2012-1502.patch     | 136 --------
 package/python-pam/Config.in                  |  16 -
 package/python-pam/python-pam.hash            |   3 -
 package/python-pam/python-pam.mk              |  16 -
 package/python-pathlib2/Config.in             |  13 -
 package/python-pathlib2/python-pathlib2.hash  |   5 -
 package/python-pathlib2/python-pathlib2.mk    |  14 -
 package/python-pexpect/python-pexpect.mk      |  10 -
 package/python-pickleshare/Config.in          |   1 -
 package/python-pymodbus/python-pymodbus.mk    |   9 -
 package/python-pypcap/Config.in               |   9 -
 package/python-pypcap/python-pypcap.hash      |   3 -
 package/python-pypcap/python-pypcap.mk        |  21 --
 package/python-pyqrcode/Config.in             |   6 +-
 package/python-pyqt5/python-pyqt5.mk          |  14 +-
 package/python-pyro/Config.in                 |  10 -
 package/python-pyro/python-pyro.hash          |   5 -
 package/python-pyro/python-pyro.mk            |  16 -
 package/python-pyroute2/Config.in             |   3 +-
 package/python-pyudev/Config.in               |   3 +-
 package/python-raven/Config.in                |   9 +-
 package/python-reentry/Config.in              |   1 -
 package/python-remi/Config.in                 |   3 +-
 package/python-scapy/Config.in                |   3 +-
 .../python-sentry-sdk/python-sentry-sdk.mk    |  10 -
 package/python-setuptools/Config.in           |   6 +-
 .../python-setuptools/python-setuptools.mk    |  16 -
 package/python-singledispatch/Config.in       |   9 -
 .../python-singledispatch.hash                |   5 -
 .../python-singledispatch.mk                  |  14 -
 package/python-sip/python-sip.mk              |  19 +-
 package/python-subprocess32/Config.in         |  13 -
 .../python-subprocess32.hash                  |   5 -
 .../python-subprocess32.mk                    |  31 --
 package/python-txtorcon/python-txtorcon.mk    |   9 -
 package/python-typing-extensions/Config.in    |   1 -
 package/python-typing/Config.in               |   8 -
 package/python-typing/python-typing.hash      |   5 -
 package/python-typing/python-typing.mk        |  15 -
 package/python-urllib3/Config.in              |   3 +-
 package/python-web2py/Config.in               |   9 +-
 package/python-webob/Config.in                |   4 +-
 package/python-websocket-client/Config.in     |   3 +-
 package/python-werkzeug/Config.in             |   3 +-
 package/python-whoosh/Config.in               |   3 +-
 package/python-xlrd/Config.in                 |   6 +-
 package/python-xmltodict/Config.in            |   3 +-
 package/python-yieldfrom/Config.in            |   8 -
 .../python-yieldfrom/python-yieldfrom.hash    |   5 -
 package/python-yieldfrom/python-yieldfrom.mk  |  15 -
 ...-do-not-add-invalid-header-locations.patch |  42 ---
 ...get_python_inc-for-cross-compilation.patch |  48 ---
 ...nstall-location-of-_sysconfigdata.py.patch |  88 -----
 ...ilation-of-.pyc-and-.pyo-conditional.patch |  78 -----
 ...taddrinfo-test-for-cross-compilation.patch |  31 --
 ...astructure-to-be-able-to-disable-ext.patch |  81 -----
 ...y-header-paths-for-cross-compilation.patch |  64 ----
 ...ook-in-usr-lib-termcap-for-libraries.patch |  31 --
 ...9-Fix-python-config-for-cross-builds.patch | 229 -------------
 ...ove-the-python-symlink-install-rules.patch |  43 ---
 .../0011-Don-t-add-multiarch-paths.patch      |  36 ---
 .../0012-Abort-on-failed-module-build.patch   |  30 --
 ...d-when-threads-are-not-used-availabl.patch |  58 ----
 .../python/0014-Serial-ioctl-workaround.patch |  33 --
 ...e-shebang-of-Python-scripts-for-cros.patch |  35 --
 ...-disable-installation-of-test-module.patch | 105 ------
 .../0017-Add-an-option-to-disable-pydoc.patch |  89 ------
 ...018-Add-an-option-to-disable-lib2to3.patch |  92 ------
 ...option-to-disable-the-sqlite3-module.patch |  69 ----
 ...d-an-option-to-disable-the-tk-module.patch |  73 -----
 ...-option-to-disable-the-curses-module.patch |  61 ----
 .../0022-Add-an-option-to-disable-expat.patch |  92 ------
 ...-Add-an-option-to-disable-CJK-codecs.patch |  32 --
 .../0024-Add-an-option-to-disable-NIS.patch   |  35 --
 ...Add-an-option-to-disable-unicodedata.patch |  32 --
 .../0026-Add-an-option-to-disable-bsddb.patch |  87 -----
 ...-an-option-to-disable-the-ssl-module.patch |  32 --
 ...-an-option-to-disable-the-bz2-module.patch |  32 --
 ...an-option-to-disable-the-zlib-module.patch |  32 --
 .../0030-Do-not-install-the-idle-editor.patch |  55 ----
 ...on-to-disable-the-ossaudiodev-module.patch |  32 --
 ...option-to-disable-the-hashlib-module.patch |  32 --
 ...an-option-to-disable-readline-module.patch |  32 --
 ...locale-and-set-to-default-when-addin.patch |  37 ---
 package/python/Config.in                      | 139 --------
 package/python/Config.in.host                 |  16 -
 package/python/python.hash                    |   5 -
 package/python/python.mk                      | 302 ------------------
 package/python3/Config.in                     |   1 -
 package/python3/python3.mk                    |   2 -
 package/ranger/Config.in                      |   5 +-
 package/selinux-python/Config.in              |   5 -
 package/snmpclitools/Config.in                |   2 +-
 package/supervisor/Config.in                  |   3 +-
 package/suricata/suricata.mk                  |   4 +-
 package/syslog-ng/syslog-ng.mk                |   7 +-
 package/tovid/Config.in                       |   6 +-
 package/trace-cmd/trace-cmd.mk                |   5 +-
 package/util-linux/util-linux.mk              |   4 +-
 package/zfs/zfs.mk                            |  12 +-
 .../package/sample_python_subprocess32.py     |   6 -
 .../testing/tests/package/test_bmap_tools.py  |   8 -
 support/testing/tests/package/test_crudini.py |   8 -
 .../testing/tests/package/test_libftdi1.py    |  12 -
 support/testing/tests/package/test_python.py  |  14 -
 .../testing/tests/package/test_python_argh.py |   9 -
 .../tests/package/test_python_bitstring.py    |  10 -
 .../testing/tests/package/test_python_can.py  |  11 -
 .../testing/tests/package/test_python_cbor.py |  11 -
 .../tests/package/test_python_click.py        |   9 -
 .../tests/package/test_python_constantly.py   |  10 -
 .../tests/package/test_python_gnupg.py        |  10 -
 .../tests/package/test_python_incremental.py  |  11 -
 .../tests/package/test_python_passlib.py      |  11 -
 .../tests/package/test_python_pexpect.py      |  10 -
 .../tests/package/test_python_pynacl.py       |  11 -
 .../tests/package/test_python_pyyaml.py       |  11 -
 .../tests/package/test_python_subprocess32.py |  11 -
 .../tests/package/test_python_ubjson.py       |  11 -
 223 files changed, 270 insertions(+), 3981 deletions(-)
 delete mode 100644 package/python-backports-abc/Config.in
 delete mode 100644 package/python-backports-abc/python-backports-abc.hash
 delete mode 100644 package/python-backports-abc/python-backports-abc.mk
 delete mode 100644 package/python-backports-shutil-get-terminal-size/Config.in
 delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
 delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk
 delete mode 100644 package/python-backports-ssl-match-hostname/Config.in
 delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash
 delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk
 delete mode 100644 package/python-configobj/Config.in
 delete mode 100644 package/python-configobj/python-configobj.hash
 delete mode 100644 package/python-configobj/python-configobj.mk
 delete mode 100644 package/python-dialog/Config.in
 delete mode 100644 package/python-dialog/python-dialog.hash
 delete mode 100644 package/python-dialog/python-dialog.mk
 delete mode 100644 package/python-enum/Config.in
 delete mode 100644 package/python-enum/python-enum.hash
 delete mode 100644 package/python-enum/python-enum.mk
 delete mode 100644 package/python-enum34/Config.in
 delete mode 100644 package/python-enum34/python-enum34.hash
 delete mode 100644 package/python-enum34/python-enum34.mk
 delete mode 100644 package/python-functools32/Config.in
 delete mode 100644 package/python-functools32/python-functools32.hash
 delete mode 100644 package/python-functools32/python-functools32.mk
 delete mode 100644 package/python-futures/Config.in
 delete mode 100644 package/python-futures/python-futures.hash
 delete mode 100644 package/python-futures/python-futures.mk
 delete mode 100644 package/python-id3/Config.in
 delete mode 100644 package/python-id3/python-id3.hash
 delete mode 100644 package/python-id3/python-id3.mk
 delete mode 100644 package/python-ipaddr/Config.in
 delete mode 100644 package/python-ipaddr/python-ipaddr.hash
 delete mode 100644 package/python-ipaddr/python-ipaddr.mk
 delete mode 100644 package/python-ipaddress/Config.in
 delete mode 100644 package/python-ipaddress/python-ipaddress.hash
 delete mode 100644 package/python-ipaddress/python-ipaddress.mk
 delete mode 100644 package/python-mad/Config.in
 delete mode 100644 package/python-mad/python-mad.hash
 delete mode 100644 package/python-mad/python-mad.mk
 delete mode 100644 package/python-nfc/Config.in
 delete mode 100644 package/python-nfc/python-nfc.hash
 delete mode 100644 package/python-nfc/python-nfc.mk
 delete mode 100644 package/python-pam/0001-dealloc.patch
 delete mode 100644 package/python-pam/0002-nofree.patch
 delete mode 100644 package/python-pam/0003-memory-errors-CVE2012-1502.patch
 delete mode 100644 package/python-pam/Config.in
 delete mode 100644 package/python-pam/python-pam.hash
 delete mode 100644 package/python-pam/python-pam.mk
 delete mode 100644 package/python-pathlib2/Config.in
 delete mode 100644 package/python-pathlib2/python-pathlib2.hash
 delete mode 100644 package/python-pathlib2/python-pathlib2.mk
 delete mode 100644 package/python-pypcap/Config.in
 delete mode 100644 package/python-pypcap/python-pypcap.hash
 delete mode 100644 package/python-pypcap/python-pypcap.mk
 delete mode 100644 package/python-pyro/Config.in
 delete mode 100644 package/python-pyro/python-pyro.hash
 delete mode 100644 package/python-pyro/python-pyro.mk
 delete mode 100644 package/python-singledispatch/Config.in
 delete mode 100644 package/python-singledispatch/python-singledispatch.hash
 delete mode 100644 package/python-singledispatch/python-singledispatch.mk
 delete mode 100644 package/python-subprocess32/Config.in
 delete mode 100644 package/python-subprocess32/python-subprocess32.hash
 delete mode 100644 package/python-subprocess32/python-subprocess32.mk
 delete mode 100644 package/python-typing/Config.in
 delete mode 100644 package/python-typing/python-typing.hash
 delete mode 100644 package/python-typing/python-typing.mk
 delete mode 100644 package/python-yieldfrom/Config.in
 delete mode 100644 package/python-yieldfrom/python-yieldfrom.hash
 delete mode 100644 package/python-yieldfrom/python-yieldfrom.mk
 delete mode 100644 package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
 delete mode 100644 package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
 delete mode 100644 package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
 delete mode 100644 package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
 delete mode 100644 package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
 delete mode 100644 package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
 delete mode 100644 package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
 delete mode 100644 package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
 delete mode 100644 package/python/0009-Fix-python-config-for-cross-builds.patch
 delete mode 100644 package/python/0010-Remove-the-python-symlink-install-rules.patch
 delete mode 100644 package/python/0011-Don-t-add-multiarch-paths.patch
 delete mode 100644 package/python/0012-Abort-on-failed-module-build.patch
 delete mode 100644 package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
 delete mode 100644 package/python/0014-Serial-ioctl-workaround.patch
 delete mode 100644 package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
 delete mode 100644 package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
 delete mode 100644 package/python/0017-Add-an-option-to-disable-pydoc.patch
 delete mode 100644 package/python/0018-Add-an-option-to-disable-lib2to3.patch
 delete mode 100644 package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
 delete mode 100644 package/python/0020-Add-an-option-to-disable-the-tk-module.patch
 delete mode 100644 package/python/0021-Add-an-option-to-disable-the-curses-module.patch
 delete mode 100644 package/python/0022-Add-an-option-to-disable-expat.patch
 delete mode 100644 package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
 delete mode 100644 package/python/0024-Add-an-option-to-disable-NIS.patch
 delete mode 100644 package/python/0025-Add-an-option-to-disable-unicodedata.patch
 delete mode 100644 package/python/0026-Add-an-option-to-disable-bsddb.patch
 delete mode 100644 package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
 delete mode 100644 package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
 delete mode 100644 package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
 delete mode 100644 package/python/0030-Do-not-install-the-idle-editor.patch
 delete mode 100644 package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
 delete mode 100644 package/python/0032-Add-option-to-disable-the-hashlib-module.patch
 delete mode 100644 package/python/0033-Add-an-option-to-disable-readline-module.patch
 delete mode 100644 package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
 delete mode 100644 package/python/Config.in
 delete mode 100644 package/python/Config.in.host
 delete mode 100644 package/python/python.hash
 delete mode 100644 package/python/python.mk
 delete mode 100644 support/testing/tests/package/sample_python_subprocess32.py
 delete mode 100644 support/testing/tests/package/test_python_subprocess32.py

-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 001/107] support/testing: drop python2 tests

[Peter Korsgaard]

Python2 for the target is about to get removed, so drop the tests using it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../tests/package/sample_python_subprocess32.py    |  6 ------
 support/testing/tests/package/test_bmap_tools.py   |  8 --------
 support/testing/tests/package/test_crudini.py      |  8 --------
 support/testing/tests/package/test_libftdi1.py     | 12 ------------
 support/testing/tests/package/test_python.py       | 14 --------------
 support/testing/tests/package/test_python_argh.py  |  9 ---------
 .../testing/tests/package/test_python_bitstring.py | 10 ----------
 support/testing/tests/package/test_python_can.py   | 11 -----------
 support/testing/tests/package/test_python_cbor.py  | 11 -----------
 support/testing/tests/package/test_python_click.py |  9 ---------
 .../tests/package/test_python_constantly.py        | 10 ----------
 support/testing/tests/package/test_python_gnupg.py | 10 ----------
 .../tests/package/test_python_incremental.py       | 11 -----------
 .../testing/tests/package/test_python_passlib.py   | 11 -----------
 .../testing/tests/package/test_python_pexpect.py   | 10 ----------
 .../testing/tests/package/test_python_pynacl.py    | 11 -----------
 .../testing/tests/package/test_python_pyyaml.py    | 11 -----------
 .../tests/package/test_python_subprocess32.py      | 11 -----------
 .../testing/tests/package/test_python_ubjson.py    | 11 -----------
 19 files changed, 194 deletions(-)
 delete mode 100644 support/testing/tests/package/sample_python_subprocess32.py
 delete mode 100644 support/testing/tests/package/test_python_subprocess32.py

diff --git a/support/testing/tests/package/sample_python_subprocess32.py b/support/testing/tests/package/sample_python_subprocess32.py
deleted file mode 100644
index 8579745cc8..0000000000
--- a/support/testing/tests/package/sample_python_subprocess32.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import subprocess32
-
-output = subprocess32.check_output(["ls", "-l", "/dev/null"])
-print(output)
-assert("/dev/null" in output)
-assert("No such" not in output)
diff --git a/support/testing/tests/package/test_bmap_tools.py b/support/testing/tests/package/test_bmap_tools.py
index baa23154f8..a179027633 100644
--- a/support/testing/tests/package/test_bmap_tools.py
+++ b/support/testing/tests/package/test_bmap_tools.py
@@ -45,14 +45,6 @@ class TestBmapTools(BRTest):
         self.assertRunOk(cmd, timeout=20)
 
 
-class TestPy2BmapTools(TestBmapTools):
-    __test__ = True
-    config = TestBmapTools.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        """
-
-
 class TestPy3BmapTools(TestBmapTools):
     __test__ = True
     config = TestBmapTools.config + \
diff --git a/support/testing/tests/package/test_crudini.py b/support/testing/tests/package/test_crudini.py
index e320d3207e..470a714eb6 100644
--- a/support/testing/tests/package/test_crudini.py
+++ b/support/testing/tests/package/test_crudini.py
@@ -33,14 +33,6 @@ class TestCrudiniBase(TestPythonPackageBase):
         self.assertEqual(out, ['this-is-the-magic-value'])
 
 
-class TestCrudiniPy2(TestCrudiniBase):
-    __test__ = True
-    config = TestCrudiniBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        """
-
-
 class TestCrudiniPy3(TestCrudiniBase):
     __test__ = True
     config = TestCrudiniBase.config + \
diff --git a/support/testing/tests/package/test_libftdi1.py b/support/testing/tests/package/test_libftdi1.py
index 78c928484c..5c29dea04f 100644
--- a/support/testing/tests/package/test_libftdi1.py
+++ b/support/testing/tests/package/test_libftdi1.py
@@ -1,18 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Libftdi1(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_LIBFTDI1=y
-        BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS=y
-        """
-    sample_scripts = ["tests/package/sample_libftdi1.py"]
-    timeout = 40
-
-
 class TestPythonPy3Libftdi1(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py
index 60da8765c4..f29aff6624 100644
--- a/support/testing/tests/package/test_python.py
+++ b/support/testing/tests/package/test_python.py
@@ -39,20 +39,6 @@ class TestPythonBase(infra.basetest.BRTest):
         self.assertEqual(exit_code, 1)
 
 
-class TestPython2(TestPythonBase):
-    config = TestPythonBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        """
-
-    def test_run(self):
-        self.login()
-        self.version_test("Python 2")
-        self.math_floor_test()
-        self.libc_time_test()
-        self.zlib_test()
-
-
 class TestPython3(TestPythonBase):
     config = TestPythonBase.config + \
         """
diff --git a/support/testing/tests/package/test_python_argh.py b/support/testing/tests/package/test_python_argh.py
index de4b4cbe74..887d9acd46 100644
--- a/support/testing/tests/package/test_python_argh.py
+++ b/support/testing/tests/package/test_python_argh.py
@@ -27,15 +27,6 @@ class TestPythonArgh(TestPythonPackageBase):
         self.assertEqual(exit_code, 2)
 
 
-class TestPythonPy2Argh(TestPythonArgh):
-    __test__ = True
-    config = TestPythonArgh.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_ARGH=y
-        """
-
-
 class TestPythonPy3Argh(TestPythonArgh):
     __test__ = True
     config = TestPythonArgh.config + \
diff --git a/support/testing/tests/package/test_python_bitstring.py b/support/testing/tests/package/test_python_bitstring.py
index 63b3fdb69c..bd358a2fc5 100644
--- a/support/testing/tests/package/test_python_bitstring.py
+++ b/support/testing/tests/package/test_python_bitstring.py
@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Bitstring(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_BITSTRING=y
-        """
-    sample_scripts = ["tests/package/sample_python_bitstring.py"]
-
-
 class TestPythonPy3Bitstring(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_can.py b/support/testing/tests/package/test_python_can.py
index d509d05dbb..dba5539c5d 100644
--- a/support/testing/tests/package/test_python_can.py
+++ b/support/testing/tests/package/test_python_can.py
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Can(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_CAN=y
-        """
-    sample_scripts = ["tests/package/sample_python_can.py"]
-    timeout = 40
-
-
 class TestPythonPy3Can(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_cbor.py b/support/testing/tests/package/test_python_cbor.py
index 9da3503763..23a1e3e701 100644
--- a/support/testing/tests/package/test_python_cbor.py
+++ b/support/testing/tests/package/test_python_cbor.py
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Cbor(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_CBOR=y
-        """
-    sample_scripts = ["tests/package/sample_python_cbor_enc.py",
-                      "tests/package/sample_python_cbor_dec.py"]
-
-
 class TestPythonPy3Cbor(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_click.py b/support/testing/tests/package/test_python_click.py
index db57d3aa9f..0ee9702cce 100644
--- a/support/testing/tests/package/test_python_click.py
+++ b/support/testing/tests/package/test_python_click.py
@@ -26,15 +26,6 @@ class TestPythonClick(TestPythonPackageBase):
         self.assertEqual(exit_code, 2)
 
 
-class TestPythonPy2Click(TestPythonClick):
-    __test__ = True
-    config = TestPythonClick.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_CLICK=y
-        """
-
-
 class TestPythonPy3Click(TestPythonClick):
     __test__ = True
     config = TestPythonClick.config + \
diff --git a/support/testing/tests/package/test_python_constantly.py b/support/testing/tests/package/test_python_constantly.py
index 5be01c4f8c..edcb9bfd69 100644
--- a/support/testing/tests/package/test_python_constantly.py
+++ b/support/testing/tests/package/test_python_constantly.py
@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Constantly(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_CONSTANTLY=y
-        """
-    sample_scripts = ["tests/package/sample_python_constantly.py"]
-
-
 class TestPythonPy3Constantly(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py
index 0c71f6b6d0..8861115130 100644
--- a/support/testing/tests/package/test_python_gnupg.py
+++ b/support/testing/tests/package/test_python_gnupg.py
@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2GnuPG(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_GNUPG=y
-        """
-    sample_scripts = ["tests/package/sample_python_gnupg.py"]
-
-
 class TestPythonPy3GnuPG(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_incremental.py b/support/testing/tests/package/test_python_incremental.py
index 49800d8937..4c53d61321 100644
--- a/support/testing/tests/package/test_python_incremental.py
+++ b/support/testing/tests/package/test_python_incremental.py
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Incremental(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_INCREMENTAL=y
-        """
-    sample_scripts = ["tests/package/sample_python_incremental.py"]
-    timeout = 30
-
-
 class TestPythonPy3Incremental(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_passlib.py b/support/testing/tests/package/test_python_passlib.py
index 7c85882bf8..e12e86d91b 100644
--- a/support/testing/tests/package/test_python_passlib.py
+++ b/support/testing/tests/package/test_python_passlib.py
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Passlib(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_PASSLIB=y
-        """
-    sample_scripts = ["tests/package/sample_python_passlib.py"]
-    timeout = 30
-
-
 class TestPythonPy3Passlib(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_pexpect.py b/support/testing/tests/package/test_python_pexpect.py
index ba31cdbdbe..70037a7d3c 100644
--- a/support/testing/tests/package/test_python_pexpect.py
+++ b/support/testing/tests/package/test_python_pexpect.py
@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Pexpect(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_PEXPECT=y
-        """
-    sample_scripts = ["tests/package/sample_python_pexpect.py"]
-
-
 class TestPythonPy3Pexpect(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_pynacl.py b/support/testing/tests/package/test_python_pynacl.py
index f4dd54940a..cef8a7e780 100644
--- a/support/testing/tests/package/test_python_pynacl.py
+++ b/support/testing/tests/package/test_python_pynacl.py
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Pynacl(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_PYNACL=y
-        """
-    sample_scripts = ["tests/package/sample_python_pynacl.py"]
-    timeout = 10
-
-
 class TestPythonPy3Pynacl(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_pyyaml.py b/support/testing/tests/package/test_python_pyyaml.py
index cd45a57b86..9d0a351f72 100644
--- a/support/testing/tests/package/test_python_pyyaml.py
+++ b/support/testing/tests/package/test_python_pyyaml.py
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Pyyaml(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_PYYAML=y
-        """
-    sample_scripts = ["tests/package/sample_python_pyyaml_enc.py",
-                      "tests/package/sample_python_pyyaml_dec.py"]
-
-
 class TestPythonPy3Pyyaml(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
diff --git a/support/testing/tests/package/test_python_subprocess32.py b/support/testing/tests/package/test_python_subprocess32.py
deleted file mode 100644
index d2878046d1..0000000000
--- a/support/testing/tests/package/test_python_subprocess32.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from tests.package.test_python import TestPythonPackageBase
-
-
-class TestPythonPy2Subprocess32(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_SUBPROCESS32=y
-        """
-    sample_scripts = ["tests/package/sample_python_subprocess32.py"]
diff --git a/support/testing/tests/package/test_python_ubjson.py b/support/testing/tests/package/test_python_ubjson.py
index 85c707e292..a15dbd54b8 100644
--- a/support/testing/tests/package/test_python_ubjson.py
+++ b/support/testing/tests/package/test_python_ubjson.py
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Ubjson(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_UBJSON=y
-        """
-    sample_scripts = ["tests/package/sample_python_ubjson_enc.py",
-                      "tests/package/sample_python_ubjson_dec.py"]
-
-
 class TestPythonPy3Ubjson(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 002/107] package/python: drop target package

[Peter Korsgaard]

Python 2.7 is EOL since April 2020, so drop support for the target package.

https://www.python.org/dev/peps/pep-0373/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy         |   8 +++
 package/Config.in        |   3 +-
 package/python/Config.in | 139 ---------------------------------------
 3 files changed, 9 insertions(+), 141 deletions(-)
 delete mode 100644 package/python/Config.in

diff --git a/Config.in.legacy b/Config.in.legacy
index 34d8c71cc8..6bc3803a5c 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON
+	bool "python2.7 package removed"
+	select BR2_LEGACY
+	help
+	  Python 2.7 is EOL since April 2020 and has been removed.
+
+	  https://www.python.org/dev/peps/pep-0373/
+
 config BR2_TARGET_UBOOT_ZYNQ_IMAGE
 	bool "Generate image for Xilinx Zynq"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index d631ed784a..ca2fb363e3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -897,9 +897,8 @@ if BR2_STATIC_LIBS
 comment "External PHP extensions need a toolchain w/ dynamic library"
 endif
 endif
-	source "package/python/Config.in"
 	source "package/python3/Config.in"
-if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+if BR2_PACKAGE_PYTHON3
 menu "External python modules"
 	source "package/python-aenum/Config.in"
 	source "package/python-aexpect/Config.in"
diff --git a/package/python/Config.in b/package/python/Config.in
deleted file mode 100644
index ab6950cae8..0000000000
--- a/package/python/Config.in
+++ /dev/null
@@ -1,139 +0,0 @@
-comment "python needs a toolchain w/ wchar, threads, dynamic library"
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-config BR2_PACKAGE_PYTHON
-	bool "python2.7 (deprecated)"
-	depends on BR2_USE_WCHAR
-	# uses fork()
-	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libffi
-	depends on !BR2_STATIC_LIBS
-	select BR2_PACKAGE_LIBFFI
-	help
-	  The python language interpreter.
-
-	  http://www.python.org/
-
-if BR2_PACKAGE_PYTHON
-
-choice
-	prompt "python module format to install"
-	default BR2_PACKAGE_PYTHON_PYC_ONLY
-	help
-	  Select Python module format to install on target (py, pyc or
-	  both)
-
-config BR2_PACKAGE_PYTHON_PY_ONLY
-	bool ".py sources only"
-
-config BR2_PACKAGE_PYTHON_PYC_ONLY
-	bool ".pyc compiled sources only"
-
-config BR2_PACKAGE_PYTHON_PY_PYC
-	bool ".py sources and .pyc compiled"
-
-endchoice
-
-menu "core python modules"
-
-comment "The following modules are unusual or require extra libraries"
-
-config BR2_PACKAGE_PYTHON_2TO3
-	bool "2to3 module"
-	help
-	  code translation from python 2 to 3
-
-config BR2_PACKAGE_PYTHON_BZIP2
-	bool "bzip2 module"
-	select BR2_PACKAGE_BZIP2
-	help
-	  bzip2 module for Python
-
-config BR2_PACKAGE_PYTHON_BSDDB
-	bool "bsddb module"
-	select BR2_PACKAGE_BERKELEYDB
-	help
-	  bsddb module for Python.
-
-config BR2_PACKAGE_PYTHON_CODECSCJK
-	bool "codecscjk module"
-	help
-	  Chinese/Japanese/Korean codecs module for Python (large).
-
-config BR2_PACKAGE_PYTHON_CURSES
-	bool "curses module"
-	select BR2_PACKAGE_NCURSES
-	help
-	  curses module for Python.
-
-config BR2_PACKAGE_PYTHON_OSSAUDIODEV
-	bool "ossaudiodev module"
-	help
-	  ossaudiodev module for Python.
-
-config BR2_PACKAGE_PYTHON_READLINE
-	bool "readline"
-	select BR2_PACKAGE_READLINE
-	help
-	  readline module for Python (required for command-line
-	  editing in the Python shell).
-
-config BR2_PACKAGE_PYTHON_SSL
-	bool "ssl"
-	select BR2_PACKAGE_OPENSSL
-	help
-	  _ssl module for Python (required for https in urllib etc).
-
-config BR2_PACKAGE_PYTHON_UNICODEDATA
-	bool "unicodedata module"
-	default y
-	help
-	  Unicode character database (used by stringprep module)
-	  (large).
-
-if BR2_PACKAGE_PYTHON_UNICODEDATA
-
-choice
-	prompt "Python unicode database format"
-	default BR2_PACKAGE_PYTHON_UCS2
-	help
-	  Select Python unicode database format for target
-
-config BR2_PACKAGE_PYTHON_UCS2
-	bool "Universal Character Set 2-byte (UCS2)"
-
-config BR2_PACKAGE_PYTHON_UCS4
-	bool "Universal Character Set 4-byte (UCS4)"
-
-endchoice
-
-endif
-
-config BR2_PACKAGE_PYTHON_SQLITE
-	bool "sqlite module"
-	select BR2_PACKAGE_SQLITE
-	help
-	  SQLite database support
-
-config BR2_PACKAGE_PYTHON_PYEXPAT
-	bool "xml module"
-	select BR2_PACKAGE_EXPAT
-	help
-	  pyexpat and xml libraries for Python
-
-config BR2_PACKAGE_PYTHON_ZLIB
-	bool "zlib module"
-	select BR2_PACKAGE_ZLIB
-	help
-	  zlib support in Python
-
-config BR2_PACKAGE_PYTHON_HASHLIB
-	bool "hashlib module"
-	select BR2_PACKAGE_OPENSSL
-	help
-	  hashlib support in Python
-
-endmenu
-
-endif
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 003/107] package/alsa-lib: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/alsa-lib/Config.in   |  2 +-
 package/alsa-lib/alsa-lib.mk | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index 4168d1f220..af3de984d9 100644
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB
 
 config BR2_PACKAGE_ALSA_LIB_PYTHON
 	bool "Python support for alsa-lib"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  Add python support for alsa-lib.
 	  Python will be built and libpython will be installed
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index b5cd3f0d13..5d12f5e6d8 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -61,20 +61,11 @@ endif
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
 ALSA_LIB_CONF_OPTS += \
-	--enable-mixer-pymods
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-ALSA_LIB_CONF_OPTS += \
-	--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \
-	--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-ALSA_LIB_DEPENDENCIES += python
-else
-ALSA_LIB_CONF_OPTS += \
+	--enable-mixer-pymods \
 	--with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \
 	--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
 ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
 ALSA_LIB_DEPENDENCIES += python3
-endif
 else
 ALSA_LIB_CONF_OPTS += --disable-python
 endif
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 004/107] package/bmap-tools: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/bmap-tools/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/bmap-tools/Config.in b/package/bmap-tools/Config.in
index 83b4d92786..91081069c7 100644
--- a/package/bmap-tools/Config.in
+++ b/package/bmap-tools/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_BMAP_TOOLS
 	bool "bmap-tools"
-	depends on BR2_PACKAGE_PYTHON3 || BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 005/107] package/boost: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/boost/Config.in |  2 +-
 package/boost/boost.mk  | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 2c458bf88a..33a5337096 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -296,7 +296,7 @@ config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
 
 config BR2_PACKAGE_BOOST_PYTHON
 	bool "boost-python"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  The Boost Python Library is a framework for interfacing Python
 	  and C++. It allows you to quickly and seamlessly expose C++
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index b6681b0ad3..032ba5c820 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -68,16 +68,11 @@ BOOST_DEPENDENCIES += bzip2 zlib
 endif
 
 ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y)
-BOOST_FLAGS += --with-python-root=$(HOST_DIR)
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
-BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)
+BOOST_FLAGS += \
+	--with-python-root=$(HOST_DIR) \
+	--with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)
 BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
 BOOST_DEPENDENCIES += python3
-else
-BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR)
-BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-BOOST_DEPENDENCIES += python
-endif
 endif
 
 HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 006/107] package/cifs-utils: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/cifs-utils/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in
index f15d1e3dc4..d1b1406a3e 100644
--- a/package/cifs-utils/Config.in
+++ b/package/cifs-utils/Config.in
@@ -21,7 +21,7 @@ config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS
 	depends on BR2_USE_WCHAR # python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
 	depends on !BR2_STATIC_LIBS # python3
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3 # runtime
 	help
 	  Install the smb tools smbinfo and smb2-quota (python
 	  implementations).
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 007/107] package/cracklib: move python support to python3

[Peter Korsgaard]

The configure script needs a bit of help to detect the python version.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/cracklib/cracklib.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk
index 8e6a844f11..46917b7926 100644
--- a/package/cracklib/cracklib.mk
+++ b/package/cracklib/cracklib.mk
@@ -20,9 +20,12 @@ else
 CRACKLIB_CONF_OPTS += --without-zlib
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 CRACKLIB_CONF_OPTS += --with-python
-CRACKLIB_DEPENDENCIES += python
+CRACKLIB_CONF_ENV += \
+	ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \
+	am_cv_python_version=$(PYTHON3_VERSION_MAJOR)
+CRACKLIB_DEPENDENCIES += python3
 else
 CRACKLIB_CONF_OPTS += --without-python
 endif
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 008/107] package/crudini: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/crudini/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crudini/Config.in b/package/crudini/Config.in
index 240848dffc..ff4c98d579 100644
--- a/package/crudini/Config.in
+++ b/package/crudini/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_CRUDINI
 	bool "crudini"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_INIPARSE # runtime
 	help
 	  A utility for handling ini files from the command line and
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 009/107] package/dbus-python: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dbus-python/Config.in      |  8 +++-----
 package/dbus-python/dbus-python.mk | 28 ++++------------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index 4bfb59ed91..76453e168a 100644
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -3,16 +3,14 @@ config BR2_PACKAGE_DBUS_PYTHON
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_PACKAGE_DBUS
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_LIBGLIB2
-	# pyexpat: runtime dependency only
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Python bindings for D-Bus
 
 	  http://dbus.freedesktop.org/doc/dbus-python/
 
 comment "dbus-python needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
+	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON3
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index 3e28aed25c..d9bb30ed67 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -9,40 +9,20 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python
 DBUS_PYTHON_INSTALL_STAGING = YES
 DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain)
 DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING
-DBUS_PYTHON_DEPENDENCIES = dbus libglib2
-HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2
+DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3
+HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-DBUS_PYTHON_DEPENDENCIES += python host-python
-
-DBUS_PYTHON_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/bin/python2 \
-	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \
-	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`"
-
-HOST_DBUS_PYTHON_DEPENDENCIES += host-python
-
-HOST_DBUS_PYTHON_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/bin/python2 \
-	PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \
-	PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`"
-else
-DBUS_PYTHON_DEPENDENCIES += python3 host-python3
-
-DBUS_PYTHON_CONF_ENV += \
+DBUS_PYTHON_CONF_ENV = \
 	PYTHON=$(HOST_DIR)/bin/python3 \
 	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \
 	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \
 	PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`"
 
-HOST_DBUS_PYTHON_DEPENDENCIES += host-python3
-
-HOST_DBUS_PYTHON_CONF_ENV += \
+HOST_DBUS_PYTHON_CONF_ENV = \
 	PYTHON=$(HOST_DIR)/bin/python3 \
 	PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \
 	PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \
 	PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`"
-endif
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 010/107] package/docker-compose: drop reference to BR2_PACKAGE_PYTHON

[Peter Korsgaard]

And adjust the comments to clarify that the toolchain dependencies are from
python3.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/docker-compose/Config.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in
index 761befea4d..f82a0c4bc2 100644
--- a/package/docker-compose/Config.in
+++ b/package/docker-compose/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_DOCKER_COMPOSE
 	bool "docker-compose"
-	depends on !BR2_PACKAGE_PYTHON # python-paramiko -> python-bcrypt
-	depends on BR2_USE_MMU # python
-	depends on BR2_USE_WCHAR # python
-	depends on BR2_TOOLCHAIN_HAS_THREADS # python
-	depends on !BR2_STATIC_LIBS # python
+	depends on BR2_USE_MMU # python3
+	depends on BR2_USE_WCHAR # python3
+	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
+	depends on !BR2_STATIC_LIBS # python3
 	# python-paramiko -> python-cryptography
 	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
 	select BR2_PACKAGE_PYTHON3
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 011/107] package/dstat: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dstat/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/dstat/Config.in b/package/dstat/Config.in
index 647a7033c6..09d1970f73 100644
--- a/package/dstat/Config.in
+++ b/package/dstat/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_DSTAT
 	bool "dstat"
-	depends on BR2_USE_WCHAR # python
-	depends on BR2_USE_MMU # python
-	depends on BR2_TOOLCHAIN_HAS_THREADS # python
-	depends on !BR2_STATIC_LIBS # python
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
+	depends on BR2_USE_WCHAR # python3
+	depends on BR2_USE_MMU # python3
+	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
+	depends on !BR2_STATIC_LIBS # python3
+	select BR2_PACKAGE_PYTHON3 # runtime
 	help
 	  Dstat, written in Python, is a versatile replacement for
 	  vmstat, iostat, netstat and ifstat. Dstat overcomes some of
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 012/107] package/evemu: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/evemu/evemu.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk
index 02e5abdb8f..b27033afa4 100644
--- a/package/evemu/evemu.mk
+++ b/package/evemu/evemu.mk
@@ -22,9 +22,9 @@ EVEMU_CONF_OPTS += --disable-tests
 EVEMU_DEPENDENCIES = host-pkgconf libevdev
 
 # Check for target python
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 EVEMU_CONF_OPTS += --enable-python-bindings
-EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python)
+EVEMU_DEPENDENCIES += python3
 else
 EVEMU_CONF_OPTS += --disable-python-bindings
 endif
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 013/107] package/fail2ban: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/fail2ban/Config.in   | 2 +-
 package/fail2ban/fail2ban.mk | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/fail2ban/Config.in b/package/fail2ban/Config.in
index 86e6233793..8a48a8c1d0 100644
--- a/package/fail2ban/Config.in
+++ b/package/fail2ban/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_FAIL2BAN
 	bool "fail2ban"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD
 	help
 	  Fail2ban scans log files (e.g. /var/log/apache/error_log) and
diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk
index 9202dc1ddd..4a08981a97 100644
--- a/package/fail2ban/fail2ban.mk
+++ b/package/fail2ban/fail2ban.mk
@@ -15,15 +15,13 @@ FAIL2BAN_SETUP_TYPE = distutils
 # 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch
 FAIL2BAN_IGNORE_CVES += CVE-2021-32749
 
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
 define FAIL2BAN_PYTHON_2TO3
 	$(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban
 endef
-FAIL2BAN_DEPENDENCIES += host-python3
+FAIL2BAN_DEPENDENCIES = host-python3
 # We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed
 # to build and install before _POST_PATCH_HOOKS run.
 FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3
-endif
 
 define FAIL2BAN_FIX_DEFAULT_CONFIG
 	$(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf
@@ -34,8 +32,7 @@ FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG
 
 # fail2ban-python points to host python
 define FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK
-	ln -snf $(if $(BR2_PACKAGE_PYTHON),python,python3) \
-		$(TARGET_DIR)/usr/bin/fail2ban-python
+	ln -snf python3	$(TARGET_DIR)/usr/bin/fail2ban-python
 endef
 FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 014/107] package/glsandbox-player: drop reference to python2

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/glslsandbox-player/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in
index 2d15a7e270..317eb62898 100644
--- a/package/glslsandbox-player/Config.in
+++ b/package/glslsandbox-player/Config.in
@@ -33,7 +33,6 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_TESTING
 
 config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS
 	bool "Install scripts"
-	depends on !BR2_PACKAGE_PYTHON # python3
 	depends on !BR2_STATIC_LIBS # python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
 	depends on BR2_USE_MMU # bash, python3
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 015/107] package/gpsd: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gpsd/Config.in | 4 ++--
 package/gpsd/gpsd.mk   | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 1da9a5ce2a..b66d0952dd 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -81,8 +81,8 @@ config BR2_PACKAGE_GPSD_SQUELCH
 
 config BR2_PACKAGE_GPSD_PYTHON
 	bool "build Python support and modules"
-	depends on BR2_USE_WCHAR # python
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
+	depends on BR2_USE_WCHAR # python3
+	select BR2_PACKAGE_PYTHON3
 	help
 	  Python libraries and tools for the gpsd service daemon
 	  including gpsfake test harness.
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 636c6c95ba..4388b7e24d 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -194,10 +194,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y)
 GPSD_SCONS_OPTS += \
 	python=yes \
 	python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages"
-else ifeq ($(BR2_PACKAGE_PYTHON),y)
-GPSD_SCONS_OPTS += \
-	python=yes \
-	python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"
 else
 GPSD_SCONS_OPTS += python=no
 endif
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 016/107] package/gst1-devtools: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gst1-devtools/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/gstreamer1/gst1-devtools/Config.in b/package/gstreamer1/gst1-devtools/Config.in
index 55cf25d53e..3f39beff53 100644
--- a/package/gstreamer1/gst1-devtools/Config.in
+++ b/package/gstreamer1/gst1-devtools/Config.in
@@ -1,11 +1,10 @@
 config BR2_PACKAGE_GST1_DEVTOOLS
 	bool "gst1-devtools"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_GSTREAMER1_CHECK
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	select BR2_PACKAGE_JSON_GLIB
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT
 	# cairo is autodetected but needs PNG support
 	select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO
 	help
@@ -14,5 +13,4 @@ config BR2_PACKAGE_GST1_DEVTOOLS
 	  https://gstreamer.freedesktop.org
 
 comment "gst1-devtools depends on python"
-	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_PACKAGE_PYTHON3
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 017/107] package/i2c-tools: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/i2c-tools/i2c-tools.mk | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index 7565349f5e..5c9ce26628 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -13,10 +13,6 @@ I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project
 I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog
 I2C_TOOLS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-I2C_TOOLS_DEPENDENCIES += python
-endif
-
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 I2C_TOOLS_DEPENDENCIES += python3
 endif
@@ -31,7 +27,7 @@ endif
 
 # Build/install steps mirror the distutil python package type in the python package
 # infrastructure
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 # BASE_ENV taken from PKG_PYTHON_DISTUTILS_ENV in package/pkg-python.mk
 I2C_TOOLS_PYTHON_BASE_ENV = \
 	$(PKG_PYTHON_DISTUTILS_ENV) \
@@ -51,7 +47,7 @@ define I2C_TOOLS_INSTALL_PYSMBUS
 		$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS))
 endef
 
-endif # BR2_PACKAGE_PYTHON
+endif # BR2_PACKAGE_PYTHON3
 
 define I2C_TOOLS_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) -C $(@D)
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 018/107] package/iotop: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/iotop/Config.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/iotop/Config.in b/package/iotop/Config.in
index ada6131606..460503b9d7 100644
--- a/package/iotop/Config.in
+++ b/package/iotop/Config.in
@@ -1,11 +1,10 @@
-comment "iotop depends on python or python3"
-	depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3
+comment "iotop depends on python3"
+	depends on !BR2_PACKAGE_PYTHON3
 
 config BR2_PACKAGE_IOTOP
 	bool "iotop"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_CURSES
 	help
 	  iotop does for I/O usage what top does for CPU usage.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 019/107] package/jack2: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/jack2/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/jack2/Config.in b/package/jack2/Config.in
index f9de7be041..bc883190d5 100644
--- a/package/jack2/Config.in
+++ b/package/jack2/Config.in
@@ -37,9 +37,8 @@ config BR2_PACKAGE_JACK2_DBUS
 	depends on BR2_USE_WCHAR # dbus-python, python
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_PYTHON
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Build and use jackdbus.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 020/107] package/kmod: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/kmod/kmod.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index c7f510ec0f..82e8597759 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -62,8 +62,8 @@ else
 KMOD_CONF_OPTS += --without-openssl
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
-KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+KMOD_DEPENDENCIES += python3
 KMOD_CONF_OPTS += --enable-python
 endif
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 021/107] package/libcec: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libcec/libcec.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
index 6591bc009a..8b5d70d008 100644
--- a/package/libcec/libcec.mk
+++ b/package/libcec/libcec.mk
@@ -20,8 +20,8 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 LIBCEC_DEPENDENCIES += udev
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
-LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+LIBCEC_DEPENDENCIES += host-swig python3
 endif
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 022/107] package/libevent: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libevent/libevent.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 93ba88ca88..4c23156f72 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -25,7 +25,7 @@ endef
 
 # libevent installs a python script to target - get rid of it if we
 # don't have python support enabled
-ifneq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifneq ($(BR2_PACKAGE_PYTHON3),y)
 LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT
 endif
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 023/107] package/libftdi1: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libftdi1/Config.in   | 2 +-
 package/libftdi1/libftdi1.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libftdi1/Config.in b/package/libftdi1/Config.in
index 2d32573563..ec91366115 100644
--- a/package/libftdi1/Config.in
+++ b/package/libftdi1/Config.in
@@ -24,7 +24,7 @@ comment "libftdipp1 needs a toolchain w/ C++, wchar"
 
 config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS
 	bool "python bindings"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  Python bindings for libftdi
 
diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk
index 6688694b47..d2e3f42e14 100644
--- a/package/libftdi1/libftdi1.mk
+++ b/package/libftdi1/libftdi1.mk
@@ -24,7 +24,7 @@ LIBFTDI1_CONF_OPTS += -DFTDIPP=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS),y)
-LIBFTDI1_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) host-swig
+LIBFTDI1_DEPENDENCIES += python3 host-swig
 LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=ON
 else
 LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=OFF
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 024/107] package/libiio: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libiio/Config.in |  2 +-
 package/libiio/libiio.mk | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/package/libiio/Config.in b/package/libiio/Config.in
index 0d89331c89..98d663e203 100644
--- a/package/libiio/Config.in
+++ b/package/libiio/Config.in
@@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP
 
 config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON
 	bool "Install Python bindings"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  Install the Python bindings.
 
diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk
index a4fe0d4541..48e2f385e3 100644
--- a/package/libiio/libiio.mk
+++ b/package/libiio/libiio.mk
@@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y)
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-LIBIIO_DEPENDENCIES += host-python-setuptools python
-LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIBIIO_DEPENDENCIES += host-python3-setuptools python3
-LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3
-endif
-LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON
+LIBIIO_CONF_OPTS += \
+	-DPYTHON_BINDINGS=ON
+	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3
 else
 LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF
 endif
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 025/107] package/libpwquality: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libpwquality/libpwquality.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk
index 54a03be453..d4f7a47120 100644
--- a/package/libpwquality/libpwquality.mk
+++ b/package/libpwquality/libpwquality.mk
@@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES
 LIBPWQUALITY_DEPENDENCIES = cracklib
 LIBPWQUALITY_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIBPWQUALITY_CONF_OPTS += --enable-python-bindings
-LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python)
+LIBPWQUALITY_DEPENDENCIES += python3
 LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV)
 else
 LIBPWQUALITY_CONF_OPTS += --disable-python-bindings
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 026/107] package/libsigrokdecode: drop reference to python2

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libsigrokdecode/Config.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/libsigrokdecode/Config.in b/package/libsigrokdecode/Config.in
index 28cbb5ca5e..b58c8a2a29 100644
--- a/package/libsigrokdecode/Config.in
+++ b/package/libsigrokdecode/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBSIGROKDECODE
 	bool "libsigrokdecode"
-	depends on !BR2_PACKAGE_PYTHON # python3
 	depends on BR2_USE_WCHAR # libglib2/python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3
 	depends on BR2_USE_MMU # libglib2/python3
@@ -19,9 +18,4 @@ config BR2_PACKAGE_LIBSIGROKDECODE
 
 comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-comment "libsigrokdecode is not compatible with python"
-	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_PYTHON
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 027/107] package/libsoc: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libsoc/libsoc.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk
index bbc33143cc..95753b8b68 100644
--- a/package/libsoc/libsoc.mk
+++ b/package/libsoc/libsoc.mk
@@ -12,12 +12,8 @@ LIBSOC_AUTORECONF = YES
 LIBSOC_INSTALL_STAGING = YES
 LIBSOC_DEPENDENCIES = host-pkgconf
 
-# Install Python 2 bindings
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-LIBSOC_DEPENDENCIES += python
-LIBSOC_CONF_OPTS += --enable-python=2
 # Install Python 3 bindings
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIBSOC_DEPENDENCIES += python3
 LIBSOC_CONF_OPTS += --enable-python=3
 else
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 028/107] package/lttng-libust: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lttng-libust/lttng-libust.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index ef7d1a6200..7ead28052e 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -20,10 +20,7 @@ LTTNG_LIBUST_AUTORECONF = YES
 # https://www.mail-archive.com/lttng-dev@lists.lttng.org/msg12950.html
 LTTNG_LIBUST_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DUATOMIC_NO_LINK_ERROR"
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-LTTNG_LIBUST_DEPENDENCIES += python
-LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LTTNG_LIBUST_DEPENDENCIES += python3
 LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
 else
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 029/107] package/networkd-dispatcher: drop reference to python2

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/networkd-dispatcher/Config.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in
index ab8c473951..54b48e4ca8 100644
--- a/package/networkd-dispatcher/Config.in
+++ b/package/networkd-dispatcher/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORKD_DISPATCHER
 	depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection
 	depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection
-	depends on !BR2_PACKAGE_PYTHON # python3
 	depends on BR2_PACKAGE_SYSTEMD # runtime
 	select BR2_PACKAGE_DBUS # dbus-python
 	select BR2_PACKAGE_DBUS_PYTHON # runtime
@@ -23,7 +22,6 @@ config BR2_PACKAGE_NETWORKD_DISPATCHER
 comment "networkd-dispatcher needs a glibc toolchain, gcc >= 4.9, host gcc >= 8"
 	depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_SYSTEMD
-	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_HOST_GCC_AT_LEAST_8 || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
 		!BR2_TOOLCHAIN_USES_GLIBC
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 030/107] package/nftables: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nftables/nftables.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk
index d5c16ac2be..232d541488 100644
--- a/package/nftables/nftables.mk
+++ b/package/nftables/nftables.mk
@@ -35,9 +35,9 @@ else
 NFTABLES_CONF_OPTS += --without-json
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 NFTABLES_CONF_OPTS += --enable-python
-NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
+NFTABLES_DEPENDENCIES += python3
 else
 NFTABLES_CONF_OPTS += --disable-python
 endif
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 031/107] package/ogre: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ogre/ogre.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk
index 72fd616c0c..3fd2fc4650 100644
--- a/package/ogre/ogre.mk
+++ b/package/ogre/ogre.mk
@@ -42,9 +42,8 @@ OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \
 	-DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)"
 
 # Enable optional python component if python interpreter is present on the target.
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
-OGRE_DEPENDENCIES += host-swig \
-	$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+OGRE_DEPENDENCIES += host-swig host-python3
 OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=ON
 else
 OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=OFF
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 032/107] package/opkg-utils: drop reference to python2

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/opkg-utils/Config.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/opkg-utils/Config.in b/package/opkg-utils/Config.in
index 3c5a3ee347..2973055baf 100644
--- a/package/opkg-utils/Config.in
+++ b/package/opkg-utils/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_OPKG_UTILS
 	depends on BR2_USE_WCHAR # python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python3 <- libffi
 	depends on !BR2_STATIC_LIBS # python3
-	depends on !BR2_PACKAGE_PYTHON # python3
 	select BR2_PACKAGE_BINUTILS if !BR2_PACKAGE_BUSYBOX # runtime
 	select BR2_PACKAGE_BINUTILS_TARGET if !BR2_PACKAGE_BUSYBOX # runtime
 	select BR2_PACKAGE_COREUTILS if !BR2_PACKAGE_BUSYBOX # runtime
@@ -27,8 +26,3 @@ comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library"
 	depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-comment "opkg-utils needs python3"
-	depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX
-	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_PYTHON
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 033/107] package/owfs: drop python support

[Peter Korsgaard]

The python support only works with python2, so drop it.

Notice that there is a PR adding python3 support, but it is not yet merged:

https://github.com/owfs/owfs/pull/32

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/owfs/owfs.mk | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk
index 7c69a5251b..986dca921a 100644
--- a/package/owfs/owfs.mk
+++ b/package/owfs/owfs.mk
@@ -67,30 +67,8 @@ else
 OWFS_CONF_OPTS += --disable-avahi
 endif
 
-# setup.py isn't python3 compliant
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-OWFS_CONF_OPTS += \
-	--enable-owpython \
-	--with-python \
-	--with-pythonconfig=$(STAGING_DIR)/usr/bin/python-config
-OWFS_MAKE_ENV += \
-	CC="$(TARGET_CC)" \
-	PYTHONPATH="$(PYTHON_PATH)" \
-	_python_sysroot=$(STAGING_DIR) \
-	_python_prefix=/usr \
-	_python_exec_prefix=/usr
-OWFS_DEPENDENCIES += python host-swig
-# The configure scripts finds PYSITEDIR as the python_lib directory of
-# host-python, and then prepends DESTDIR in front of it. So we end up
-# installing things in $(TARGET_DIR)/$(HOST_DIR)/lib/python which is
-# clearly wrong.
-# Patching owfs to do the right thing is not trivial, it's much easier to
-# override the PYSITEDIR variable in make.
-OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-
-else
+# python2 only (https://github.com/owfs/owfs/pull/32)
 OWFS_CONF_OPTS += --disable-owpython --without-python
-endif
 
 ifeq ($(BR2_STATIC_LIBS),y)
 # zeroconf support uses dlopen()
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 034/107] package/python-aenum: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-aenum/python-aenum.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package/python-aenum/python-aenum.mk b/package/python-aenum/python-aenum.mk
index 98695d99ce..72eaa1db2b 100644
--- a/package/python-aenum/python-aenum.mk
+++ b/package/python-aenum/python-aenum.mk
@@ -11,13 +11,4 @@ PYTHON_AENUM_SETUP_TYPE = setuptools
 PYTHON_AENUM_LICENSE = BSD-3-Clause
 PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_AENUM_RM_PY3_FILE
-	rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/aenum/test_v3.py
-endef
-
-PYTHON_AENUM_POST_INSTALL_TARGET_HOOKS += PYTHON_AENUM_RM_PY3_FILE
-endif
-
 $(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 035/107] package/python-argon2-cffi: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-argon2-cffi/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in
index 16bbe6c4e3..5cddb3314e 100644
--- a/package/python-argon2-cffi/Config.in
+++ b/package/python-argon2-cffi/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI
 	depends on BR2_USE_MMU # libargon2
 	depends on !BR2_STATIC_LIBS # libargon2
 	select BR2_PACKAGE_PYTHON_CFFI # runtime
-	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_LIBARGON2
 	help
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 036/107] package/python-bsdiff4: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-bsdiff4/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-bsdiff4/Config.in b/package/python-bsdiff4/Config.in
index a383cda0f5..32070fb9a8 100644
--- a/package/python-bsdiff4/Config.in
+++ b/package/python-bsdiff4/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_BSDIFF4
 	bool "python-bsdiff4"
-	select BR2_PACKAGE_PYTHON_BZIP2 if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_BZIP2 if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_BZIP2 # runtime
 	help
 	  binary diff and patch using the BSDIFF4-format.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 037/107] package/python-can: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-can/Config.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/python-can/Config.in b/package/python-can/Config.in
index 3d06374c6a..dc9eb0ae4e 100644
--- a/package/python-can/Config.in
+++ b/package/python-can/Config.in
@@ -1,13 +1,10 @@
 config BR2_PACKAGE_PYTHON_CAN
 	bool "python-can"
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
-	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_SQLITE # runtime
 	select BR2_PACKAGE_PYTHON_AENUM # runtime
 	select BR2_PACKAGE_PYTHON_WRAPT # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  This module provides controller area network support for
 	  Python.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 038/107] package/python-couchdb: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-couchdb/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-couchdb/Config.in b/package/python-couchdb/Config.in
index 9156883b38..5bff75750b 100644
--- a/package/python-couchdb/Config.in
+++ b/package/python-couchdb/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_COUCHDB
 	bool "python-couchdb"
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_SSL # runtime
 	help
 	  Python client library for working with CouchDB.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 039/107] package/python-dicttoxml: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-dicttoxml/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-dicttoxml/Config.in b/package/python-dicttoxml/Config.in
index e38a5f7909..145887eddc 100644
--- a/package/python-dicttoxml/Config.in
+++ b/package/python-dicttoxml/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_DICTTOXML
 	bool "python-dicttoxml"
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT
 	help
 	  Converts a Python dictionary or other native data type into
 	  a valid XML string.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 040/107] package/python-dpkt: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-dpkt/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-dpkt/Config.in b/package/python-dpkt/Config.in
index 9bd7a98d26..819d0fb613 100644
--- a/package/python-dpkt/Config.in
+++ b/package/python-dpkt/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_DPKT
 	bool "python-dpkt"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  Fast, simple packet creation / parsing, with definitions
 	  for the basic TCP/IP protocols.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 041/107] package/python-esptool: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-esptool/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in
index 570f9aa42f..b21ccd72d5 100644
--- a/package/python-esptool/Config.in
+++ b/package/python-esptool/Config.in
@@ -3,8 +3,7 @@ config BR2_PACKAGE_PYTHON_ESPTOOL
 	select BR2_PACKAGE_PYTHON_ECDSA # runtime
 	select BR2_PACKAGE_PYTHON_PYAES # runtime
 	select BR2_PACKAGE_PYTHON_SERIAL # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  A serial utility to communicate & flash code to Espressif
 	  ESP8266 & ESP32 chips.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 042/107] package/python-fire: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-fire/Config.in      | 1 -
 package/python-fire/python-fire.mk | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/package/python-fire/Config.in b/package/python-fire/Config.in
index b718ddac5e..9c816b0fd0 100644
--- a/package/python-fire/Config.in
+++ b/package/python-fire/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_FIRE
 	bool "python-fire"
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_PYTHON_TERMCOLOR # runtime
-	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  A library for automatically generating command line
 	  interfaces.
diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk
index 7ba971abc4..40631fce86 100644
--- a/package/python-fire/python-fire.mk
+++ b/package/python-fire/python-fire.mk
@@ -11,13 +11,4 @@ PYTHON_FIRE_SETUP_TYPE = setuptools
 PYTHON_FIRE_LICENSE = Apache-2.0
 PYTHON_FIRE_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_FIRE_RM_PY3_FILE
-	rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/fire/test_components_py3.py
-endef
-
-PYTHON_FIRE_POST_INSTALL_TARGET_HOOKS += PYTHON_FIRE_RM_PY3_FILE
-endif
-
 $(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 043/107] package/python-flask: drop python2 support

[Peter Korsgaard]

The package alredy depended on python3, so no functional change.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-flask/Config.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in
index 56bfe10f01..8a44bf2db4 100644
--- a/package/python-flask/Config.in
+++ b/package/python-flask/Config.in
@@ -1,15 +1,12 @@
 config BR2_PACKAGE_PYTHON_FLASK
 	bool "python-flask"
-	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_CLICK # runtime
 	select BR2_PACKAGE_PYTHON_JINJA2 # runtime
 	select BR2_PACKAGE_PYTHON_WERKZEUG # runtime
 	select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_SSL
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  Flask is a microframework for Python based on Werkzeug,
 	  Jinja 2 and good intentions.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 044/107] package/python-jsonschema: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-jsonschema/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/python-jsonschema/Config.in b/package/python-jsonschema/Config.in
index b547f4ae1a..7002653722 100644
--- a/package/python-jsonschema/Config.in
+++ b/package/python-jsonschema/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_JSONSCHEMA
 	bool "python-jsonschema"
-	select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  An implementation of JSON Schema validation for Python.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 045/107] package/python-libconfig: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-libconfig/python-libconfig.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/package/python-libconfig/python-libconfig.mk b/package/python-libconfig/python-libconfig.mk
index 2db7e99cf3..c7d87f408a 100644
--- a/package/python-libconfig/python-libconfig.mk
+++ b/package/python-libconfig/python-libconfig.mk
@@ -14,14 +14,8 @@ PYTHON_LIBCONFIG_SETUP_TYPE = setuptools
 
 PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_LIBCONFIG_PYVER = $(PYTHON_VERSION_MAJOR)
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-PYTHON_LIBCONFIG_PYVER = $(PYTHON3_VERSION_MAJOR)
-endif
-
 define PYTHON_LIBCONFIG_FIX_SETUP
-	$(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON_LIBCONFIG_PYVER))/g' \
+	$(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON3_VERSION_MAJOR))/g' \
 		$(@D)/setup.py
 endef
 PYTHON_LIBCONFIG_POST_PATCH_HOOKS += PYTHON_LIBCONFIG_FIX_SETUP
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 046/107] package/python-logbook: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-logbook/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-logbook/Config.in b/package/python-logbook/Config.in
index d4fbf0fe67..99996b6517 100644
--- a/package/python-logbook/Config.in
+++ b/package/python-logbook/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_LOGBOOK
 	bool "python-logbook"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  A logging replacement for Python.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 047/107] package/python-lxml: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-lxml/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-lxml/Config.in b/package/python-lxml/Config.in
index fcb30d56ee..3f3cb5c550 100644
--- a/package/python-lxml/Config.in
+++ b/package/python-lxml/Config.in
@@ -2,8 +2,7 @@ config BR2_PACKAGE_PYTHON_LXML
 	bool "python-lxml"
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  The lxml XML toolkit is a Pythonic binding for the C libraries
 	  libxml2 and libxslt.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 048/107] package/python-m2crypto: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-m2crypto/Config.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/python-m2crypto/Config.in b/package/python-m2crypto/Config.in
index 7481d49e5c..af710d5351 100644
--- a/package/python-m2crypto/Config.in
+++ b/package/python-m2crypto/Config.in
@@ -1,11 +1,8 @@
 config BR2_PACKAGE_PYTHON_M2CRYPTO
 	bool "python-m2crypto"
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
+	select BR2_PACKAGE_PYTHON3_SSL # runtime
 	help
 	  M2Crypto: A Python crypto and SSL toolkit.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 049/107] package/python-pexpect: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-pexpect/python-pexpect.mk | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk
index a9609cbe79..3efda26825 100644
--- a/package/python-pexpect/python-pexpect.mk
+++ b/package/python-pexpect/python-pexpect.mk
@@ -11,14 +11,4 @@ PYTHON_PEXPECT_LICENSE = ISC
 PYTHON_PEXPECT_LICENSE_FILES = LICENSE
 PYTHON_PEXPECT_SETUP_TYPE = distutils
 
-# async.py is not usable with Python 2, and removing is the solution
-# recommended by upstream:
-# https://github.com/pexpect/pexpect/issues/290
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-define PYTHON_PEXPECT_REMOVE_ASYNC_PY
-	$(RM) $(@D)/pexpect/_async.py
-endef
-PYTHON_PEXPECT_POST_PATCH_HOOKS += PYTHON_PEXPECT_REMOVE_ASYNC_PY
-endif
-
 $(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 050/107] package/python-pickleshare: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-pickleshare/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/python-pickleshare/Config.in b/package/python-pickleshare/Config.in
index 35a26637a5..18391b7ce8 100644
--- a/package/python-pickleshare/Config.in
+++ b/package/python-pickleshare/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PICKLESHARE
 	bool "python-pickleshare"
-	select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  Tiny 'shelve'-like database with concurrency support
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 051/107] package/python-pymodbus: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-pymodbus/python-pymodbus.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk
index 9135a4d0c4..d96e21a55c 100644
--- a/package/python-pymodbus/python-pymodbus.mk
+++ b/package/python-pymodbus/python-pymodbus.mk
@@ -11,13 +11,4 @@ PYTHON_PYMODBUS_SETUP_TYPE = setuptools
 PYTHON_PYMODBUS_LICENSE = BSD-3-Clause
 PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_PYMODBUS_RM_PY3_FILES
-	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pymodbus/client/asynchronous/asyncio
-endef
-
-PYTHON_PYMODBUS_POST_INSTALL_TARGET_HOOKS += PYTHON_PYMODBUS_RM_PY3_FILES
-endif
-
 $(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 052/107] package/python-pyqrcode: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-pyqrcode/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/python-pyqrcode/Config.in b/package/python-pyqrcode/Config.in
index 01b7ae8132..d07ab4965a 100644
--- a/package/python-pyqrcode/Config.in
+++ b/package/python-pyqrcode/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_PYTHON_PYQRCODE
 	bool "python-pyqrcode"
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_CODECSCJK if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_CODECSCJK if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
+	select BR2_PACKAGE_PYTHON3_CODECSCJK # runtime
 	help
 	  A QR code generator written purely in Python with SVG, EPS,
 	  PNG and terminal output.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 053/107] package/python-pyqt5: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-pyqt5/python-pyqt5.mk | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk
index b05043563e..af32f63796 100644
--- a/package/python-pyqt5/python-pyqt5.mk
+++ b/package/python-pyqt5/python-pyqt5.mk
@@ -19,14 +19,6 @@ PYTHON_PYQT5_MODULES = \
 	$(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \
 	$(if $(BR2_PACKAGE_QT5BASE_XML),QtXml)
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR)
-PYTHON_PYQT5_RM_PORT_BASE = port_v3
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR)
-PYTHON_PYQT5_RM_PORT_BASE = port_v2
-endif
-
 ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
 PYTHON_PYQT5_MODULES += QtWidgets
 
@@ -159,7 +151,7 @@ PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP
 
 PYTHON_PYQT5_CONF_OPTS = \
 	--bindir $(TARGET_DIR)/usr/bin \
-	--destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \
+	--destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
 	--qmake $(HOST_DIR)/bin/qmake \
 	--sysroot $(STAGING_DIR)/usr \
 	-w --confirm-license \
@@ -186,8 +178,8 @@ endef
 # __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set
 define PYTHON_PYQT5_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install
-	touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py
-	$(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE)
+	touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py
+	$(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2
 endef
 
 $(eval $(generic-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 054/107] package/python-pyroute2: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-pyroute2/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-pyroute2/Config.in b/package/python-pyroute2/Config.in
index 5df0a63d4b..9e685f9d1e 100644
--- a/package/python-pyroute2/Config.in
+++ b/package/python-pyroute2/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_PYROUTE2
 	bool "python-pyroute2"
-	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_SQLITE
 	help
 	  Python netlink library - Linux network / netns / wireless /
 	  ipset configuration.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 055/107] package/python-pyudev: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-pyudev/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in
index fb853956e8..e0da067cc2 100644
--- a/package/python-pyudev/Config.in
+++ b/package/python-pyudev/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_PYTHON_PYUDEV
 	bool "python-pyudev"
 	depends on BR2_PACKAGE_HAS_UDEV
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
 	  pyudev is a LGPL licenced, pure Python 2/3 binding to
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 056/107] package/python-raven: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-raven/Config.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/python-raven/Config.in b/package/python-raven/Config.in
index 0d4b26c054..d02232cfd8 100644
--- a/package/python-raven/Config.in
+++ b/package/python-raven/Config.in
@@ -1,11 +1,8 @@
 config BR2_PACKAGE_PYTHON_RAVEN
 	bool "python-raven"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
+	select BR2_PACKAGE_PYTHON3_SSL
+	select BR2_PACKAGE_PYTHON3_UNICODEDATA
 	help
 	  Raven is a client for Sentry (https://getsentry.com).
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 057/107] package/python-reentry: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-reentry/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/python-reentry/Config.in b/package/python-reentry/Config.in
index 8ebbe395c8..07d8988a18 100644
--- a/package/python-reentry/Config.in
+++ b/package/python-reentry/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_REENTRY
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
 	select BR2_PACKAGE_PYTHON_CLICK # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  A plugin manager based on setuptools entry points mechanism.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 058/107] package/python-remi: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-remi/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-remi/Config.in b/package/python-remi/Config.in
index e0c5e9bfe1..da2c2f4cfb 100644
--- a/package/python-remi/Config.in
+++ b/package/python-remi/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_REMI
 	bool "python-remi"
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_SSL # runtime
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
 	help
 	  Remi is a GUI library for Python applications which transpiles
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 059/107] package/python-scapy: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-scapy/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-scapy/Config.in b/package/python-scapy/Config.in
index 6575a33af3..517fb51714 100644
--- a/package/python-scapy/Config.in
+++ b/package/python-scapy/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_SCAPY
 	bool "python-scapy"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  Scapy: interactive packet manipulation tool.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 060/107] package/python-sentry-sdk: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-sentry-sdk/python-sentry-sdk.mk | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk
index 556f03e137..9238b7fb1c 100644
--- a/package/python-sentry-sdk/python-sentry-sdk.mk
+++ b/package/python-sentry-sdk/python-sentry-sdk.mk
@@ -11,14 +11,4 @@ PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools
 PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause
 PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_SENTRY_SDK_RM_PY3_FILES
-	rm -f $(addprefix $(TARGET_DIR)/usr/lib/python*/site-packages/sentry_sdk/integrations/,\
-		aiohttp.py asgi.py django/asgi.py httpx.py sanic.py tornado.py)
-endef
-
-PYTHON_SENTRY_SDK_POST_INSTALL_TARGET_HOOKS += PYTHON_SENTRY_SDK_RM_PY3_FILES
-endif
-
 $(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 061/107] package/python-setuptools: drop python2 support

[Peter Korsgaard]

For the target.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-setuptools/Config.in            |  6 ++----
 package/python-setuptools/python-setuptools.mk | 16 ----------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/package/python-setuptools/Config.in b/package/python-setuptools/Config.in
index f203d0f814..28228534f8 100644
--- a/package/python-setuptools/Config.in
+++ b/package/python-setuptools/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_PYTHON_SETUPTOOLS
 	bool "python-setuptools"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Download, build, install, upgrade, and uninstall Python
 	  packages.
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 8bca852fe2..04b872fb79 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -4,19 +4,11 @@
 #
 ################################################################################
 
-# For the target variant, we adapt the version depending on whether
-# Python 3.x or 2.x is selected for the target.
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
 # Please keep in sync with
 # package/python3-setuptools/python3-setuptools.mk
 PYTHON_SETUPTOOLS_VERSION = 60.7.0
 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz
 PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440
-else # Python
-PYTHON_SETUPTOOLS_VERSION = 44.0.0
-PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip
-PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485
-endif
 
 # The host variant is only for Python 2.x, so we need to use 44.0.0.
 HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0
@@ -30,14 +22,6 @@ PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python
 PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools
 PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-define PYTHON_SETUPTOOLS_EXTRACT_CMDS
-	$(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE)
-	mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D)
-	$(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)
-endef
-endif
-
 define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS
 	$(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE)
 	mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D)
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 062/107] package/python-sip: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-sip/python-sip.mk | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk
index 1d6c205396..01ccb1ddd5 100644
--- a/package/python-sip/python-sip.mk
+++ b/package/python-sip/python-sip.mk
@@ -10,19 +10,8 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON
 PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0
 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3
 
-PYTHON_SIP_DEPENDENCIES = qt5base
-
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_SIP_DEPENDENCIES += python
-HOST_PYTHON_SIP_DEPENDENCIES += host-python
-PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON_VERSION_MAJOR)
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-PYTHON_SIP_DEPENDENCIES += python3
-HOST_PYTHON_SIP_DEPENDENCIES += host-python3
-PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages
-PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR)
-endif
+PYTHON_SIP_DEPENDENCIES = python3 qt5base
+HOST_PYTHON_SIP_DEPENDENCIES = host-python3
 
 define HOST_PYTHON_SIP_CONFIGURE_CMDS
 	(cd $(@D); \
@@ -41,8 +30,8 @@ define PYTHON_SIP_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \
 			--bindir $(TARGET_DIR)/usr/bin \
-			--destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \
-			--incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \
+			--destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
+			--incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
 			--sipdir $(TARGET_DIR)/usr/share/sip \
 			--sysroot $(STAGING_DIR)/usr \
 			--use-qmake && \
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 063/107] package/python-txtorcon: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-txtorcon/python-txtorcon.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk
index b8414d96d0..acf586cb8c 100644
--- a/package/python-txtorcon/python-txtorcon.mk
+++ b/package/python-txtorcon/python-txtorcon.mk
@@ -11,13 +11,4 @@ PYTHON_TXTORCON_SETUP_TYPE = setuptools
 PYTHON_TXTORCON_LICENSE = MIT
 PYTHON_TXTORCON_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_TXTORCON_RM_PY3_FILE
-	rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/txtorcon/controller_py3.py
-endef
-
-PYTHON_TXTORCON_POST_INSTALL_TARGET_HOOKS += PYTHON_TXTORCON_RM_PY3_FILE
-endif
-
 $(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 064/107] package/python-typing-extensions: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-typing-extensions/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/python-typing-extensions/Config.in b/package/python-typing-extensions/Config.in
index 0c7c74c5fa..b59693282f 100644
--- a/package/python-typing-extensions/Config.in
+++ b/package/python-typing-extensions/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS
 	bool "python-typing-extensions"
-	select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime
 	help
 	  Backported and Experimental Type Hints for Python 3.5+.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 065/107] package/python-urllib3: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-urllib3/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-urllib3/Config.in b/package/python-urllib3/Config.in
index 21d3f6748e..90e10b7969 100644
--- a/package/python-urllib3/Config.in
+++ b/package/python-urllib3/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_URLLIB3
 	bool "python-urllib3"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  Python HTTP library with thread-safe connection pooling, file
 	  post support, sanity friendly, and more.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 066/107] package/python-web2py: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-web2py/Config.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in
index a0452060ba..bb455dfa7a 100644
--- a/package/python-web2py/Config.in
+++ b/package/python-web2py/Config.in
@@ -1,12 +1,9 @@
 config BR2_PACKAGE_PYTHON_WEB2PY
 	bool "python-web2py"
 	select BR2_PACKAGE_PYTHON_PYDAL # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
+	select BR2_PACKAGE_PYTHON3_SQLITE # runtime
 	select BR2_PACKAGE_PYTHON_YATL # runtime
 	help
 	  web2py is a free open source full-stack framework for rapid
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 067/107] package/python-webob: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-webob/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/python-webob/Config.in b/package/python-webob/Config.in
index fe77723f95..d3397587a1 100644
--- a/package/python-webob/Config.in
+++ b/package/python-webob/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_PYTHON_WEBOB
 	bool "python-webob"
-	select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  WSGI request and response object.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 068/107] package/python-websocket-client: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-websocket-client/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-websocket-client/Config.in b/package/python-websocket-client/Config.in
index 0fbb15b328..519e506615 100644
--- a/package/python-websocket-client/Config.in
+++ b/package/python-websocket-client/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT
 	bool "python-websocket-client"
 	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_SSL # runtime
 	help
 	  WebSocket client for python. hybi13 is supported.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 069/107] package/python-werkzeug: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-werkzeug/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in
index 79e9a4561e..27b2fdeaab 100644
--- a/package/python-werkzeug/Config.in
+++ b/package/python-werkzeug/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_WERKZEUG
 	bool "python-werkzeug"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  Werkzeug is a WSGI utility library for Python. It's widely
 	  used and BSD licensed.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 070/107] package/python-whoosh: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-whoosh/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-whoosh/Config.in b/package/python-whoosh/Config.in
index 1128ce6417..e1fb144985 100644
--- a/package/python-whoosh/Config.in
+++ b/package/python-whoosh/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_WHOOSH
 	bool "python-whoosh"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  Whoosh is a fast, pure-Python full text indexing, search and
 	  spell checking library.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 071/107] package/python-xlrd: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-xlrd/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/python-xlrd/Config.in b/package/python-xlrd/Config.in
index 40920f7b02..264ee93e78 100644
--- a/package/python-xlrd/Config.in
+++ b/package/python-xlrd/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_PYTHON_XLRD
 	bool "python-xlrd"
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  Library for developers to extract data from Microsoft
 	  Excel(tm) spreadsheet files.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 072/107] package/python-xmltodict: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-xmltodict/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python-xmltodict/Config.in b/package/python-xmltodict/Config.in
index cb12392c93..af2bbbf489 100644
--- a/package/python-xmltodict/Config.in
+++ b/package/python-xmltodict/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_XMLTODICT
 	bool "python-xmltodict"
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Makes working with XML feel like you are working with JSON.
 
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 073/107] package/python3: drop references to python2

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python3/Config.in  | 1 -
 package/python3/python3.mk | 2 --
 2 files changed, 3 deletions(-)

diff --git a/package/python3/Config.in b/package/python3/Config.in
index 7714518edc..61470c2944 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -4,7 +4,6 @@ comment "python3 needs a toolchain w/ wchar, threads, dynamic library"
 
 config BR2_PACKAGE_PYTHON3
 	bool "python3"
-	depends on !BR2_PACKAGE_PYTHON
 	depends on BR2_USE_WCHAR
 	# uses fork()
 	depends on BR2_USE_MMU
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index f9afcd5097..6af7488ddd 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -260,9 +260,7 @@ define PYTHON3_INSTALL_SYMLINK
 	ln -fs python3 $(TARGET_DIR)/usr/bin/python
 endef
 
-ifneq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK
-endif
 
 # Some packages may have build scripts requiring python3, whatever is the
 # python version chosen for the target.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 074/107] package/ranger: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ranger/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/ranger/Config.in b/package/ranger/Config.in
index ee0ffecd13..a379002f95 100644
--- a/package/ranger/Config.in
+++ b/package/ranger/Config.in
@@ -4,9 +4,8 @@ config BR2_PACKAGE_RANGER
 	depends on BR2_USE_WCHAR # python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
 	depends on !BR2_STATIC_LIBS # python3
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_CURSES
 	help
 	  ranger is a console file manager with VI key bindings. It
 	  provides a minimalistic and nice curses interface with a
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 075/107] package/selinux-python: drop reference to python2

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/selinux-python/Config.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in
index 6a518f97d4..ad50cc0735 100644
--- a/package/selinux-python/Config.in
+++ b/package/selinux-python/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SELINUX_PYTHON
 	bool "selinux-python"
-	depends on !BR2_PACKAGE_PYTHON
 	depends on BR2_USE_MMU
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -46,10 +45,6 @@ comment "sepolgen needs a toolchain w/ gcc 5"
 
 endif
 
-comment "selinux-python needs python3"
-	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_PYTHON
-
 comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 076/107] package/snmpclitools: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/snmpclitools/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/snmpclitools/Config.in b/package/snmpclitools/Config.in
index 00bf5994d1..bf3668a89b 100644
--- a/package/snmpclitools/Config.in
+++ b/package/snmpclitools/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SNMPCLITOOLS
 	bool "snmpclitools"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_PYSMI # runtime
 	select BR2_PACKAGE_PYTHON_PYSNMP # runtime
 	help
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 077/107] package/supervisor: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/supervisor/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/supervisor/Config.in b/package/supervisor/Config.in
index 7ca3cae134..8ba19dc000 100644
--- a/package/supervisor/Config.in
+++ b/package/supervisor/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SUPERVISOR
 	bool "supervisor"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency
 	help
 	  A client/server system that allows its users to control a
@@ -9,5 +9,4 @@ config BR2_PACKAGE_SUPERVISOR
 	  http://supervisord.org/
 
 comment "supervisor needs a python interpreter"
-	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_PACKAGE_PYTHON3
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 078/107] package/suricata: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/suricata/suricata.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk
index 3255fd35a1..86d8970178 100644
--- a/package/suricata/suricata.mk
+++ b/package/suricata/suricata.mk
@@ -116,9 +116,9 @@ else
 SURICATA_CONF_OPTS += --disable-luajit
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 SURICATA_CONF_OPTS += --enable-python
-SURICATA_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
+SURICATA_DEPENDENCIES += python3
 else
 SURICATA_CONF_OPTS += --disable-python
 endif
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 079/107] package/syslog-ng: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/syslog-ng/syslog-ng.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index f37e7c2ea5..c05ec9785c 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -32,12 +32,7 @@ else
 SYSLOG_NG_CONF_OPTS += --disable-linux-caps
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-SYSLOG_NG_DEPENDENCIES += python
-SYSLOG_NG_CONF_OPTS += \
-	--enable-python \
-	--with-python=$(PYTHON_VERSION_MAJOR)
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 SYSLOG_NG_DEPENDENCIES += python3
 SYSLOG_NG_CONF_OPTS += \
 	--enable-python \
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 080/107] package/tovid: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/tovid/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/tovid/Config.in b/package/tovid/Config.in
index f972e18852..3dbb0e229e 100644
--- a/package/tovid/Config.in
+++ b/package/tovid/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_TOVID
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv
@@ -40,8 +40,8 @@ comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9"
 		|| !BR2_USE_WCHAR
 	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
 
-comment "tovid depends on python or python3"
-	depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3
+comment "tovid depends on python3"
+	depends on !BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 081/107] package/trace-cmd: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/trace-cmd/trace-cmd.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index d9ed417f20..fe0cd71ec4 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -18,10 +18,7 @@ ifeq ($(BR2_PACKAGE_AUDIT),y)
 TRACE_CMD_DEPENDENCIES += audit
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-TRACE_CMD_DEPENDENCIES += python host-swig
-TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 TRACE_CMD_DEPENDENCIES += python3 host-swig
 TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3
 else
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 082/107] package/util-linux: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/util-linux/util-linux.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 5a4ff64d01..1ca605f3fb 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -241,9 +241,9 @@ HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs
 endif
 
 # Install libmount Python bindings
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 UTIL_LINUX_CONF_OPTS += --with-python
-UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
+UTIL_LINUX_DEPENDENCIES += python3
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
 UTIL_LINUX_CONF_OPTS += --enable-pylibmount
 else
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 083/107] package/zfs: drop python2 support

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/zfs/zfs.mk | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk
index 0e7e3e4e74..6b542f5c05 100644
--- a/package/zfs/zfs.mk
+++ b/package/zfs/zfs.mk
@@ -37,17 +37,7 @@ else
 ZFS_CONF_OPTS += --disable-systemd
 endif
 
-# The optional PyZFS uses different scripts depending on the python
-# version (ex: arc_summary2 or arc_summary3).
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-ZFS_DEPENDENCIES += python python-setuptools host-python-cffi host-python-packaging
-ZFS_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/usr/bin/python2 \
-	PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \
-	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" \
-	PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"
-ZFS_CONF_OPTS += --enable-pyzfs
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging
 ZFS_CONF_ENV += \
 	PYTHON=$(HOST_DIR)/usr/bin/python3 \
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 084/107] package/python: drop host package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...-do-not-add-invalid-header-locations.patch |  42 ---
 ...get_python_inc-for-cross-compilation.patch |  48 ---
 ...nstall-location-of-_sysconfigdata.py.patch |  88 -----
 ...ilation-of-.pyc-and-.pyo-conditional.patch |  78 -----
 ...taddrinfo-test-for-cross-compilation.patch |  31 --
 ...astructure-to-be-able-to-disable-ext.patch |  81 -----
 ...y-header-paths-for-cross-compilation.patch |  64 ----
 ...ook-in-usr-lib-termcap-for-libraries.patch |  31 --
 ...9-Fix-python-config-for-cross-builds.patch | 229 -------------
 ...ove-the-python-symlink-install-rules.patch |  43 ---
 .../0011-Don-t-add-multiarch-paths.patch      |  36 ---
 .../0012-Abort-on-failed-module-build.patch   |  30 --
 ...d-when-threads-are-not-used-availabl.patch |  58 ----
 .../python/0014-Serial-ioctl-workaround.patch |  33 --
 ...e-shebang-of-Python-scripts-for-cros.patch |  35 --
 ...-disable-installation-of-test-module.patch | 105 ------
 .../0017-Add-an-option-to-disable-pydoc.patch |  89 ------
 ...018-Add-an-option-to-disable-lib2to3.patch |  92 ------
 ...option-to-disable-the-sqlite3-module.patch |  69 ----
 ...d-an-option-to-disable-the-tk-module.patch |  73 -----
 ...-option-to-disable-the-curses-module.patch |  61 ----
 .../0022-Add-an-option-to-disable-expat.patch |  92 ------
 ...-Add-an-option-to-disable-CJK-codecs.patch |  32 --
 .../0024-Add-an-option-to-disable-NIS.patch   |  35 --
 ...Add-an-option-to-disable-unicodedata.patch |  32 --
 .../0026-Add-an-option-to-disable-bsddb.patch |  87 -----
 ...-an-option-to-disable-the-ssl-module.patch |  32 --
 ...-an-option-to-disable-the-bz2-module.patch |  32 --
 ...an-option-to-disable-the-zlib-module.patch |  32 --
 .../0030-Do-not-install-the-idle-editor.patch |  55 ----
 ...on-to-disable-the-ossaudiodev-module.patch |  32 --
 ...option-to-disable-the-hashlib-module.patch |  32 --
 ...an-option-to-disable-readline-module.patch |  32 --
 ...locale-and-set-to-default-when-addin.patch |  37 ---
 package/python/Config.in.host                 |  16 -
 package/python/python.hash                    |   5 -
 package/python/python.mk                      | 302 ------------------
 37 files changed, 2301 deletions(-)
 delete mode 100644 package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
 delete mode 100644 package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
 delete mode 100644 package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
 delete mode 100644 package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
 delete mode 100644 package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
 delete mode 100644 package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
 delete mode 100644 package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
 delete mode 100644 package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
 delete mode 100644 package/python/0009-Fix-python-config-for-cross-builds.patch
 delete mode 100644 package/python/0010-Remove-the-python-symlink-install-rules.patch
 delete mode 100644 package/python/0011-Don-t-add-multiarch-paths.patch
 delete mode 100644 package/python/0012-Abort-on-failed-module-build.patch
 delete mode 100644 package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
 delete mode 100644 package/python/0014-Serial-ioctl-workaround.patch
 delete mode 100644 package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
 delete mode 100644 package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
 delete mode 100644 package/python/0017-Add-an-option-to-disable-pydoc.patch
 delete mode 100644 package/python/0018-Add-an-option-to-disable-lib2to3.patch
 delete mode 100644 package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
 delete mode 100644 package/python/0020-Add-an-option-to-disable-the-tk-module.patch
 delete mode 100644 package/python/0021-Add-an-option-to-disable-the-curses-module.patch
 delete mode 100644 package/python/0022-Add-an-option-to-disable-expat.patch
 delete mode 100644 package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
 delete mode 100644 package/python/0024-Add-an-option-to-disable-NIS.patch
 delete mode 100644 package/python/0025-Add-an-option-to-disable-unicodedata.patch
 delete mode 100644 package/python/0026-Add-an-option-to-disable-bsddb.patch
 delete mode 100644 package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
 delete mode 100644 package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
 delete mode 100644 package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
 delete mode 100644 package/python/0030-Do-not-install-the-idle-editor.patch
 delete mode 100644 package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
 delete mode 100644 package/python/0032-Add-option-to-disable-the-hashlib-module.patch
 delete mode 100644 package/python/0033-Add-an-option-to-disable-readline-module.patch
 delete mode 100644 package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
 delete mode 100644 package/python/Config.in.host
 delete mode 100644 package/python/python.hash
 delete mode 100644 package/python/python.mk

diff --git a/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch b/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
deleted file mode 100644
index 3b2c9833e8..0000000000
--- a/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3dc31a435b67de2ba3dd3457f0c939e20b58e8de Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:17:06 +0100
-Subject: [PATCH] setup.py: do not add invalid header locations
-
-This piece of code incorrectly adds /usr/include to
-self.compiler.include_dirs, and results in the following invalid
-compilation line:
-
-/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC \
-  -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
-  -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \
-  -I/usr/include -I. -IInclude -I./Include \
-  -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \
-  -I/home/thomas/projets/buildroot/output/build/python-2.7.6/Include \
-  -I/home/thomas/projets/buildroot/output/build/python-2.7.6 \
-  -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.c \
-  -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.o
-cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories]
-[...]
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 54054c2..64001e2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -496,7 +496,7 @@ class PyBuildExt(build_ext):
-                     for directory in reversed(options.dirs):
-                         add_dir_to_list(dir_list, directory)
- 
--        if os.path.normpath(sys.prefix) != '/usr' \
-+        if False and os.path.normpath(sys.prefix) != '/usr' \
-                 and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
--- 
-2.7.4
-
diff --git a/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch b/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
deleted file mode 100644
index 1fa4e92788..0000000000
--- a/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 367ee7d103cf9f670c3925d555edf6f6a5b9d8d5 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:17:25 +0100
-Subject: [PATCH] Fix get_python_inc() for cross-compilation
-
-When we are cross compiling, doing os.path.dirname(sys.executable) to
-get the build directory is incorrect, because we're executing the host
-Python to build things for the target. Instead, we should use the
-project_base variable.
-
-This fixes cross-compilation, which was adding incorrect header paths
-pointing to the location where the host Python was built:
-
-/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC -fno-strict-aliasing \
-  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \
-  -I/usr/include -I. -IInclude -I./Include -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \
-  -I/home/thomas/projets/buildroot/output/host/usr/bin/Include -I/home/thomas/projets/buildroot/output/host/usr/bin \
-  -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.c \
-  -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.o
-
-This patch allows to fix the
-/home/thomas/projets/buildroot/output/host/usr/bin/Include and
-/home/thomas/projets/buildroot/output/host/usr/bin paths that are
-incorrectly added to the header paths.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Asaf: update for 2.7.17]
-Signed-off-by: Asaf Kahlon <asafka7@gmail.com>
----
- Lib/distutils/sysconfig.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 1a4b792644..14c7d81c48 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -85,7 +85,7 @@ def get_python_inc(plat_specific=0, prefix=None):
-     if os.name == "posix":
-         if python_build:
-             if sys.executable:
--                buildir = os.path.dirname(sys.executable)
-+                buildir = project_base
-             else:
-                 # sys.executable can be empty if argv[0] has been changed
-                 # and Python is unable to retrieve the real program name
--- 
-2.20.1
-
diff --git a/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch b/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
deleted file mode 100644
index 9e05af2e31..0000000000
--- a/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From e3f3c454ec4992a2283640cef0a35da5a05fb399 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:17:59 +0100
-Subject: [PATCH] Change the install location of _sysconfigdata.py
-
-The _sysconfigdata.py module contains definitions that are needed when
-building Python modules. In cross-compilation mode, when building
-Python extensions for the target, we need to use the _sysconfigdata.py
-of the target Python while executing the host Python.
-
-However until now, the _sysconfigdata.py module was installed in
-build/lib.<arch>-<version> directory, together with a number of
-architecture-specific shared objects, which cannot be used with the
-host Python.
-
-To solve this problem, this patch moves _sysconfigdata.py to a
-separate location, build/sysconfigdata.<arch>-<version>/, and only
-this directory gets added to the PYTHONPATH of the host Python
-interpreter when building Python modules for the target.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 12 ++++++++++--
- configure.ac    |  2 +-
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 9297e7fc89..49d3c0926f 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -509,6 +509,9 @@ pybuilddir.txt: $(BUILDPYTHON)
- 		rm -f ./pybuilddir.txt ; \
- 		exit 1 ; \
- 	fi
-+	echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
-+	mkdir -p `cat pysysconfigdatadir.txt`
-+	cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
- 
- # This is shared by the math and cmath modules
- Modules/_math.o: Modules/_math.c Modules/_math.h
-@@ -1091,7 +1094,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 		else	true; \
- 		fi; \
- 	done
--	@for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \
-+	@for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \
- 	do \
- 		if test -x $$i; then \
- 			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1101,6 +1104,11 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 			echo $(INSTALL_DATA) $$i $(LIBDEST); \
- 		fi; \
- 	done
-+	$(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \
-+		$(DESTDIR)$(LIBDEST)
-+	mkdir -p $(DESTDIR)$(LIBDEST)/sysconfigdata
-+	$(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \
-+		$(DESTDIR)$(LIBDEST)/sysconfigdata
- 	@for d in $(LIBSUBDIRS); \
- 	do \
- 		a=$(srcdir)/Lib/$$d; \
-@@ -1426,7 +1434,7 @@ distclean: clobber
- 		Modules/Setup Modules/Setup.local Modules/Setup.config \
- 		Modules/ld_so_aix Modules/python.exp Misc/python.pc
- 	-rm -f python*-gdb.py
--	-rm -f pybuilddir.txt
-+	-rm -f pybuilddir.txt pysysconfigdatadir.txt
- 	# Issue #28258: set LC_ALL to avoid issues with Estonian locale.
- 	# Expansion is performed here by shell (spawned by make) itself before
- 	# arguments are passed to find. So LC_ALL=C must be set as a separate
-diff --git a/configure.ac b/configure.ac
-index aecf6066e8..7143172b98 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,7 +36,7 @@ if test "$cross_compiling" = yes; then
- 	    AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
- 	fi
-         AC_MSG_RESULT($interp)
--	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
-+	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
-     fi
- elif test "$cross_compiling" = maybe; then
-     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
--- 
-2.11.0
-
diff --git a/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch b/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
deleted file mode 100644
index ef1eb04046..0000000000
--- a/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 57ab41fa019d3ce276decd488938e5a00049cb9d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:18:57 +0100
-Subject: [PATCH] Make the compilation of .pyc and .pyo conditional
-
-This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable
-the compilation of pyc/pyo files.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in |  8 ++++++++
- configure.ac    | 11 +++++++++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 49d3c0926f..247d3c2902 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1139,24 +1139,32 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
- 	fi
-+ifeq (@PYC_BUILD@,yes)
- 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
-+endif
-+ifeq (@PYO_BUILD@,yes)
- 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
-+endif
-+ifeq (@PYC_BUILD@,yes)
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-+endif
-+ifeq (@PYO_BUILD@,yes)
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-+endif
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-diff --git a/configure.ac b/configure.ac
-index 7143172b98..6bd8369105 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -773,6 +773,17 @@ SunOS*)
-     ;;
- esac
- 
-+AC_SUBST(PYC_BUILD)
-+
-+AC_ARG_ENABLE(pyc-build,
-+	AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]),
-+	[ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ])
-+
-+AC_SUBST(PYO_BUILD)
-+
-+AC_ARG_ENABLE(pyo-build,
-+	AS_HELP_STRING([--disable-pyo-build], [disable build of pyo files]),
-+	[ PYO_BUILD="${enableval}" ], [ PYO_BUILD=yes ])
- 
- AC_SUBST(LIBRARY)
- AC_MSG_CHECKING(LIBRARY)
--- 
-2.11.0
-
diff --git a/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch b/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
deleted file mode 100644
index c910ae7181..0000000000
--- a/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e674e29ceba34e55c9149ce99489e543aa4ebb01 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:19:47 +0100
-Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation
-
-The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't
-cross-compilation friendly.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6bd8369105..77ca6d86ca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3563,7 +3563,7 @@ fi
- 
- AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
- 
--if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
-+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
- then
- 	if test $ipv6 = yes
- 	then
--- 
-2.11.0
-
diff --git a/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch b/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
deleted file mode 100644
index b1a20eb04e..0000000000
--- a/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 94ec96dd8827adfb5e272d28a4d76510e28657b3 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:21:28 +0100
-Subject: [PATCH] Add minimal infrastructure to be able to disable extensions
-
-This commit adds some logic to the Python build system to be able to
-disable Python extensions. Follow-up commits actually add options to
-disable specific extensions.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 6 +++++-
- configure.ac    | 2 ++
- setup.py        | 5 ++++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 247d3c2902..c1c98ecc5a 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -160,6 +160,8 @@ FILEMODE=	644
- # configure script arguments
- CONFIG_ARGS=	@CONFIG_ARGS@
- 
-+# disabled extensions
-+DISABLED_EXTENSIONS=	@DISABLED_EXTENSIONS@
- 
- # Subdirectories with code
- SRCDIRS= 	@SRCDIRS@
-@@ -528,6 +530,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
- 	esac; \
- 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
-+		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
- 
- # Build static library
-@@ -1280,7 +1283,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
--	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
-+	$(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
-+		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
- 	   	--prefix=$(prefix) \
- 		--install-scripts=$(BINDIR) \
- 		--install-platlib=$(DESTSHARED) \
-diff --git a/configure.ac b/configure.ac
-index 77ca6d86ca..13f90b3ddd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2491,6 +2491,8 @@ LIBS="$withval $LIBS"
- 
- PKG_PROG_PKG_CONFIG
- 
-+AC_SUBST(DISABLED_EXTENSIONS)
-+
- # Check for use of the system expat library
- AC_MSG_CHECKING(for --with-system-expat)
- AC_ARG_WITH(system_expat,
-diff --git a/setup.py b/setup.py
-index 812d53d560..d426dd02ea 100644
---- a/setup.py
-+++ b/setup.py
-@@ -33,7 +33,10 @@ host_platform = get_platform()
- COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
- 
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+try:
-+    disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
-+except KeyError:
-+    disabled_module_list = list()
- 
- def add_dir_to_list(dirlist, dir):
-     """Add the directory 'dir' to the list 'dirlist' (at the front) if
--- 
-2.11.0
-
diff --git a/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch b/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
deleted file mode 100644
index c68f1bf7f2..0000000000
--- a/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f3e0a677c4736f95338825a022a884f8dc7a5c14 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:22:19 +0100
-Subject: [PATCH] Adjust library/header paths for cross-compilation
-
-When cross-compiling third-party extensions, the get_python_inc() or
-get_python_lib() can be called, to return the path to headers or
-libraries. However, they use the sys.prefix of the host Python, which
-returns incorrect paths when cross-compiling (paths pointing to host
-headers and libraries).
-
-In order to fix this, we introduce the _python_sysroot, _python_prefix
-and _python_exec_prefix variables, that allow to override these
-values, and get correct header/library paths when cross-compiling
-third-party Python modules.
-
-The _python_sysroot variable is also used to prefix the LIBDIR value
-taken from the sysconfigdata module.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Lib/distutils/command/build_ext.py | 5 ++++-
- Lib/distutils/sysconfig.py         | 9 +++++++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
-index 2c68be3..375b08c 100644
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -240,7 +240,10 @@ class build_ext (Command):
-         if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-             if not sysconfig.python_build:
-                 # building third party extensions
--                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
-+                libdir = sysconfig.get_config_var('LIBDIR')
-+                if "_python_sysroot" in os.environ:
-+                    libdir = os.environ.get("_python_sysroot") + libdir
-+                self.library_dirs.append(libdir)
-             else:
-                 # building python standard extensions
-                 self.library_dirs.append('.')
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index d72b6e5..72151df 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -19,8 +19,13 @@ import sys
- 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)
-+if "_python_sysroot" in os.environ:
-+    _sysroot=os.environ.get('_python_sysroot')
-+    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
-+    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
-+else:
-+    PREFIX = os.path.normpath(sys.prefix)
-+    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
- 
- # 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,
--- 
-2.7.4
-
diff --git a/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
deleted file mode 100644
index d523b74638..0000000000
--- a/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 87b627d8845e67fd798449b414bece04f18bd450 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:22:40 +0100
-Subject: [PATCH] Don't look in /usr/lib/termcap for libraries
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 3b51c0a..fa32532 100644
---- a/setup.py
-+++ b/setup.py
-@@ -784,12 +784,9 @@ class PyBuildExt(build_ext):
-                 pass # Issue 7384: Already linked against curses or tinfo.
-             elif curses_library:
-                 readline_libs.append(curses_library)
--            elif self.compiler.find_library_file(lib_dirs +
--                                                     ['/usr/lib/termcap'],
--                                                     'termcap'):
-+            elif self.compiler.find_library_file(lib_dirs, 'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
-         else:
--- 
-2.7.4
-
diff --git a/package/python/0009-Fix-python-config-for-cross-builds.patch b/package/python/0009-Fix-python-config-for-cross-builds.patch
deleted file mode 100644
index 3cf8797c03..0000000000
--- a/package/python/0009-Fix-python-config-for-cross-builds.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From 1522c6c00ee88eb1148d3b2021d32d819b416375 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 7 Mar 2017 22:23:14 +0100
-Subject: [PATCH] Fix python-config for cross-builds
-
-Add a backport of http://bugs.python.org/issue16235 so we can use
-python-config for cross builds.
-
-This basically replaces the python version of python-config with a
-pure-shell version that's already preprocessed when installed and
-doesn't depend on the sysconfig import that usually leads to bad
-data/results.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-[Bernd: rebased for Python 2.7.15]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in          |  13 +++---
- Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac             |   7 +++-
- 3 files changed, 116 insertions(+), 6 deletions(-)
- create mode 100644 Misc/python-config.sh.in
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index c1c98ecc5a..727a92af42 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -170,7 +170,7 @@ SRCDIRS= 	@SRCDIRS@
- SUBDIRSTOO=	Include Lib Misc Demo
- 
- # Files and directories to be distributed
--CONFIGFILES=	configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in
-+CONFIGFILES=	configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in Misc/python-config.sh
- DISTFILES=	README ChangeLog $(CONFIGFILES)
- DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
- DIST=		$(DISTFILES) $(DISTDIRS)
-@@ -403,7 +403,7 @@ LIBRARY_OBJS=	\
- 
- # Default target
- all:		@DEF_MAKE_ALL_RULE@
--build_all:	check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
-+build_all:	check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
- 
- # Check that the source is clean when building out of source.
- check-clean-src:
-@@ -1190,10 +1190,12 @@ $(srcdir)/Lib/$(PLATDIR):
- 	fi; \
- 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
- 
--python-config: $(srcdir)/Misc/python-config.in
-+python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
- 	# Substitution happens here, as the completely-expanded BINDIR
- 	# is not available in configure
--	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
-+	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
-+	# Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
-+	sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' Misc/python-config.sh >python-config
- 
- # Install the include files
- INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1252,7 +1254,7 @@ libainstall:	@DEF_MAKE_RULE@ python-config
- 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
- 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
- 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
--	rm python-config
-+	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
- 	@if [ -s Modules/python.exp -a \
- 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
- 		echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1434,6 +1436,7 @@ clobber: clean profile-removal
- 		config.cache config.log pyconfig.h Modules/config.c
- 	-rm -rf build platform
- 	-rm -rf $(PYTHONFRAMEWORKDIR)
-+	-rm -f python-config.py python-config
- 
- # Make things extra clean, before making a distribution:
- # remove all generated files, even Makefile[.pre]
-diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
-new file mode 100644
-index 0000000000..10db4c12eb
---- /dev/null
-+++ b/Misc/python-config.sh.in
-@@ -0,0 +1,102 @@
-+#!/bin/sh
-+
-+exit_with_usage ()
-+{
-+	echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir"
-+	exit $1
-+}
-+
-+if [ "$1" = "" ] ; then
-+	exit_with_usage 1
-+fi
-+
-+# Returns the actual prefix where this script was installed to.
-+installed_prefix ()
-+{
-+	RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
-+	if which readlink >/dev/null 2>&1 ; then
-+	RESULT=$(readlink -f "$RESULT")
-+	fi
-+	echo $RESULT
-+}
-+
-+prefix_build="@prefix@"
-+prefix_real=$(installed_prefix "$0")
-+
-+# Use sed to fix paths from their built to locations to their installed to locations.
-+prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
-+exec_prefix_build="@exec_prefix@"
-+exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
-+includedir=$(echo "@includedir@")
-+libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
-+CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
-+VERSION="@VERSION@"
-+LIBM="@LIBM@"
-+LIBC="@LIBC@"
-+SYSLIBS="$LIBM $LIBC"
-+LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}"
-+BASECFLAGS="@BASECFLAGS@"
-+LDLIBRARY="@LDLIBRARY@"
-+LINKFORSHARED="@LINKFORSHARED@"
-+OPT="@OPT@"
-+PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
-+LDVERSION="@LDVERSION@"
-+LIBDEST=${prefix}/lib/python${VERSION}
-+LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
-+SO="@SO@"
-+PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
-+INCDIR="-I$includedir/python${VERSION}"
-+PLATINCDIR="-I$includedir/python${VERSION}"
-+
-+# Scan for --help or unknown argument.
-+for ARG in $*
-+do
-+	case $ARG in
-+	--help)
-+		exit_with_usage 0
-+	;;
-+	--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--abiflags|--configdir)
-+	;;
-+	*)
-+		exit_with_usage 1
-+	;;
-+esac
-+done
-+
-+for ARG in "$@"
-+do
-+	case "$ARG" in
-+	--prefix)
-+		echo "$prefix"
-+	;;
-+	--exec-prefix)
-+		echo "$exec_prefix"
-+	;;
-+	--includes)
-+		 echo "$INCDIR $PLATINCDIR"
-+	;;
-+	--cflags)
-+		echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT"
-+	;;
-+	--libs)
-+		echo "$LIBS"
-+	;;
-+	--ldflags)
-+		LINKFORSHAREDUSED=
-+		if [ -z "$PYTHONFRAMEWORK" ] ; then
-+			LINKFORSHAREDUSED=$LINKFORSHARED
-+		fi
-+		LIBPLUSED=
-+		if [ "$PY_ENABLE_SHARED" = "0" ] ; then
-+			LIBPLUSED="-L$LIBPL"
-+		fi
-+		echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED"
-+	;;
-+	--extension-suffix)
-+		echo "$SO"
-+	;;
-+	--configdir)
-+		echo "$LIBPL"
-+	;;
-+esac
-+done
-diff --git a/configure.ac b/configure.ac
-index 13f90b3ddd..3f28ef1371 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -919,6 +919,7 @@ fi
- 
- # Other platforms follow
- if test $enable_shared = "yes"; then
-+  PY_ENABLE_SHARED=1
-   AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
-   case $ac_sys_system in
-     BeOS*)
-@@ -979,6 +980,7 @@ if test $enable_shared = "yes"; then
- 
-   esac
- else # shared is disabled
-+  PY_ENABLE_SHARED=0
-   case $ac_sys_system in
-     CYGWIN*)
-           BLDLIBRARY='$(LIBRARY)'
-@@ -2128,6 +2130,9 @@ AC_SUBST(LDCXXSHARED)
- AC_SUBST(BLDSHARED)
- AC_SUBST(CCSHARED)
- AC_SUBST(LINKFORSHARED)
-+AC_SUBST(PY_ENABLE_SHARED)
-+LIBPL="${prefix}/lib/python${VERSION}/config"
-+AC_SUBST(LIBPL)
- # SO is the extension of shared libraries `(including the dot!)
- # -- usually .so, .sl on HP-UX, .dll on Cygwin
- AC_MSG_CHECKING(SO)
-@@ -4944,7 +4949,7 @@ AC_MSG_RESULT($ENSUREPIP)
- AC_SUBST(ENSUREPIP)
- 
- # generate output files
--AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
-+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
- AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
- AC_OUTPUT
- 
--- 
-2.11.0
-
diff --git a/package/python/0010-Remove-the-python-symlink-install-rules.patch b/package/python/0010-Remove-the-python-symlink-install-rules.patch
deleted file mode 100644
index 4a2116b1b0..0000000000
--- a/package/python/0010-Remove-the-python-symlink-install-rules.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 706d62599fb3c3cb9b9941364aaf4a1ef4ebd276 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Tue, 7 Mar 2017 22:23:58 +0100
-Subject: [PATCH] Remove the python symlink install rules
-
-The python symlink installation will be handled by Buildroot itself,
-because Buildroot needs to control to what python interpreter (python2
-or python3) the python symlink points to.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Bernd: rebased against version 2.7.12.]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 727a92af42..37b2ff3a5f 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -978,17 +978,10 @@ bininstall:	altbininstall
- 		echo "Creating directory $(LIBPC)"; \
- 		$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
- 	fi
--	-if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \
--	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
--	else true; \
--	fi
--	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
- 	-rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE))
- 	-rm -f $(DESTDIR)$(BINDIR)/python2-config
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config)
--	-rm -f $(DESTDIR)$(BINDIR)/python-config
--	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config)
- 	-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
- 	-rm -f $(DESTDIR)$(LIBPC)/python2.pc
- 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
--- 
-2.11.0
-
diff --git a/package/python/0011-Don-t-add-multiarch-paths.patch b/package/python/0011-Don-t-add-multiarch-paths.patch
deleted file mode 100644
index b84c9077c9..0000000000
--- a/package/python/0011-Don-t-add-multiarch-paths.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 50a243a9c90f95e9248ac720e42e802b5922ab90 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:24:28 +0100
-Subject: [PATCH] Don't add multiarch paths
-
-The add_multiarch_paths() function leads, in certain build
-environments, to the addition of host header paths to the CFLAGS,
-which is not appropriate for cross-compilation. This patch fixes that
-by simply removing the call to add_multiarch_paths() when we're
-cross-compiling.
-
-Investigation done by David <buildroot-2014@inbox.com>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index fa32532..0b9ea57 100644
---- a/setup.py
-+++ b/setup.py
-@@ -461,9 +461,9 @@ class PyBuildExt(build_ext):
-         if not cross_compiling:
-             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+            self.add_multiarch_paths()
-         if cross_compiling:
-             self.add_gcc_paths()
--        self.add_multiarch_paths()
- 
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
--- 
-2.7.4
-
diff --git a/package/python/0012-Abort-on-failed-module-build.patch b/package/python/0012-Abort-on-failed-module-build.patch
deleted file mode 100644
index 7d952ca5c2..0000000000
--- a/package/python/0012-Abort-on-failed-module-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a131e2ff219872d97eef6585117bd2f8ff9e310d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:24:48 +0100
-Subject: [PATCH] Abort on failed module build
-
-When building a Python module fails, the setup.py script currently
-doesn't exit with an error, and simply continues. This is not a really
-nice behavior, so this patch changes setup.py to abort with an error,
-so that the build issue is clearly noticeable.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index 0b9ea57..9a5c2b8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -299,6 +299,7 @@ class PyBuildExt(build_ext):
-             print "Failed to build these modules:"
-             print_three_column(failed)
-             print
-+            sys.exit(1)
- 
-     def build_extension(self, ext):
- 
--- 
-2.7.4
-
diff --git a/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch b/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
deleted file mode 100644
index dfc11efc7e..0000000000
--- a/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0f0be88526ece7d2f6ee21c1f59b1546ec6dc7c0 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Tue, 7 Mar 2017 22:25:14 +0100
-Subject: [PATCH] sqlite3: fix build when threads are not used/available
-
-When threads are not used/available, a function in the sqlite3 extension
-ends up with a label at the end:
-
-    void _pysqlite_final_callback(sqlite3_context* context)
-    {
-        PyObject* function_result;
-        PyObject** aggregate_instance;
-        int ok;
-
-    #ifdef WITH_THREAD
-        PyGILState_STATE threadstate;
-
-        threadstate = PyGILState_Ensure();
-    #endif
-
-        aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
-        if (!*aggregate_instance) {
-            goto error;
-        }
-
-        [......]
-
-    error:
-    #ifdef WITH_THREAD
-        PyGILState_Release(threadstate);
-    #endif
-    }
-
-This is not valid, and gcc complains.
-
-Fix that by adding a dummy statement after the label, so that the label
-is never the last statement of the function.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- Modules/_sqlite/connection.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
-index 237d6e4..cdf69ab 100644
---- a/Modules/_sqlite/connection.c
-+++ b/Modules/_sqlite/connection.c
-@@ -794,6 +794,7 @@ error:
- #ifdef WITH_THREAD
-     PyGILState_Release(threadstate);
- #endif
-+    ;   /* Make gcc happy: a label can't be at the end of a function */
- }
- 
- static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
--- 
-2.7.4
-
diff --git a/package/python/0014-Serial-ioctl-workaround.patch b/package/python/0014-Serial-ioctl-workaround.patch
deleted file mode 100644
index 468d535ac3..0000000000
--- a/package/python/0014-Serial-ioctl-workaround.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 22e5a4c5d29ddf0856d7f68f5a613aec00e26168 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 7 Mar 2017 22:25:36 +0100
-Subject: [PATCH] Serial ioctl() workaround
-
-The ioctls.h of some architectures (notably xtensa) references structs from
-linux/serial.h. Make sure to include this header as well.
-
-Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct,
-but isn't actually referenced in modern kernels.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- Modules/termios.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Modules/termios.c b/Modules/termios.c
-index 57f30dc..a8c9855 100644
---- a/Modules/termios.c
-+++ b/Modules/termios.c
-@@ -16,7 +16,9 @@
-  * so this needs to be included first on that platform. */
- #include <termio.h>
- #endif
-+#include <linux/serial.h>
- #include <sys/ioctl.h>
-+#undef TIOCTTYGSTRUCT
- 
- /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
-  * MDTR, MRI, and MRTS (appearantly used internally by some things
--- 
-2.7.4
-
diff --git a/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
deleted file mode 100644
index fecf29f4d6..0000000000
--- a/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 70049366ddf1fc9084bb02cf4459380976cdf8f7 Mon Sep 17 00:00:00 2001
-From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
-Date: Tue, 7 Mar 2017 22:26:09 +0100
-Subject: [PATCH] Do not adjust the shebang of Python scripts for
- cross-compilation
-
-The copy_scripts() method in distutils copies the scripts listed in
-the setup file and adjusts the first line to refer to the current
-Python interpreter. When cross-compiling, this means that the adjusted
-shebang refers to the host Python interpreter.
-
-This patch modifies copy_scripts() to preserve the shebang when
-cross-compilation is detected.
-
-Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
----
- Lib/distutils/command/build_scripts.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
-index 567df65..4922d50 100644
---- a/Lib/distutils/command/build_scripts.py
-+++ b/Lib/distutils/command/build_scripts.py
-@@ -89,7 +89,7 @@ class build_scripts (Command):
-                     adjust = 1
-                     post_interp = match.group(1) or ''
- 
--            if adjust:
-+            if adjust and not '_python_sysroot' in os.environ:
-                 log.info("copying and adjusting %s -> %s", script,
-                          self.build_dir)
-                 if not self.dry_run:
--- 
-2.7.4
-
diff --git a/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch b/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
deleted file mode 100644
index 600fc40b69..0000000000
--- a/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 2c1810fb002128a6d33cc3a391a157e316479d15 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:27:16 +0100
-Subject: [PATCH] Add an option to disable installation of test modules
-
-The Python standard distribution comes with many test modules, that
-are not necessarly useful on embedded targets.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Bernd: rebased against version 2.7.14]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 50 +++++++++++++++++++++++++++++++++-----------------
- configure.ac    |  6 ++++++
- 2 files changed, 39 insertions(+), 17 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 37b2ff3a5f..2a5e8adc61 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1048,28 +1048,44 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
- 	plat-mac/lib-scriptpackages/SystemEvents \
- 	plat-mac/lib-scriptpackages/Terminal
- PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
--LIBSUBDIRS=	lib-tk lib-tk/test lib-tk/test/test_tkinter \
--		lib-tk/test/test_ttk site-packages test test/audiodata test/capath \
--		test/data test/cjkencodings test/decimaltestdata test/xmltestdata \
--		test/imghdrdata \
--		test/subprocessdata \
--		test/support \
--		test/tracedmodules \
-+LIBSUBDIRS=	lib-tk site-packages \
- 		encodings compiler hotshot \
--		email email/mime email/test email/test/data \
-+		email email/mime \
- 		ensurepip ensurepip/_bundled \
--		json json/tests \
--		sqlite3 sqlite3/test \
--		logging bsddb bsddb/test csv importlib wsgiref \
--		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
--		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
--		ctypes ctypes/test ctypes/macholib \
--		idlelib idlelib/Icons idlelib/idle_test \
--		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
-+		json \
-+		sqlite3  \
-+		logging bsddb csv importlib wsgiref \
-+		lib2to3 lib2to3/fixes lib2to3/pgen2 \
-+		ctypes ctypes/macholib \
-+		idlelib idlelib/Icons \
-+		distutils distutils/command $(XMLLIBSUBDIRS) \
- 		multiprocessing multiprocessing/dummy \
--		unittest unittest/test \
-+		unittest \
- 		lib-old \
- 		curses pydoc_data $(MACHDEPS)
-+
-+TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
-+	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-+	test/cjkencodings test/decimaltestdata test/xmltestdata \
-+	test/imghdrdata \
-+	test/subprocessdata \
-+	test/support \
-+	test/tracedmodules \
-+	email/test email/test/data \
-+	json/tests \
-+	sqlite3/test \
-+	bsddb/test \
-+	lib2to3/tests \
-+ 	lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
-+	ctypes/test \
-+	idlelib/idle_test \
-+	distutils/tests \
-+	unittest/test
-+
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += $(TESTSUBDIRS)
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index 3f28ef1371..f257a25620 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2835,6 +2835,12 @@ if test "$posix_threads" = "yes"; then
- fi
- 
- 
-+AC_SUBST(TEST_MODULES)
-+
-+AC_ARG_ENABLE(test-modules,
-+	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
-+	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
-+
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
- AC_MSG_CHECKING([if --enable-ipv6 is specified])
--- 
-2.11.0
-
diff --git a/package/python/0017-Add-an-option-to-disable-pydoc.patch b/package/python/0017-Add-an-option-to-disable-pydoc.patch
deleted file mode 100644
index 48c1b570df..0000000000
--- a/package/python/0017-Add-an-option-to-disable-pydoc.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From f98c3f981643411449aba6f93178b2ca14f9a68c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:27:34 +0100
-Subject: [PATCH] Add an option to disable pydoc
-
-It removes 0.5 MB of data from the target plus the pydoc script
-itself.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in |  6 +++++-
- configure.ac    |  5 +++++
- setup.py        | 10 +++++++---
- 3 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2a5e8adc61..d3ba1aeb4e 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1062,7 +1062,7 @@ LIBSUBDIRS=	lib-tk site-packages \
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
- 		lib-old \
--		curses pydoc_data $(MACHDEPS)
-+		curses $(MACHDEPS)
- 
- TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- 	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-@@ -1086,6 +1086,10 @@ ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
- 
-+ifeq (@PYDOC@,yes)
-+LIBSUBDIRS += pydoc_data
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index f257a25620..2ed4119478 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2834,6 +2834,11 @@ if test "$posix_threads" = "yes"; then
-       AC_CHECK_FUNCS(pthread_atfork)
- fi
- 
-+AC_SUBST(PYDOC)
-+
-+AC_ARG_ENABLE(pydoc,
-+	AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
-+	[ PYDOC="${enableval}" ], [ PYDOC=yes ])
- 
- AC_SUBST(TEST_MODULES)
- 
-diff --git a/setup.py b/setup.py
-index 2ef5b07189..49f810f72e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2277,6 +2277,12 @@ def main():
-     # turn off warnings when deprecated modules are imported
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
-+
-+    scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3',
-+               'Lib/smtpd.py']
-+    if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        scripts += [ 'Tools/scripts/pydoc' ]
-+
-     setup(# PyPI Metadata (PEP 301)
-           name = "Python",
-           version = sys.version.split()[0],
-@@ -2297,9 +2303,7 @@ def main():
-           ext_modules=[Extension('_struct', ['_struct.c'])],
- 
-           # Scripts to install
--          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
--                     'Tools/scripts/2to3',
--                     'Lib/smtpd.py']
-+          scripts = scripts,
-         )
- 
- # --install-platlib
--- 
-2.11.0
-
diff --git a/package/python/0018-Add-an-option-to-disable-lib2to3.patch b/package/python/0018-Add-an-option-to-disable-lib2to3.patch
deleted file mode 100644
index 2c539fac35..0000000000
--- a/package/python/0018-Add-an-option-to-disable-lib2to3.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From d7f419246681e12f05e2eefc79286959c6aa18ab Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:27:49 +0100
-Subject: [PATCH] Add an option to disable lib2to3
-
-lib2to3 is a library to convert Python 2.x code to Python 3.x. As
-such, it is probably not very useful on embedded system targets.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 11 ++++++++---
- configure.ac    |  6 ++++++
- setup.py        |  5 +++--
- 3 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index d3ba1aeb4e..0e15b6d6f4 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1055,7 +1055,6 @@ LIBSUBDIRS=	lib-tk site-packages \
- 		json \
- 		sqlite3  \
- 		logging bsddb csv importlib wsgiref \
--		lib2to3 lib2to3/fixes lib2to3/pgen2 \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
- 		distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1075,8 +1074,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- 	json/tests \
- 	sqlite3/test \
- 	bsddb/test \
--	lib2to3/tests \
-- 	lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
- 	ctypes/test \
- 	idlelib/idle_test \
- 	distutils/tests \
-@@ -1090,6 +1087,14 @@ ifeq (@PYDOC@,yes)
- LIBSUBDIRS += pydoc_data
- endif
- 
-+ifeq (@LIB2TO3@,yes)
-+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
-+TESTSUBDIRS += 	lib2to3/tests				\
-+		lib2to3/tests/data			\
-+		lib2to3/tests/data/fixers		\
-+		lib2to3/tests/data/fixers/myfixes
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index 2ed4119478..a2810ab8ed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(test-modules,
- 	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
- 	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
- 
-+AC_SUBST(LIB2TO3)
-+
-+AC_ARG_ENABLE(lib2to3,
-+	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
-+	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
-+
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
- AC_MSG_CHECKING([if --enable-ipv6 is specified])
-diff --git a/setup.py b/setup.py
-index 49f810f72e..9130819454 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2278,10 +2278,11 @@ def main():
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
- 
--    scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3',
--               'Lib/smtpd.py']
-+    scripts = ['Tools/scripts/idle', 'Lib/smtpd.py']
-     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-         scripts += [ 'Tools/scripts/pydoc' ]
-+    if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        scripts += [ 'Tools/scripts/2to3' ]
- 
-     setup(# PyPI Metadata (PEP 301)
-           name = "Python",
--- 
-2.11.0
-
diff --git a/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch b/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
deleted file mode 100644
index 433bb2973e..0000000000
--- a/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 123ecc50932e3ad3f7a2d90d430b74822c9695d4 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:28:06 +0100
-Subject: [PATCH] Add option to disable the sqlite3 module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 7 +++++--
- configure.ac    | 9 +++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 0e15b6d6f4..a2e5ac6d41 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1053,7 +1053,6 @@ LIBSUBDIRS=	lib-tk site-packages \
- 		email email/mime \
- 		ensurepip ensurepip/_bundled \
- 		json \
--		sqlite3  \
- 		logging bsddb csv importlib wsgiref \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
-@@ -1072,7 +1071,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- 	test/tracedmodules \
- 	email/test email/test/data \
- 	json/tests \
--	sqlite3/test \
- 	bsddb/test \
- 	ctypes/test \
- 	idlelib/idle_test \
-@@ -1095,6 +1093,11 @@ TESTSUBDIRS += 	lib2to3/tests				\
- 		lib2to3/tests/data/fixers/myfixes
- endif
- 
-+ifeq (@SQLITE3@,yes)
-+LIBSUBDIRS += sqlite3
-+TESTSUBDIRS += sqlite3/test
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index a2810ab8ed..4ee3c60501 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2834,6 +2834,15 @@ if test "$posix_threads" = "yes"; then
-       AC_CHECK_FUNCS(pthread_atfork)
- fi
- 
-+AC_SUBST(SQLITE3)
-+AC_ARG_ENABLE(sqlite3,
-+	AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
-+	[ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
-+
-+if test "$SQLITE3" = "no" ; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
--- 
-2.11.0
-
diff --git a/package/python/0020-Add-an-option-to-disable-the-tk-module.patch b/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
deleted file mode 100644
index 26ae1799f8..0000000000
--- a/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From f0dc1198360c6875ed846a961e85dc41e239aa29 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:28:57 +0100
-Subject: [PATCH] Add an option to disable the tk module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 11 ++++++++---
- configure.ac    |  9 +++++++++
- 2 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index a2e5ac6d41..37ed70ab1d 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1048,7 +1048,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
- 	plat-mac/lib-scriptpackages/SystemEvents \
- 	plat-mac/lib-scriptpackages/Terminal
- PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
--LIBSUBDIRS=	lib-tk site-packages \
-+LIBSUBDIRS=	site-packages \
- 		encodings compiler hotshot \
- 		email email/mime \
- 		ensurepip ensurepip/_bundled \
-@@ -1062,8 +1062,7 @@ LIBSUBDIRS=	lib-tk site-packages \
- 		lib-old \
- 		curses $(MACHDEPS)
- 
--TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
--	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-+TESTSUBDIRS = test test/audiodata test/capath test/data \
- 	test/cjkencodings test/decimaltestdata test/xmltestdata \
- 	test/imghdrdata \
- 	test/subprocessdata \
-@@ -1098,6 +1097,12 @@ LIBSUBDIRS += sqlite3
- TESTSUBDIRS += sqlite3/test
- endif
- 
-+ifeq (@TK@,yes)
-+LIBSUBDIRS += lib-tk
-+TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter	\
-+	      lib-tk/test/test_ttk
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index 4ee3c60501..2c20f826c5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2843,6 +2843,15 @@ if test "$SQLITE3" = "no" ; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- fi
- 
-+AC_SUBST(TK)
-+AC_ARG_ENABLE(tk,
-+	AS_HELP_STRING([--disable-tk], [disable tk]),
-+	[ TK="${enableval}" ], [ TK=yes ])
-+
-+if test "$TK" = "no"; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
--- 
-2.11.0
-
diff --git a/package/python/0021-Add-an-option-to-disable-the-curses-module.patch b/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
deleted file mode 100644
index 3b1ab7fb4c..0000000000
--- a/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 3e51eef24c51b986c37b354f3de98218eb76909c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:29:06 +0100
-Subject: [PATCH] Add an option to disable the curses module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 6 +++++-
- configure.ac    | 9 +++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 37ed70ab1d..458f4ad55b 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1060,7 +1060,7 @@ LIBSUBDIRS=	site-packages \
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
- 		lib-old \
--		curses $(MACHDEPS)
-+		$(MACHDEPS)
- 
- TESTSUBDIRS = test test/audiodata test/capath test/data \
- 	test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1103,6 +1103,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter	\
- 	      lib-tk/test/test_ttk
- endif
- 
-+ifeq (@CURSES@,yes)
-+LIBSUBDIRS += curses
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index 2c20f826c5..a7ebcd091e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2852,6 +2852,15 @@ if test "$TK" = "no"; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
- fi
- 
-+AC_SUBST(CURSES)
-+AC_ARG_ENABLE(curses,
-+	AS_HELP_STRING([--disable-curses], [disable curses]),
-+	[ CURSES="${enableval}" ], [ CURSES=yes ])
-+
-+if test "$CURSES" = "no"; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
--- 
-2.11.0
-
diff --git a/package/python/0022-Add-an-option-to-disable-expat.patch b/package/python/0022-Add-an-option-to-disable-expat.patch
deleted file mode 100644
index 2ebe7eabda..0000000000
--- a/package/python/0022-Add-an-option-to-disable-expat.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 548413a659cc5320560d6b794fe8edd06dd1d22e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:29:20 +0100
-Subject: [PATCH] Add an option to disable expat
-
-This patch replaces the existing --with-system-expat option with a
---with-expat={system,builtin,none} option, which allows to tell Python
-whether we want to use the system expat (already installed), the expat
-builtin the Python sources, or no expat at all (which disables the
-installation of XML modules).
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in |  6 +++++-
- configure.ac    | 18 +++++++++++++-----
- setup.py        |  2 +-
- 3 files changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 458f4ad55b..8dee345539 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1056,7 +1056,7 @@ LIBSUBDIRS=	site-packages \
- 		logging bsddb csv importlib wsgiref \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
--		distutils distutils/command $(XMLLIBSUBDIRS) \
-+		distutils distutils/command \
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
- 		lib-old \
-@@ -1107,6 +1107,10 @@ ifeq (@CURSES@,yes)
- LIBSUBDIRS += curses
- endif
- 
-+ifeq (@EXPAT@,yes)
-+LIBSUBDIRS += $(XMLLIBSUBDIRS)
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index a7ebcd091e..2f5759a890 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2499,13 +2499,21 @@ PKG_PROG_PKG_CONFIG
- AC_SUBST(DISABLED_EXTENSIONS)
- 
- # Check for use of the system expat library
--AC_MSG_CHECKING(for --with-system-expat)
--AC_ARG_WITH(system_expat,
--            AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]),
-+AC_MSG_CHECKING(for --with-expat)
-+AC_ARG_WITH(expat,
-+            AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]),
-             [],
--            [with_system_expat="no"])
-+            [with_expat="builtin"])
- 
--AC_MSG_RESULT($with_system_expat)
-+AC_MSG_RESULT($with_expat)
-+
-+if test "$with_expat" != "none"; then
-+   EXPAT=yes
-+else
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat"
-+   EXPAT=no
-+fi
-+AC_SUBST(EXPAT)
- 
- # Check for use of the system libffi library
- AC_MSG_CHECKING(for --with-system-ffi)
-diff --git a/setup.py b/setup.py
-index 9130819454..f439cbadc2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1475,7 +1475,7 @@ class PyBuildExt(build_ext):
-         #
-         # More information on Expat can be found at www.libexpat.org.
-         #
--        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
-             expat_inc = []
-             define_macros = []
-             expat_lib = ['expat']
--- 
-2.11.0
-
diff --git a/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch b/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
deleted file mode 100644
index 3ee77fec36..0000000000
--- a/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6761066addfb6028e183d7fe4322b283af18117f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:29:31 +0100
-Subject: [PATCH] Add an option to disable CJK codecs
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 2f5759a890..862c8ae516 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2851,6 +2851,12 @@ if test "$SQLITE3" = "no" ; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- fi
- 
-+AC_ARG_ENABLE(codecs-cjk,
-+	AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.11.0
-
diff --git a/package/python/0024-Add-an-option-to-disable-NIS.patch b/package/python/0024-Add-an-option-to-disable-NIS.patch
deleted file mode 100644
index bad4ba68dc..0000000000
--- a/package/python/0024-Add-an-option-to-disable-NIS.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ecd8e926bd364d866f492df87d7c46d029445480 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:29:41 +0100
-Subject: [PATCH] Add an option to disable NIS
-
-NIS is not necessarily available in uClibc, so we need an option to
-not compile support for it.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 862c8ae516..354212fb16 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2857,6 +2857,12 @@ AC_ARG_ENABLE(codecs-cjk,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
-   	  fi])
- 
-+AC_ARG_ENABLE(nis,
-+	AS_HELP_STRING([--disable-nis], [disable NIS]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.11.0
-
diff --git a/package/python/0025-Add-an-option-to-disable-unicodedata.patch b/package/python/0025-Add-an-option-to-disable-unicodedata.patch
deleted file mode 100644
index 687ea5027e..0000000000
--- a/package/python/0025-Add-an-option-to-disable-unicodedata.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dc99b7a0331fe75d70ccb87dc0877ac5bbba51ca Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:29:52 +0100
-Subject: [PATCH] Add an option to disable unicodedata
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 354212fb16..4e430d82b8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(unicodedata,
-+	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.11.0
-
diff --git a/package/python/0026-Add-an-option-to-disable-bsddb.patch b/package/python/0026-Add-an-option-to-disable-bsddb.patch
deleted file mode 100644
index f216e8bb57..0000000000
--- a/package/python/0026-Add-an-option-to-disable-bsddb.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From a4bbbf0c5f1f68298d5f4e2c2cd80de7e758763c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:30:06 +0100
-Subject: [PATCH] Add an option to disable bsddb
-
-bsddb has an external dependency on Berkeley DB. Since we want to be
-able to build Python without it, this patch adds an option to disable
-the build/installation of this Python module.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in |  8 ++++++--
- configure.ac    | 22 ++++++++++++++++++++++
- 2 files changed, 28 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 8dee345539..a0473096c1 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1053,7 +1053,7 @@ LIBSUBDIRS=	site-packages \
- 		email email/mime \
- 		ensurepip ensurepip/_bundled \
- 		json \
--		logging bsddb csv importlib wsgiref \
-+		logging csv importlib wsgiref \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
- 		distutils distutils/command \
-@@ -1070,7 +1070,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
- 	test/tracedmodules \
- 	email/test email/test/data \
- 	json/tests \
--	bsddb/test \
- 	ctypes/test \
- 	idlelib/idle_test \
- 	distutils/tests \
-@@ -1111,6 +1110,11 @@ ifeq (@EXPAT@,yes)
- LIBSUBDIRS += $(XMLLIBSUBDIRS)
- endif
- 
-+ifeq (@BSDDB@,yes)
-+LIBSUBDIRS += bsddb
-+TESTSUBDIRS += bsddb/test
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index 4e430d82b8..361e8c120e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2863,6 +2863,28 @@ AC_ARG_ENABLE(nis,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(dbm,
-+	AS_HELP_STRING([--disable-dbm], [disable DBM]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} dbm"
-+  	  fi])
-+
-+AC_ARG_ENABLE(gdbm,
-+	AS_HELP_STRING([--disable-gdbm], [disable GDBM]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} gdbm"
-+  	  fi])
-+
-+AC_SUBST(BSDDB)
-+AC_ARG_ENABLE(bsddb,
-+	AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]),
-+	[ if test "$enableval" = "no"; then
-+    	     BSDDB=no
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bsddb"
-+  	  else
-+	     BSDDB=yes
-+  	  fi], [ BSDDB=yes ])
-+
- AC_ARG_ENABLE(unicodedata,
- 	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
- 	[ if test "$enableval" = "no"; then
--- 
-2.11.0
-
diff --git a/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch b/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
deleted file mode 100644
index d62408e4e9..0000000000
--- a/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a0e56b96c3bfb04a5c8ecc0987cdd294d8ce116b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:30:22 +0100
-Subject: [PATCH] Add an option to disable the ssl module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 361e8c120e..8fe47d8c37 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(ssl,
-+	AS_HELP_STRING([--disable-ssl], [disable SSL]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
-+  	  fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
--- 
-2.11.0
-
diff --git a/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch b/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
deleted file mode 100644
index 5b89e8ef87..0000000000
--- a/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d1236c6f4d8d893709fa36f751af47b8ad9055c1 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:30:33 +0100
-Subject: [PATCH] Add an option to disable the bz2 module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 8fe47d8c37..85df7b1478 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
-   	  fi])
- 
-+AC_ARG_ENABLE(bz2,
-+       AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
-+         fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
--- 
-2.11.0
-
diff --git a/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch b/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
deleted file mode 100644
index 95da586e46..0000000000
--- a/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a9c7314e069036f74b503dfaef261e5f45477b7e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:30:45 +0100
-Subject: [PATCH] Add an option to disable the zlib module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 85df7b1478..3848b16b9f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(bz2,
-             DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
-          fi])
- 
-+AC_ARG_ENABLE(zlib,
-+       AS_HELP_STRING([--disable-zlib], [disable ZLIB]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib"
-+         fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
--- 
-2.11.0
-
diff --git a/package/python/0030-Do-not-install-the-idle-editor.patch b/package/python/0030-Do-not-install-the-idle-editor.patch
deleted file mode 100644
index e101e6a12c..0000000000
--- a/package/python/0030-Do-not-install-the-idle-editor.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From e789487c783f75c17a8951bd5324c86ceefde407 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:30:56 +0100
-Subject: [PATCH] Do not install the idle editor
-
-IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's
-highly unlikely to ever be useful in an embedded Linux system
-generated by Buildroot, this patch simply disables the installation of
-idle and the related Python modules. It saves 800 KB-900 KB of
-installed .pyc files.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Makefile.pre.in | 2 --
- setup.py        | 2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index a0473096c1..750057fb96 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1055,7 +1055,6 @@ LIBSUBDIRS=	site-packages \
- 		json \
- 		logging csv importlib wsgiref \
- 		ctypes ctypes/macholib \
--		idlelib idlelib/Icons \
- 		distutils distutils/command \
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
-@@ -1071,7 +1070,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
- 	email/test email/test/data \
- 	json/tests \
- 	ctypes/test \
--	idlelib/idle_test \
- 	distutils/tests \
- 	unittest/test
- 
-diff --git a/setup.py b/setup.py
-index f439cbadc2..227187681e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2278,7 +2278,7 @@ def main():
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
- 
--    scripts = ['Tools/scripts/idle', 'Lib/smtpd.py']
-+    scripts = ['Lib/smtpd.py']
-     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-         scripts += [ 'Tools/scripts/pydoc' ]
-     if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
--- 
-2.11.0
-
diff --git a/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
deleted file mode 100644
index 9768faf676..0000000000
--- a/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4ab280b8a7626de2565cf4ef6cf08a5c7326574b Mon Sep 17 00:00:00 2001
-From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
-Date: Tue, 7 Mar 2017 22:31:22 +0100
-Subject: [PATCH] Add an option to disable the ossaudiodev module
-
-Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 3848b16b9f..6d19cdee95 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2927,6 +2927,12 @@ if test "$CURSES" = "no"; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
- fi
- 
-+AC_ARG_ENABLE(ossaudiodev,
-+       AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev"
-+         fi])
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
--- 
-2.11.0
-
diff --git a/package/python/0032-Add-option-to-disable-the-hashlib-module.patch b/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
deleted file mode 100644
index 82ef3a13f7..0000000000
--- a/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 479bef8182c4f6b678a86820ccc06760ca60c286 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:33:02 +0100
-Subject: [PATCH] Add option to disable the hashlib module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 6d19cdee95..ddccc79c2c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
-   	  fi])
- 
-+AC_ARG_ENABLE(hashlib,
-+	AS_HELP_STRING([--disable-hashlib], [disable hashlib]),
-+	[ if test "$enableval" = "no"; then
-+	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
-+	  fi])
-+
- AC_ARG_ENABLE(bz2,
-        AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
-        [ if test "$enableval" = "no"; then
--- 
-2.11.0
-
diff --git a/package/python/0033-Add-an-option-to-disable-readline-module.patch b/package/python/0033-Add-an-option-to-disable-readline-module.patch
deleted file mode 100644
index 02b1315179..0000000000
--- a/package/python/0033-Add-an-option-to-disable-readline-module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From abea92958b073dfbf0c78bcb31ce9cfc709c20ca Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 7 Mar 2017 22:33:55 +0100
-Subject: [PATCH] Add an option to disable readline module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index ddccc79c2c..dae266326e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(hashlib,
- 	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
- 	  fi])
- 
-+AC_ARG_ENABLE(readline,
-+	AS_HELP_STRING([--disable-readline], [disable readline]),
-+	[ if test "$enableval" = "no"; then
-+	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
-+	  fi])
-+
- AC_ARG_ENABLE(bz2,
-        AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
-        [ if test "$enableval" = "no"; then
--- 
-2.11.0
-
diff --git a/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch b/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
deleted file mode 100644
index 8fe722bc6c..0000000000
--- a/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d2bfa8805206db8c57c182094396d20a9d94bd8f Mon Sep 17 00:00:00 2001
-From: Samuel Cabrero <samuelcabrero@gmail.com>
-Date: Sat, 1 Apr 2017 09:31:52 +0200
-Subject: [PATCH] Override system locale and set to default when adding gcc
- paths
-
-Forces the use of the default locale in the function
-add_gcc_paths, which is called when cross compiling to add the
-include and library paths. This is necessary because otherwise
-the gcc output is localized and the output parsing fails, which
-results in no paths added and detect_modules not able to find
-any system library (eg. libz, libssl, etc.)
-
-[Thomas: patch taken from https://bugs.python.org/issue23767.]
-
-Signed-off-by: Samuel Cabrero <samuelcabrero@gmail.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 8045a9b..c14f4ab 100644
---- a/setup.py
-+++ b/setup.py
-@@ -430,7 +430,7 @@ class PyBuildExt(build_ext):
-         tmpfile = os.path.join(self.build_temp, 'gccpaths')
-         if not os.path.exists(self.build_temp):
-             os.makedirs(self.build_temp)
--        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-+        ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-         is_gcc = False
-         in_incdirs = False
-         inc_dirs = []
--- 
-2.7.4
-
diff --git a/package/python/Config.in.host b/package/python/Config.in.host
deleted file mode 100644
index 724e5e223a..0000000000
--- a/package/python/Config.in.host
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_HOST_PYTHON
-	bool "host python"
-	help
-	  The python language interpreter. Host package.
-
-	  http://www.python.org/
-
-if BR2_PACKAGE_HOST_PYTHON
-
-config BR2_PACKAGE_HOST_PYTHON_SSL
-	bool "ssl"
-	select BR2_PACKAGE_HOST_OPENSSL
-	help
-	  _ssl module for host Python.
-
-endif
diff --git a/package/python/python.hash b/package/python/python.hash
deleted file mode 100644
index f5e51d9638..0000000000
--- a/package/python/python.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# From https://www.python.org/downloads/release/python-2718/
-md5  fd6cc8ec0a78c44036f825e739f36e5a Python-2.7.18.tar.xz
-# Locally calculated
-sha256  b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43  Python-2.7.18.tar.xz
-sha256  de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23  LICENSE
diff --git a/package/python/python.mk b/package/python/python.mk
deleted file mode 100644
index ae99f382f9..0000000000
--- a/package/python/python.mk
+++ /dev/null
@@ -1,302 +0,0 @@
-################################################################################
-#
-# python
-#
-################################################################################
-
-PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).18
-PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
-PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION)
-PYTHON_LICENSE = Python-2.0, others
-PYTHON_LICENSE_FILES = LICENSE
-PYTHON_CPE_ID_VENDOR = python
-PYTHON_LIBTOOL_PATCH = NO
-
-# Python needs itself to be built, so in order to cross-compile
-# Python, we need to build a host Python first. This host Python is
-# also installed in $(HOST_DIR), as it is needed when cross-compiling
-# third-party Python modules.
-
-HOST_PYTHON_CONF_OPTS += \
-	--enable-static \
-	--without-cxx-main \
-	--disable-sqlite3 \
-	--disable-tk \
-	--with-expat=system \
-	--with-system-ffi \
-	--disable-curses \
-	--disable-codecs-cjk \
-	--disable-nis \
-	--enable-unicodedata \
-	--disable-dbm \
-	--disable-gdbm \
-	--disable-bsddb \
-	--disable-test-modules \
-	--disable-bz2 \
-	--disable-ossaudiodev \
-	--disable-pyo-build
-
-# Make sure that LD_LIBRARY_PATH overrides -rpath.
-# This is needed because libpython may be installed at the same time that
-# python is called.
-# Make python believe we don't have 'hg' and 'svn', so that it doesn't
-# try to communicate over the network during the build.
-HOST_PYTHON_CONF_ENV += \
-	LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \
-	ac_cv_prog_HAS_HG=/bin/false \
-	ac_cv_prog_SVNVERSION=/bin/false
-
-# Building host python in parallel sometimes triggers a "Bus error"
-# during the execution of "./python setup.py build" in the
-# installation step. It is probably due to the installation of a
-# shared library taking place in parallel to the execution of
-# ./python, causing spurious Bus error. Building host-python with
-# MAKE1 has shown to workaround the problem.
-HOST_PYTHON_MAKE = $(MAKE1)
-
-PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES)
-
-HOST_PYTHON_DEPENDENCIES = host-expat host-libffi host-zlib
-
-ifeq ($(BR2_PACKAGE_HOST_PYTHON_SSL),y)
-HOST_PYTHON_DEPENDENCIES += host-openssl
-else
-HOST_PYTHON_CONF_OPTS += --disable-ssl
-endif
-
-PYTHON_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)
-PYTHON_DEPENDENCIES += readline
-else
-PYTHON_CONF_OPTS += --disable-readline
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y)
-PYTHON_DEPENDENCIES += ncurses
-else
-PYTHON_CONF_OPTS += --disable-curses
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_PYEXPAT),y)
-PYTHON_DEPENDENCIES += expat
-PYTHON_CONF_OPTS += --with-expat=system
-else
-PYTHON_CONF_OPTS += --with-expat=none
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_BSDDB),y)
-PYTHON_DEPENDENCIES += berkeleydb
-else
-PYTHON_CONF_OPTS += --disable-bsddb
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_SQLITE),y)
-PYTHON_DEPENDENCIES += sqlite
-else
-PYTHON_CONF_OPTS += --disable-sqlite3
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_SSL),y)
-PYTHON_DEPENDENCIES += openssl
-else
-PYTHON_CONF_OPTS += --disable-ssl
-endif
-
-ifneq ($(BR2_PACKAGE_PYTHON_CODECSCJK),y)
-PYTHON_CONF_OPTS += --disable-codecs-cjk
-endif
-
-ifneq ($(BR2_PACKAGE_PYTHON_UNICODEDATA),y)
-PYTHON_CONF_OPTS += --disable-unicodedata
-endif
-
-# Default is UCS2 w/o a conf opt
-ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y)
-# host-python must have the same UCS2/4 configuration as the target
-# python
-HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4
-PYTHON_CONF_OPTS += --enable-unicode=ucs4
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_2TO3),y)
-PYTHON_CONF_OPTS += --enable-lib2to3
-else
-PYTHON_CONF_OPTS += --disable-lib2to3
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y)
-PYTHON_DEPENDENCIES += bzip2
-else
-PYTHON_CONF_OPTS += --disable-bz2
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_ZLIB),y)
-PYTHON_DEPENDENCIES += zlib
-else
-PYTHON_CONF_OPTS += --disable-zlib
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
-PYTHON_DEPENDENCIES += openssl
-else
-PYTHON_CONF_OPTS += --disable-hashlib
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_OSSAUDIODEV),y)
-PYTHON_CONF_OPTS += --enable-ossaudiodev
-else
-PYTHON_CONF_OPTS += --disable-ossaudiodev
-endif
-
-# Make python believe we don't have 'hg' and 'svn', so that it doesn't
-# try to communicate over the network during the build.
-PYTHON_CONF_ENV += \
-	ac_cv_have_long_long_format=yes \
-	ac_cv_file__dev_ptmx=yes \
-	ac_cv_file__dev_ptc=yes \
-	ac_cv_working_tzset=yes \
-	ac_cv_prog_HAS_HG=/bin/false \
-	ac_cv_prog_SVNVERSION=/bin/false
-
-# GCC is always compliant with IEEE754
-ifeq ($(BR2_ENDIAN),"LITTLE")
-PYTHON_CONF_ENV += ac_cv_little_endian_double=yes
-else
-PYTHON_CONF_ENV += ac_cv_big_endian_double=yes
-endif
-
-PYTHON_CONF_OPTS += \
-	--without-cxx-main \
-	--without-doc-strings \
-	--with-system-ffi \
-	--disable-pydoc \
-	--disable-test-modules \
-	--disable-gdbm \
-	--disable-tk \
-	--disable-nis \
-	--disable-dbm \
-	--disable-pyo-build \
-	--disable-pyc-build
-
-# This is needed to make sure the Python build process doesn't try to
-# regenerate those files with the pgen program. Otherwise, it builds
-# pgen for the target, and tries to run it on the host.
-
-define PYTHON_TOUCH_GRAMMAR_FILES
-	touch $(@D)/Include/graminit.h $(@D)/Python/graminit.c
-endef
-
-PYTHON_POST_PATCH_HOOKS += PYTHON_TOUCH_GRAMMAR_FILES
-
-#
-# Remove useless files. In the config/ directory, only the Makefile
-# and the pyconfig.h files are needed at runtime.
-#
-# idle & smtpd.py have bad shebangs and are mostly samples
-#
-define PYTHON_REMOVE_USELESS_FILES
-	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
-	rm -f $(TARGET_DIR)/usr/bin/python2-config
-	rm -f $(TARGET_DIR)/usr/bin/python-config
-	rm -f $(TARGET_DIR)/usr/bin/smtpd.py
-	rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/distutils/command/wininst*.exe
-	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/ \
-		-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
-		rm -f $$i ; \
-	done
-endef
-
-PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_USELESS_FILES
-
-#
-# Make sure libpython gets stripped out on target
-#
-define PYTHON_ENSURE_LIBPYTHON_STRIPPED
-	chmod u+w $(TARGET_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR)*.so
-endef
-
-PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_ENSURE_LIBPYTHON_STRIPPED
-
-# Always install the python symlink in the target tree
-define PYTHON_INSTALL_TARGET_PYTHON_SYMLINK
-	ln -sf python2 $(TARGET_DIR)/usr/bin/python
-endef
-
-PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_INSTALL_TARGET_PYTHON_SYMLINK
-
-# Always install the python-config symlink in the staging tree
-define PYTHON_INSTALL_STAGING_PYTHON_CONFIG_SYMLINK
-	ln -sf python2-config $(STAGING_DIR)/usr/bin/python-config
-endef
-
-PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_INSTALL_STAGING_PYTHON_CONFIG_SYMLINK
-
-PYTHON_AUTORECONF = YES
-
-# Some packages may have build scripts requiring python2.
-# Only install the python symlink in the host tree if python3 is not enabled
-# for the target, otherwise the default python program may be missing.
-ifneq ($(BR2_PACKAGE_PYTHON3),y)
-define HOST_PYTHON_INSTALL_PYTHON_SYMLINK
-	ln -sf python2 $(HOST_DIR)/bin/python
-	ln -sf python2-config $(HOST_DIR)/bin/python-config
-endef
-
-HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PYTHON_SYMLINK
-endif
-
-# Provided to other packages
-PYTHON_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
-
-ifeq ($(BR2_REPRODUCIBLE),y)
-define PYTHON_FIX_TIME
-	find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \
-		xargs -0 --no-run-if-empty touch -d @$(SOURCE_DATE_EPOCH)
-endef
-endif
-
-define PYTHON_CREATE_PYC_FILES
-	$(PYTHON_FIX_TIME)
-	PYTHONPATH="$(PYTHON_PATH)" \
-	$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \
-		$(TOPDIR)/support/scripts/pycompile.py \
-		$(if $(VERBOSE),--verbose) \
-		--strip-root $(TARGET_DIR) \
-		$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)
-endef
-
-ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PY_PYC),y)
-PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_CREATE_PYC_FILES
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
-define PYTHON_REMOVE_PY_FILES
-	find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' \
-		$(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \
-		-print0 | \
-		xargs -0 --no-run-if-empty rm -f
-endef
-PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PY_FILES
-endif
-
-# Normally, *.pyc files should not have been compiled, but just in
-# case, we make sure we remove all of them.
-ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y)
-define PYTHON_REMOVE_PYC_FILES
-	find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyc' -print0 | \
-		xargs -0 --no-run-if-empty rm -f
-endef
-PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYC_FILES
-endif
-
-# In all cases, we don't want to keep the optimized .pyo files
-define PYTHON_REMOVE_PYO_FILES
-	find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyo' -print0 | \
-		xargs -0 --no-run-if-empty rm -f
-endef
-PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYO_FILES
-- 
2.20.1


_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 085/107] package/python-backports-abc: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                                   |  6 ++++++
 package/Config.in                                  |  1 -
 package/python-backports-abc/Config.in             |  8 --------
 .../python-backports-abc/python-backports-abc.hash |  5 -----
 .../python-backports-abc/python-backports-abc.mk   | 14 --------------
 5 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 package/python-backports-abc/Config.in
 delete mode 100644 package/python-backports-abc/python-backports-abc.hash
 delete mode 100644 package/python-backports-abc/python-backports-abc.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 6bc3803a5c..cc1ed8f9d5 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_BACKPORTS_ABC
+	bool "python-backports-abc removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON
 	bool "python2.7 package removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index ca2fb363e3..46e6b30cdf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -941,7 +941,6 @@ menu "External python modules"
 	source "package/python-avro/Config.in"
 	source "package/python-babel/Config.in"
 	source "package/python-backcall/Config.in"
-	source "package/python-backports-abc/Config.in"
 	source "package/python-backports-shutil-get-terminal-size/Config.in"
 	source "package/python-backports-ssl-match-hostname/Config.in"
 	source "package/python-bcrypt/Config.in"
diff --git a/package/python-backports-abc/Config.in b/package/python-backports-abc/Config.in
deleted file mode 100644
index 43566279e8..0000000000
--- a/package/python-backports-abc/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_PYTHON_BACKPORTS_ABC
-	bool "python-backports-abc"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  A backport of recent additions to the 'collections.abc'
-	  module.
-
-	  https://pypi.python.org/pypi/backports_abc
diff --git a/package/python-backports-abc/python-backports-abc.hash b/package/python-backports-abc/python-backports-abc.hash
deleted file mode 100644
index 4f4c9bd1fe..0000000000
--- a/package/python-backports-abc/python-backports-abc.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5 from https://pypi.python.org/pypi/backports_abc/json
-md5 7d1936ec183a3586290adf60f6f96764 backports_abc-0.5.tar.gz
-# Locally computed
-sha256  033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde  backports_abc-0.5.tar.gz
-sha256  0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca  LICENSE
diff --git a/package/python-backports-abc/python-backports-abc.mk b/package/python-backports-abc/python-backports-abc.mk
deleted file mode 100644
index 66cea1703e..0000000000
--- a/package/python-backports-abc/python-backports-abc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-backports-abc
-#
-################################################################################
-
-PYTHON_BACKPORTS_ABC_VERSION = 0.5
-PYTHON_BACKPORTS_ABC_SOURCE = backports_abc-$(PYTHON_BACKPORTS_ABC_VERSION).tar.gz
-PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8
-PYTHON_BACKPORTS_ABC_LICENSE = Python-2.0
-PYTHON_BACKPORTS_ABC_LICENSE_FILES = LICENSE
-PYTHON_BACKPORTS_ABC_SETUP_TYPE = setuptools
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 086/107] package/python-backports-shutil-get-terminal-size: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                                   |  6 ++++++
 DEVELOPERS                                         |  1 -
 package/Config.in                                  |  1 -
 .../Config.in                                      |  8 --------
 .../python-backports-shutil-get-terminal-size.hash |  5 -----
 .../python-backports-shutil-get-terminal-size.mk   | 14 --------------
 6 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 package/python-backports-shutil-get-terminal-size/Config.in
 delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
 delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index cc1ed8f9d5..89c095a388 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE
+	bool "python-backports-shutil-get-terminal-size removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_BACKPORTS_ABC
 	bool "python-backports-abc removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 1d1cf99898..2fd8d4d010 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -143,7 +143,6 @@ N:	Andreas Ziegler <br015@umbiko.net>
 F:	package/mpd/
 
 N:	Andrey Smirnov <andrew.smirnov@gmail.com>
-F:	package/python-backports-shutil-get-terminal-size/
 F:	package/python-decorator/
 F:	package/python-ipython-genutils/
 F:	package/python-pathlib2/
diff --git a/package/Config.in b/package/Config.in
index 46e6b30cdf..fbfc876d89 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -941,7 +941,6 @@ menu "External python modules"
 	source "package/python-avro/Config.in"
 	source "package/python-babel/Config.in"
 	source "package/python-backcall/Config.in"
-	source "package/python-backports-shutil-get-terminal-size/Config.in"
 	source "package/python-backports-ssl-match-hostname/Config.in"
 	source "package/python-bcrypt/Config.in"
 	source "package/python-beautifulsoup4/Config.in"
diff --git a/package/python-backports-shutil-get-terminal-size/Config.in b/package/python-backports-shutil-get-terminal-size/Config.in
deleted file mode 100644
index 392e05a282..0000000000
--- a/package/python-backports-shutil-get-terminal-size/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE
-	bool "python-backports-shutil-get-terminal-size"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  A backport of the get_terminal_size function from Python
-	  3.3's shutil.
-
-	  https://pypi.python.org/pypi/backports.shutil_get_terminal_size
diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
deleted file mode 100644
index 40883a4e3b..0000000000
--- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json
-md5 03267762480bd86b50580dc19dff3c66 backports.shutil_get_terminal_size-1.0.0.tar.gz
-# Locally computed
-sha256  713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80  backports.shutil_get_terminal_size-1.0.0.tar.gz
-sha256  9edd99f8c339cddbfe36a9707e671fccf245b3e50b80eec0877dccec87a2dfe4  LICENSE
diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk
deleted file mode 100644
index 7c24b196f2..0000000000
--- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-backports-shutil-get-terminal-size
-#
-################################################################################
-
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION = 1.0.0
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SOURCE = backports.shutil_get_terminal_size-$(PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION).tar.gz
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SITE = https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SETUP_TYPE = setuptools
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE = MIT
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 087/107] package/python-backports-ssl-match-hostname: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                                   |  6 ++++++
 DEVELOPERS                                         |  1 -
 package/Config.in                                  |  1 -
 .../python-backports-ssl-match-hostname/Config.in  |  7 -------
 .../python-backports-ssl-match-hostname.hash       |  5 -----
 .../python-backports-ssl-match-hostname.mk         | 14 --------------
 6 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 package/python-backports-ssl-match-hostname/Config.in
 delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash
 delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 89c095a388..10476a2adf 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME
+	bool "python-backports-ssl-match-hostname removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE
 	bool "python-backports-shutil-get-terminal-size removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 2fd8d4d010..c94a7831fc 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2243,7 +2243,6 @@ F:	package/lzop/
 F:	package/memtool/
 F:	package/mosquitto/
 F:	package/python-alsaaudio/
-F:	package/python-backports-ssl-match-hostname/
 F:	package/python-cached-property/
 F:	package/python-docker/
 F:	package/python-dockerpty/
diff --git a/package/Config.in b/package/Config.in
index fbfc876d89..73f266504a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -941,7 +941,6 @@ menu "External python modules"
 	source "package/python-avro/Config.in"
 	source "package/python-babel/Config.in"
 	source "package/python-backcall/Config.in"
-	source "package/python-backports-ssl-match-hostname/Config.in"
 	source "package/python-bcrypt/Config.in"
 	source "package/python-beautifulsoup4/Config.in"
 	source "package/python-bidict/Config.in"
diff --git a/package/python-backports-ssl-match-hostname/Config.in b/package/python-backports-ssl-match-hostname/Config.in
deleted file mode 100644
index 8e55191a9e..0000000000
--- a/package/python-backports-ssl-match-hostname/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME
-	bool "python-backports-ssl-match-hostname"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  The ssl.match_hostname() function from Python 3.5.
-
-	  http://bitbucket.org/brandon/backports.ssl_match_hostname
diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash
deleted file mode 100644
index 145174cd5b..0000000000
--- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/backports.ssl_match_hostname/json
-md5	32d2f593af01a046bec3d2f5181a420a  backports.ssl_match_hostname-3.7.0.1.tar.gz
-sha256	bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2  backports.ssl_match_hostname-3.7.0.1.tar.gz
-# Locally computed sha256 checksums
-sha256	bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e  LICENSE.txt
diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk
deleted file mode 100644
index 300961662d..0000000000
--- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-backports-ssl-match-hostname
-#
-################################################################################
-
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.7.0.1
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SOURCE = backports.ssl_match_hostname-$(PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION).tar.gz
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://files.pythonhosted.org/packages/ff/2b/8265224812912bc5b7a607c44bf7b027554e1b9775e9ee0de8032e3de4b2
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SETUP_TYPE = distutils
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE = Python-2.0
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = LICENSE.txt
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 088/107] package/python-futures: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                           |  6 ++++++
 DEVELOPERS                                 |  1 -
 package/Config.in                          |  1 -
 package/python-futures/Config.in           |  7 -------
 package/python-futures/python-futures.hash |  5 -----
 package/python-futures/python-futures.mk   | 14 --------------
 6 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 package/python-futures/Config.in
 delete mode 100644 package/python-futures/python-futures.hash
 delete mode 100644 package/python-futures/python-futures.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 10476a2adf..7e85e4cf63 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_FUTURES
+	bool "python-futures removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME
 	bool "python-backports-ssl-match-hostname removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index c94a7831fc..d2ed22dac0 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -436,7 +436,6 @@ F:	package/pulseaudio/
 F:	package/pure-ftpd/
 F:	package/python-couchdb/
 F:	package/python-cssutils/
-F:	package/python-futures/
 F:	package/python-mwclient/
 F:	package/python-mwscrape/
 F:	package/python-mwscrape2slob/
diff --git a/package/Config.in b/package/Config.in
index 73f266504a..b18d298a1b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1032,7 +1032,6 @@ menu "External python modules"
 	source "package/python-frozenlist/Config.in"
 	source "package/python-functools32/Config.in"
 	source "package/python-future/Config.in"
-	source "package/python-futures/Config.in"
 	source "package/python-git/Config.in"
 	source "package/python-gitdb2/Config.in"
 	source "package/python-gnupg/Config.in"
diff --git a/package/python-futures/Config.in b/package/python-futures/Config.in
deleted file mode 100644
index 2eb40e93bd..0000000000
--- a/package/python-futures/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PYTHON_FUTURES
-	bool "python-futures"
-	depends on BR2_PACKAGE_PYTHON # not needed for python3
-	help
-	  Backport of the concurrent.futures package from Python 3.2.
-
-	  https://github.com/agronholm/pythonfutures
diff --git a/package/python-futures/python-futures.hash b/package/python-futures/python-futures.hash
deleted file mode 100644
index a4fbdf4fe9..0000000000
--- a/package/python-futures/python-futures.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/futures/json
-md5	b43a39ae1475e3fd6940f2b4f7214675  futures-3.3.0.tar.gz
-sha256	7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794  futures-3.3.0.tar.gz
-# Locally computed sha256 checksums
-sha256	a698bd5d441e4a16af6c992b8e80cbfa12755d72d910854fa1fb11d4deb0059a  LICENSE
diff --git a/package/python-futures/python-futures.mk b/package/python-futures/python-futures.mk
deleted file mode 100644
index 0666948115..0000000000
--- a/package/python-futures/python-futures.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-futures
-#
-################################################################################
-
-PYTHON_FUTURES_VERSION = 3.3.0
-PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz
-PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00
-PYTHON_FUTURES_SETUP_TYPE = setuptools
-PYTHON_FUTURES_LICENSE = BSD-2-Clause
-PYTHON_FUTURES_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 089/107] package/python-id3: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                   |  6 ++++++
 DEVELOPERS                         |  1 -
 package/Config.in                  |  1 -
 package/python-id3/Config.in       |  9 ---------
 package/python-id3/python-id3.hash |  3 ---
 package/python-id3/python-id3.mk   | 14 --------------
 6 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 package/python-id3/Config.in
 delete mode 100644 package/python-id3/python-id3.hash
 delete mode 100644 package/python-id3/python-id3.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 7e85e4cf63..03ea14a512 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_ID3
+	bool "python-id3 removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_FUTURES
 	bool "python-futures removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index d2ed22dac0..985f43b614 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -729,7 +729,6 @@ F:	package/wireless-regdb/
 
 N:	Dominik Faessler <faessler@was.ch>
 F:	package/logsurfer/
-F:	package/python-id3/
 
 N:	Doug Kehn <rdkehn@gmail.com>
 F:	package/nss-pam-ldapd/
diff --git a/package/Config.in b/package/Config.in
index b18d298a1b..0ee1c8ddb4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1049,7 +1049,6 @@ menu "External python modules"
 	source "package/python-hyperframe/Config.in"
 	source "package/python-hyperlink/Config.in"
 	source "package/python-ibmiotf/Config.in"
-	source "package/python-id3/Config.in"
 	source "package/python-idna/Config.in"
 	source "package/python-ifaddr/Config.in"
 	source "package/python-incremental/Config.in"
diff --git a/package/python-id3/Config.in b/package/python-id3/Config.in
deleted file mode 100644
index 6ddfd541bd..0000000000
--- a/package/python-id3/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYTHON_ID3
-	bool "python-id3"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  This module allows one to read and manipulate so-called ID3
-	  informational tags on MP3 files through an object-oriented
-	  Python interface.
-
-	  http://id3-py.sourceforge.net/
diff --git a/package/python-id3/python-id3.hash b/package/python-id3/python-id3.hash
deleted file mode 100644
index c83b34a2d9..0000000000
--- a/package/python-id3/python-id3.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256  ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022  id3-py_1.2.tar.gz
-sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk
deleted file mode 100644
index d4cdded00c..0000000000
--- a/package/python-id3/python-id3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-id3
-#
-################################################################################
-
-PYTHON_ID3_VERSION = 1.2
-PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
-PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION)
-PYTHON_ID3_SETUP_TYPE = distutils
-PYTHON_ID3_LICENSE = GPL-2.0+
-PYTHON_ID3_LICENSE_FILES = COPYING
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 090/107] package/python-ipaddr: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                         |  6 ++++++
 DEVELOPERS                               |  1 -
 package/Config.in                        |  1 -
 package/python-ipaddr/Config.in          |  9 ---------
 package/python-ipaddr/python-ipaddr.hash |  5 -----
 package/python-ipaddr/python-ipaddr.mk   | 14 --------------
 6 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 package/python-ipaddr/Config.in
 delete mode 100644 package/python-ipaddr/python-ipaddr.hash
 delete mode 100644 package/python-ipaddr/python-ipaddr.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 03ea14a512..c78fb20756 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_IPADDR
+	bool "python-ipaddr removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_ID3
 	bool "python-id3 removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 985f43b614..c74bb3ae38 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2248,7 +2248,6 @@ F:	package/python-docker-pycreds/
 F:	package/python-enum/
 F:	package/python-enum34/
 F:	package/python-functools32/
-F:	package/python-ipaddr/
 F:	package/python-pam/
 F:	package/python-psutil/
 F:	package/python-request-id/
diff --git a/package/Config.in b/package/Config.in
index 0ee1c8ddb4..611a8f6aa8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1058,7 +1058,6 @@ menu "External python modules"
 	source "package/python-iniparse/Config.in"
 	source "package/python-intelhex/Config.in"
 	source "package/python-iowait/Config.in"
-	source "package/python-ipaddr/Config.in"
 	source "package/python-ipaddress/Config.in"
 	source "package/python-ipdb/Config.in"
 	source "package/python-iptables/Config.in"
diff --git a/package/python-ipaddr/Config.in b/package/python-ipaddr/Config.in
deleted file mode 100644
index 57279273f9..0000000000
--- a/package/python-ipaddr/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYTHON_IPADDR
-	bool "python-ipaddr"
-	depends on BR2_PACKAGE_PYTHON # included since python3.3
-	help
-	  An IPv4/IPv6 manipulation library in Python. This library is
-	  used to create/poke/manipulate IPv4 and IPv6 addresses and
-	  prefixes.
-
-	  https://github.com/google/ipaddr-py
diff --git a/package/python-ipaddr/python-ipaddr.hash b/package/python-ipaddr/python-ipaddr.hash
deleted file mode 100644
index d9963a2933..0000000000
--- a/package/python-ipaddr/python-ipaddr.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/ipaddr/json
-md5	f88353e40dec06410acfa075b8209b27  ipaddr-2.2.0.tar.gz
-sha256	4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6  ipaddr-2.2.0.tar.gz
-# Locally computed sha256 checksums
-sha256	175b3b509d5c840db72ad8c22d22a690d15c67b317f34de8a8bb0a66059e8215  COPYING
diff --git a/package/python-ipaddr/python-ipaddr.mk b/package/python-ipaddr/python-ipaddr.mk
deleted file mode 100644
index 9a5d147533..0000000000
--- a/package/python-ipaddr/python-ipaddr.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-ipaddr
-#
-################################################################################
-
-PYTHON_IPADDR_VERSION = 2.2.0
-PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz
-PYTHON_IPADDR_SITE = https://files.pythonhosted.org/packages/9d/a7/1b39a16cb90dfe491f57e1cab3103a15d4e8dd9a150872744f531b1106c1
-PYTHON_IPADDR_SETUP_TYPE = distutils
-PYTHON_IPADDR_LICENSE = Apache-2.0
-PYTHON_IPADDR_LICENSE_FILES = COPYING
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 091/107] package/python-ipaddress: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                               |  6 ++++++
 package/Config.in                              |  1 -
 package/python-ipaddress/Config.in             |  7 -------
 package/python-ipaddress/python-ipaddress.hash |  5 -----
 package/python-ipaddress/python-ipaddress.mk   | 14 --------------
 5 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 package/python-ipaddress/Config.in
 delete mode 100644 package/python-ipaddress/python-ipaddress.hash
 delete mode 100644 package/python-ipaddress/python-ipaddress.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index c78fb20756..14b26408fe 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_IPADDRESS
+	bool "python-ipaddress removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_IPADDR
 	bool "python-ipaddr removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 611a8f6aa8..50c0e13510 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1058,7 +1058,6 @@ menu "External python modules"
 	source "package/python-iniparse/Config.in"
 	source "package/python-intelhex/Config.in"
 	source "package/python-iowait/Config.in"
-	source "package/python-ipaddress/Config.in"
 	source "package/python-ipdb/Config.in"
 	source "package/python-iptables/Config.in"
 	source "package/python-ipy/Config.in"
diff --git a/package/python-ipaddress/Config.in b/package/python-ipaddress/Config.in
deleted file mode 100644
index b2b9f0b1c3..0000000000
--- a/package/python-ipaddress/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PYTHON_IPADDRESS
-	bool "python-ipaddress"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  Python 3.3's ipaddress for older Python versions.
-
-	  https://github.com/phihag/ipaddress
diff --git a/package/python-ipaddress/python-ipaddress.hash b/package/python-ipaddress/python-ipaddress.hash
deleted file mode 100644
index e61835e192..0000000000
--- a/package/python-ipaddress/python-ipaddress.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/ipaddress/json
-md5	aaee67a8026782af1831148beb0d9060  ipaddress-1.0.23.tar.gz
-sha256	b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2  ipaddress-1.0.23.tar.gz
-# Locally computed sha256 checksums
-sha256	38675419eb4a79ec616396d70f1254b3a433fb7088fb3f4cc9b6c0bcdcec6162  LICENSE
diff --git a/package/python-ipaddress/python-ipaddress.mk b/package/python-ipaddress/python-ipaddress.mk
deleted file mode 100644
index 8f1ad5ffc7..0000000000
--- a/package/python-ipaddress/python-ipaddress.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-ipaddress
-#
-################################################################################
-
-PYTHON_IPADDRESS_VERSION = 1.0.23
-PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz
-PYTHON_IPADDRESS_SITE = https://files.pythonhosted.org/packages/b9/9a/3e9da40ea28b8210dd6504d3fe9fe7e013b62bf45902b458d1cdc3c34ed9
-PYTHON_IPADDRESS_LICENSE = Python-2.0
-PYTHON_IPADDRESS_LICENSE_FILES = LICENSE
-PYTHON_IPADDRESS_SETUP_TYPE = setuptools
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 092/107] package/python-mad: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                   |  6 ++++++
 DEVELOPERS                         |  1 -
 package/Config.in                  |  1 -
 package/python-mad/Config.in       |  9 ---------
 package/python-mad/python-mad.hash |  3 ---
 package/python-mad/python-mad.mk   | 29 -----------------------------
 6 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 package/python-mad/Config.in
 delete mode 100644 package/python-mad/python-mad.hash
 delete mode 100644 package/python-mad/python-mad.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 14b26408fe..f6607deeeb 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_MAD
+	bool "python-mad removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_IPADDRESS
 	bool "python-ipaddress removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index c74bb3ae38..fe28772d8b 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2805,7 +2805,6 @@ F:	package/python3/
 F:	package/python-augeas/
 F:	package/python-flask-expects-json/
 F:	package/python-git/
-F:	package/python-mad/
 F:	package/python-serial/
 F:	package/python-unittest-xml-reporting/
 F:	package/qextserialport/
diff --git a/package/Config.in b/package/Config.in
index 50c0e13510..d5c46ef997 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1086,7 +1086,6 @@ menu "External python modules"
 	source "package/python-lxml/Config.in"
 	source "package/python-m2crypto/Config.in"
 	source "package/python-m2r/Config.in"
-	source "package/python-mad/Config.in"
 	source "package/python-mako/Config.in"
 	source "package/python-markdown/Config.in"
 	source "package/python-markdown2/Config.in"
diff --git a/package/python-mad/Config.in b/package/python-mad/Config.in
deleted file mode 100644
index 25354213d6..0000000000
--- a/package/python-mad/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYTHON_MAD
-	bool "python-mad"
-	depends on BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_LIBMAD
-	help
-	  python-mad is a Python binding for the MAD library, a
-	  high-quality integer-only MPEG decoder.
-
-	  http://spacepants.org/src/pymad/
diff --git a/package/python-mad/python-mad.hash b/package/python-mad/python-mad.hash
deleted file mode 100644
index 7b19ae5a44..0000000000
--- a/package/python-mad/python-mad.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# locally computed
-sha256  1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522  pymad-0.6.tar.gz
-sha256  d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk
deleted file mode 100644
index a22214876f..0000000000
--- a/package/python-mad/python-mad.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#
-# python-mad
-#
-################################################################################
-
-PYTHON_MAD_VERSION = 0.6
-PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz
-PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download
-PYTHON_MAD_SETUP_TYPE = distutils
-PYTHON_MAD_LICENSE = GPL-2.0+
-PYTHON_MAD_LICENSE_FILES = COPYING
-
-PYTHON_MAD_DEPENDENCIES = libmad
-
-ifeq ($(BR2_ENDIAN),"LITTLE")
-PYTHON_MAD_ENDIAN = little
-else
-PYTHON_MAD_ENDIAN = big
-endif
-
-define PYTHON_MAD_CONFIGURE_CMDS
-	echo "endian = $(PYTHON_MAD_ENDIAN)" > $(@D)/Setup
-	echo "mad_libs = mad" >> $(@D)/Setup
-	echo "mad_lib_dir = $(STAGING_DIR)/usr/lib" >> $(@D)/Setup
-	echo "mad_include_dir = $(STAGING_DIR)/usr/include" >> $(@D)/Setup
-endef
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 093/107] package/python-nfc: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                   |  6 ++++++
 DEVELOPERS                         |  1 -
 package/Config.in                  |  1 -
 package/python-nfc/Config.in       | 16 ----------------
 package/python-nfc/python-nfc.hash |  3 ---
 package/python-nfc/python-nfc.mk   | 14 --------------
 6 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 package/python-nfc/Config.in
 delete mode 100644 package/python-nfc/python-nfc.hash
 delete mode 100644 package/python-nfc/python-nfc.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index f6607deeeb..80adf521f8 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_NFC
+	bool "python-nfc removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_MAD
 	bool "python-mad removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index fe28772d8b..7b38d3c0f7 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2598,7 +2598,6 @@ F:	package/nanocom/
 F:	package/neard/
 F:	package/neardal/
 F:	package/owl-linux/
-F:	package/python-nfc/
 F:	package/rapidjson/
 F:	package/sconeserver/
 F:	package/sound-theme-borealis/
diff --git a/package/Config.in b/package/Config.in
index d5c46ef997..8dc91becb0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1110,7 +1110,6 @@ menu "External python modules"
 	source "package/python-netifaces/Config.in"
 	source "package/python-networkmanager/Config.in"
 	source "package/python-networkx/Config.in"
-	source "package/python-nfc/Config.in"
 	source "package/python-numpy/Config.in"
 	source "package/python-oauthlib/Config.in"
 	source "package/python-opcua-asyncio/Config.in"
diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in
deleted file mode 100644
index 7008723f60..0000000000
--- a/package/python-nfc/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_PYTHON_NFC
-	bool "python-nfc"
-	depends on BR2_PACKAGE_PYTHON
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	help
-	  Python module for near field communication.
-
-	  https://launchpad.net/nfcpy
-
-comment "python-nfc needs a toolchain w/ threads, gcc >= 4.9"
-	depends on BR2_PACKAGE_PYTHON
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/package/python-nfc/python-nfc.hash b/package/python-nfc/python-nfc.hash
deleted file mode 100644
index 6514973f53..0000000000
--- a/package/python-nfc/python-nfc.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256	7ff9265e393e9e70173ecef5a1f9124e67d3b6e481c2dc3a9537b6a769ebe16f	python-nfc-0.13.5.tar.gz
-sha256	0dc4b0a3362f197e250604567a6b4eb16bbc34c186425401e2201a193a82549f	LICENSE
diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk
deleted file mode 100644
index f5417410c9..0000000000
--- a/package/python-nfc/python-nfc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-nfc
-#
-################################################################################
-
-PYTHON_NFC_VERSION = 0.13.5
-PYTHON_NFC_SITE = $(call github,nfcpy,nfcpy,v$(PYTHON_NFC_VERSION))
-PYTHON_NFC_DEPENDENCIES = libusb libusb-compat
-PYTHON_NFC_SETUP_TYPE = setuptools
-PYTHON_NFC_LICENSE = EUPL-1.1+
-PYTHON_NFC_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 094/107] package/python-pam: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                              |   6 +
 DEVELOPERS                                    |   1 -
 package/Config.in                             |   1 -
 package/python-pam/0001-dealloc.patch         |  25 ----
 package/python-pam/0002-nofree.patch          |  68 ---------
 .../0003-memory-errors-CVE2012-1502.patch     | 136 ------------------
 package/python-pam/Config.in                  |  16 ---
 package/python-pam/python-pam.hash            |   3 -
 package/python-pam/python-pam.mk              |  16 ---
 9 files changed, 6 insertions(+), 266 deletions(-)
 delete mode 100644 package/python-pam/0001-dealloc.patch
 delete mode 100644 package/python-pam/0002-nofree.patch
 delete mode 100644 package/python-pam/0003-memory-errors-CVE2012-1502.patch
 delete mode 100644 package/python-pam/Config.in
 delete mode 100644 package/python-pam/python-pam.hash
 delete mode 100644 package/python-pam/python-pam.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 80adf521f8..386f94e72b 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_PAM
+	bool "python-pam removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_NFC
 	bool "python-nfc removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 7b38d3c0f7..a6ea3793ea 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2248,7 +2248,6 @@ F:	package/python-docker-pycreds/
 F:	package/python-enum/
 F:	package/python-enum34/
 F:	package/python-functools32/
-F:	package/python-pam/
 F:	package/python-psutil/
 F:	package/python-request-id/
 F:	package/python-semver/
diff --git a/package/Config.in b/package/Config.in
index 8dc91becb0..73e8901a1d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1115,7 +1115,6 @@ menu "External python modules"
 	source "package/python-opcua-asyncio/Config.in"
 	source "package/python-packaging/Config.in"
 	source "package/python-paho-mqtt/Config.in"
-	source "package/python-pam/Config.in"
 	source "package/python-paramiko/Config.in"
 	source "package/python-parso/Config.in"
 	source "package/python-passlib/Config.in"
diff --git a/package/python-pam/0001-dealloc.patch b/package/python-pam/0001-dealloc.patch
deleted file mode 100644
index dd4f9610c7..0000000000
--- a/package/python-pam/0001-dealloc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH] fix two bugs in the PAM object deallocation
-
-Fixes https://bugzilla.redhat.com/show_bug.cgi?id=658955
-
-Downloaded from:
-http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-dealloc.patch
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c
---- PyPAM-0.5.0/PAMmodule.c.dealloc	2011-01-17 22:48:22.000000000 +0100
-+++ PyPAM-0.5.0/PAMmodule.c	2011-01-18 21:24:59.000000000 +0100
-@@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s
-     free(self->service);
-     free(self->user);
-     free(self->conv);
--    pam_end(self->pamh, PAM_SUCCESS);
-+    if (self->pamh)
-+        pam_end(self->pamh, PAM_SUCCESS);
-     dlclose(self->dlh2);
-     dlclose(self->dlh1);
--    PyMem_DEL(self);
-+    PyObject_Del(self);
- }
- 
- static PyObject * PyPAM_getattr(PyPAMObject *self, char *name)
diff --git a/package/python-pam/0002-nofree.patch b/package/python-pam/0002-nofree.patch
deleted file mode 100644
index 7de8801707..0000000000
--- a/package/python-pam/0002-nofree.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-[PATCH] deallocate the conversation response only in case of error
-
-Fixes https://bugzilla.redhat.com/show_bug.cgi?id=679714
-
-Downloaded from:
-http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-nofree.patch
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-diff --git a/PAMmodule.c b/PAMmodule.c
-index 03cb799..a7ff8a5 100644
---- a/PAMmodule.c
-+++ b/PAMmodule.c
-@@ -24,8 +24,6 @@ typedef struct {
-     char                *service;
-     char                *user;
-     PyObject            *callback;
--    struct pam_response *response_data;
--    int                 response_len;
-     PyObject            *user_data;
-     void                *dlh1, *dlh2;
- } PyPAMObject;
-@@ -54,15 +52,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg,
- 
-     Py_INCREF(self);
- 
--    if (NULL != self->response_data) {
--        for (int i = 0; i < self->response_len; i++) {
--            free(self->response_data[0].resp);
--        }
--        free(self->response_data);
--        self->response_data = NULL;
--        self->response_len = 0;
--    }
--
-     PyObject* msgList = PyList_New(num_msg);
-     
-     for (int i = 0; i < num_msg; i++) {
-@@ -92,6 +81,10 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg,
-         char* resp_text;
-         int resp_retcode = 0;
-         if (!PyArg_ParseTuple(respTuple, "si", &resp_text, &resp_retcode)) {
-+            while (i > 0) {
-+                free((--spr)->resp);
-+                --i;
-+            }
-             free(*resp);
-             Py_DECREF(respList);
-             return PAM_CONV_ERR;
-@@ -100,10 +93,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg,
-         spr->resp_retcode = resp_retcode;
-         Py_DECREF(respTuple);
-     }
--    
--    // Save this so we can free it later.
--    self->response_data = *resp;
--    self->response_len = PyList_Size(respList);
- 
-     Py_DECREF(respList);
-     
-@@ -144,8 +133,6 @@ static PyObject * PyPAM_pam(PyObject *self, PyObject *args)
-     p->user = NULL;
-     Py_INCREF(Py_None);
-     p->callback = Py_None;
--    p->response_data = NULL;
--    p->response_len = 0;
-     Py_INCREF(Py_None);
-     p->user_data = Py_None;
-     
diff --git a/package/python-pam/0003-memory-errors-CVE2012-1502.patch b/package/python-pam/0003-memory-errors-CVE2012-1502.patch
deleted file mode 100644
index 62405db058..0000000000
--- a/package/python-pam/0003-memory-errors-CVE2012-1502.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-[PATCH] Fix Double Free Corruption (CVE2012-1502)
-
-Downloaded from:
-http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-memory-errors.patch
-
-For details, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-1502
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-diff -up PyPAM-0.5.0/PAMmodule.c.memory PyPAM-0.5.0/PAMmodule.c
---- PyPAM-0.5.0/PAMmodule.c.memory	2012-05-07 17:22:54.503914026 +0200
-+++ PyPAM-0.5.0/PAMmodule.c	2012-05-07 17:23:15.644381942 +0200
-@@ -37,33 +37,48 @@ static void PyPAM_Err(PyPAMObject *self,
- 
-     err_msg = pam_strerror(self->pamh, result);
-     error = Py_BuildValue("(si)", err_msg, result);
--    Py_INCREF(PyPAM_Error);
-     PyErr_SetObject(PyPAM_Error, error);
-+    Py_XDECREF(error);
- }
- 
- static int PyPAM_conv(int num_msg, const struct pam_message **msg,
-     struct pam_response **resp, void *appdata_ptr)
- {
--    PyObject                *args;
--
-+    PyObject *args, *msgList, *respList, *item;
-+    struct pam_response *response, *spr;
-     PyPAMObject* self = (PyPAMObject *) appdata_ptr;
-+
-     if (self->callback == NULL)
-         return PAM_CONV_ERR;
- 
-     Py_INCREF(self);
- 
--    PyObject* msgList = PyList_New(num_msg);
--    
-+    msgList = PyList_New(num_msg);
-+    if (msgList == NULL) {
-+        Py_DECREF(self);
-+        return PAM_CONV_ERR;
-+    }
-+
-     for (int i = 0; i < num_msg; i++) {
--        PyList_SetItem(msgList, i,
--            Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style));
-+        item = Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style);
-+        if (item == NULL) {
-+            Py_DECREF(msgList);
-+            Py_DECREF(self);
-+            return PAM_CONV_ERR;
-+        }
-+        PyList_SetItem(msgList, i, item);
-     }
--    
-+
-     args = Py_BuildValue("(OO)", self, msgList);
--    PyObject* respList = PyEval_CallObject(self->callback, args);
-+    if (args == NULL) {
-+        Py_DECREF(self);
-+	Py_DECREF(msgList);
-+        return PAM_CONV_ERR;
-+    }
-+    respList = PyEval_CallObject(self->callback, args);
-     Py_DECREF(args);
-     Py_DECREF(self);
--    
-+
-     if (respList == NULL)
-         return PAM_CONV_ERR;
- 
-@@ -71,11 +86,15 @@ static int PyPAM_conv(int num_msg, const
-         Py_DECREF(respList);
-         return PAM_CONV_ERR;
-     }
--    
--    *resp = (struct pam_response *) malloc(
-+
-+    response = (struct pam_response *) malloc(
-         PyList_Size(respList) * sizeof(struct pam_response));
-+    if (response == NULL) {
-+        Py_DECREF(respList);
-+        return PAM_CONV_ERR;
-+    }
-+    spr = response;
- 
--    struct pam_response* spr = *resp;
-     for (int i = 0; i < PyList_Size(respList); i++, spr++) {
-         PyObject* respTuple = PyList_GetItem(respList, i);
-         char* resp_text;
-@@ -85,7 +104,7 @@ static int PyPAM_conv(int num_msg, const
-                 free((--spr)->resp);
-                 --i;
-             }
--            free(*resp);
-+            free(response);
-             Py_DECREF(respList);
-             return PAM_CONV_ERR;
-         }
-@@ -95,7 +114,8 @@ static int PyPAM_conv(int num_msg, const
-     }
- 
-     Py_DECREF(respList);
--    
-+    *resp = response;
-+
-     return PAM_SUCCESS;
- }
- 
-@@ -122,7 +142,11 @@ static PyObject * PyPAM_pam(PyObject *se
-     PyPAMObject_Type.ob_type = &PyType_Type;
-     p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type);
- 
-+    if (p == NULL)
-+        return NULL;
-+
-     if ((spc = (struct pam_conv *) malloc(sizeof(struct pam_conv))) == NULL) {
-+        Py_DECREF((PyObject *)p);
-         PyErr_SetString(PyExc_MemoryError, "out of memory");
-         return NULL;
-     }
-@@ -455,9 +479,15 @@ static PyObject * PyPAM_getenvlist(PyObj
-     }
-     
-     retval = PyList_New(0);
-+    if (retval == NULL)
-+	return NULL;
-     
-     while ((cp = *(result++)) != NULL) {
-         entry = Py_BuildValue("s", cp);
-+        if (entry == NULL) {
-+            Py_DECREF(retval);
-+            return NULL;
-+        }
-         PyList_Append(retval, entry);
-         Py_DECREF(entry);
-     }
diff --git a/package/python-pam/Config.in b/package/python-pam/Config.in
deleted file mode 100644
index 92ba105ebf..0000000000
--- a/package/python-pam/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-comment "python-pam needs a toolchain w/ wchar, locale, dynamic library"
-	depends on BR2_PACKAGE_PYTHON
-	depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
-
-config BR2_PACKAGE_PYTHON_PAM
-	bool "python-pam"
-	depends on BR2_PACKAGE_PYTHON # C extension not compatible with python3
-	depends on BR2_ENABLE_LOCALE # linux-pam
-	depends on BR2_USE_WCHAR # linux-pam
-	depends on BR2_USE_MMU # linux-pam
-	depends on !BR2_STATIC_LIBS # linux-pam
-	select BR2_PACKAGE_LINUX_PAM
-	help
-	  PAM (Pluggable Authentication Module) bindings for Python.
-
-	  https://admin.fedoraproject.org/pkgdb/package/PyPAM/
diff --git a/package/python-pam/python-pam.hash b/package/python-pam/python-pam.hash
deleted file mode 100644
index 303455ae2f..0000000000
--- a/package/python-pam/python-pam.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# locally computed
-sha256  796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a  PyPAM-0.5.0.tar.gz
-sha256  ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532  COPYING
diff --git a/package/python-pam/python-pam.mk b/package/python-pam/python-pam.mk
deleted file mode 100644
index 943e01dd64..0000000000
--- a/package/python-pam/python-pam.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# python-pam
-#
-################################################################################
-
-PYTHON_PAM_VERSION = 0.5.0
-PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz
-# pangalactic.org gone
-PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871
-PYTHON_PAM_SETUP_TYPE = distutils
-PYTHON_PAM_LICENSE = LGPL-2.1
-PYTHON_PAM_LICENSE_FILES = COPYING
-PYTHON_PAM_DEPENDENCIES = linux-pam
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 095/107] package/python-pathlib2: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                             |  6 ++++++
 DEVELOPERS                                   |  1 -
 package/Config.in                            |  1 -
 package/python-pathlib2/Config.in            | 13 -------------
 package/python-pathlib2/python-pathlib2.hash |  5 -----
 package/python-pathlib2/python-pathlib2.mk   | 14 --------------
 6 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 package/python-pathlib2/Config.in
 delete mode 100644 package/python-pathlib2/python-pathlib2.hash
 delete mode 100644 package/python-pathlib2/python-pathlib2.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 386f94e72b..74317a2d7c 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_PATHLIB2
+	bool "python-pathlib2 removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_PAM
 	bool "python-pam removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index a6ea3793ea..07f9304766 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -145,7 +145,6 @@ F:	package/mpd/
 N:	Andrey Smirnov <andrew.smirnov@gmail.com>
 F:	package/python-decorator/
 F:	package/python-ipython-genutils/
-F:	package/python-pathlib2/
 F:	package/python-pickleshare/
 F:	package/python-scandir/
 F:	package/python-simplegeneric/
diff --git a/package/Config.in b/package/Config.in
index 73e8901a1d..3c55dec6c5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1118,7 +1118,6 @@ menu "External python modules"
 	source "package/python-paramiko/Config.in"
 	source "package/python-parso/Config.in"
 	source "package/python-passlib/Config.in"
-	source "package/python-pathlib2/Config.in"
 	source "package/python-pathpy/Config.in"
 	source "package/python-pathtools/Config.in"
 	source "package/python-pathvalidate/Config.in"
diff --git a/package/python-pathlib2/Config.in b/package/python-pathlib2/Config.in
deleted file mode 100644
index e28de4c12e..0000000000
--- a/package/python-pathlib2/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_PYTHON_PATHLIB2
-	bool "python-pathlib2"
-	depends on BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON_SIX # runtime
-	help
-	  Object-oriented filesystem paths.
-
-	  The goal of pathlib2 is to provide a backport of standard
-	  pathlib module which tracks the standard library module, so
-	  all the newest features of the standard pathlib can be used
-	  also on older Python versions.
-
-	  https://pypi.python.org/pypi/pathlib2
diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash
deleted file mode 100644
index ebd197b62e..0000000000
--- a/package/python-pathlib2/python-pathlib2.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/pathlib2/json
-md5  e50a0cf94e406c5110b3aed535626e9e  pathlib2-2.3.6.tar.gz
-sha256  7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f  pathlib2-2.3.6.tar.gz
-# Locally computed sha256 checksums
-sha256  861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6  LICENSE.rst
diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk
deleted file mode 100644
index 4bcfea78fb..0000000000
--- a/package/python-pathlib2/python-pathlib2.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-pathlib2
-#
-################################################################################
-
-PYTHON_PATHLIB2_VERSION = 2.3.6
-PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz
-PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/df/16/e9d6bcf1aed52a55bc1696324ab22586716053b3e97b85266e0f3ad36bae
-PYTHON_PATHLIB2_LICENSE = MIT
-PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst
-PYTHON_PATHLIB2_SETUP_TYPE = setuptools
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 096/107] package/python-pypcap: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                         |  6 ++++++
 DEVELOPERS                               |  1 -
 package/Config.in                        |  1 -
 package/python-pypcap/Config.in          |  9 ---------
 package/python-pypcap/python-pypcap.hash |  3 ---
 package/python-pypcap/python-pypcap.mk   | 21 ---------------------
 6 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 package/python-pypcap/Config.in
 delete mode 100644 package/python-pypcap/python-pypcap.hash
 delete mode 100644 package/python-pypcap/python-pypcap.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 74317a2d7c..f99535411d 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_PYPCAP
+	bool "python-pypcap removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_PATHLIB2
 	bool "python-pathlib2 removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 07f9304766..9c1411648e 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1934,7 +1934,6 @@ F:	package/python-ipy/
 F:	package/python-iwlib/
 F:	package/python-posix-ipc/
 F:	package/python-pycairo/
-F:	package/python-pypcap/
 F:	package/python-pyrex/
 F:	package/python-pysftp/
 F:	package/python-tinyrpc/
diff --git a/package/Config.in b/package/Config.in
index 3c55dec6c5..d406d372d3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1172,7 +1172,6 @@ menu "External python modules"
 	source "package/python-pyopenssl/Config.in"
 	source "package/python-pyparsing/Config.in"
 	source "package/python-pyparted/Config.in"
-	source "package/python-pypcap/Config.in"
 	source "package/python-pyphen/Config.in"
 	source "package/python-pyqrcode/Config.in"
 	source "package/python-pyqt5/Config.in"
diff --git a/package/python-pypcap/Config.in b/package/python-pypcap/Config.in
deleted file mode 100644
index 9b410ecc2b..0000000000
--- a/package/python-pypcap/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYTHON_PYPCAP
-	bool "python-pypcap"
-	depends on BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_LIBPCAP
-	help
-	  The pypcap module is an object-oriented wrapper of the C
-	  libpcap library.
-
-	  https://github.com/dugsong/pypcap
diff --git a/package/python-pypcap/python-pypcap.hash b/package/python-pypcap/python-pypcap.hash
deleted file mode 100644
index 40db6b4f33..0000000000
--- a/package/python-pypcap/python-pypcap.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# locally computed
-sha256  5716d97b39d40b79daf7b0c6a8c8c514f5f1de8f20561c8621ee62a90b93fb03  python-pypcap-6f46e7bf29a648256ddc732a7d0ec83d3ffca390.tar.gz
-sha256  48306c284fdbdf836b880528c3bdd658deac47ed78ffeb24a4ca5a8c39a39304  LICENSE
diff --git a/package/python-pypcap/python-pypcap.mk b/package/python-pypcap/python-pypcap.mk
deleted file mode 100644
index fc6fc6ed92..0000000000
--- a/package/python-pypcap/python-pypcap.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-# python-pypcap
-#
-################################################################################
-
-PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390
-PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION))
-PYTHON_PYPCAP_LICENSE = BSD-3-Clause
-PYTHON_PYPCAP_LICENSE_FILES = LICENSE
-PYTHON_PYPCAP_SETUP_TYPE = distutils
-PYTHON_PYPCAP_DEPENDENCIES = host-python-pyrex libpcap
-
-define PYTHON_PYPCAP_CONFIGURE_CMDS
-	$(HOST_DIR)/bin/python2 $(HOST_DIR)/bin/pyrexc $(@D)/pcap.pyx
-	(cd $(@D); \
-		$(HOST_DIR)/bin/python setup.py \
-		config --with-pcap=$(STAGING_DIR)/usr)
-endef
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 097/107] package/python-pyro: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                     |  6 ++++++
 package/Config.in                    |  1 -
 package/python-pyro/Config.in        | 10 ----------
 package/python-pyro/python-pyro.hash |  5 -----
 package/python-pyro/python-pyro.mk   | 16 ----------------
 5 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 package/python-pyro/Config.in
 delete mode 100644 package/python-pyro/python-pyro.hash
 delete mode 100644 package/python-pyro/python-pyro.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index f99535411d..319057f748 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_PYRO
+	bool "python-pyro removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_PYPCAP
 	bool "python-pypcap removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index d406d372d3..0d8ff0d4d1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1176,7 +1176,6 @@ menu "External python modules"
 	source "package/python-pyqrcode/Config.in"
 	source "package/python-pyqt5/Config.in"
 	source "package/python-pyratemp/Config.in"
-	source "package/python-pyro/Config.in"
 	source "package/python-pyroute2/Config.in"
 	source "package/python-pysendfile/Config.in"
 	source "package/python-pysftp/Config.in"
diff --git a/package/python-pyro/Config.in b/package/python-pyro/Config.in
deleted file mode 100644
index 6372a1d376..0000000000
--- a/package/python-pyro/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_PYTHON_PYRO
-	bool "python-pyro"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  python-pyro is a Python library stands for PYthon Remote
-	  Objects. It is an advanced and powerful Distributed Object
-	  Technology system written entirely in Python, that is
-	  designed to be very easy to use..
-
-	  https://pypi.python.org/pypi/Pyro/
diff --git a/package/python-pyro/python-pyro.hash b/package/python-pyro/python-pyro.hash
deleted file mode 100644
index c22b66ddc4..0000000000
--- a/package/python-pyro/python-pyro.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5 from https://pypi.python.org/pypi/pyro/json
-md5 59d4d3f4a8786776c9d7f9051b8f1a69 Pyro-3.16.tar.gz
-# Locally computed
-sha256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 Pyro-3.16.tar.gz
-sha256  7c14017a2f543384bfcde86043758b68d023b47bf09700a7df6dacbae9c82103  LICENSE
diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk
deleted file mode 100644
index 235575c195..0000000000
--- a/package/python-pyro/python-pyro.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# python-pyro
-#
-################################################################################
-
-PYTHON_PYRO_VERSION = 3.16
-PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
-PYTHON_PYRO_SITE = https://pypi.python.org/packages/61/68/0978adae315261b87acd216517c2c7f00780396e4d1426c5412458c6a28f
-PYTHON_PYRO_LICENSE = MIT
-PYTHON_PYRO_LICENSE_FILES = LICENSE
-PYTHON_PYRO_CPE_ID_VENDOR = pyro_project
-PYTHON_PYRO_CPE_ID_PRODUCT = pyro
-PYTHON_PYRO_SETUP_TYPE = setuptools
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 098/107] package/python-singledispatch: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                                   |  6 ++++++
 package/Config.in                                  |  1 -
 package/python-singledispatch/Config.in            |  9 ---------
 .../python-singledispatch.hash                     |  5 -----
 .../python-singledispatch/python-singledispatch.mk | 14 --------------
 5 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 package/python-singledispatch/Config.in
 delete mode 100644 package/python-singledispatch/python-singledispatch.hash
 delete mode 100644 package/python-singledispatch/python-singledispatch.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 319057f748..3cd78ccf1c 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_SINGLEDISPATCH
+	bool "python-singledispatch removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_PYRO
 	bool "python-pyro removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 0d8ff0d4d1..0261463f45 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1229,7 +1229,6 @@ menu "External python modules"
 	source "package/python-simplejson/Config.in"
 	source "package/python-simplelogging/Config.in"
 	source "package/python-simplesqlite/Config.in"
-	source "package/python-singledispatch/Config.in"
 	source "package/python-sip/Config.in"
 	source "package/python-six/Config.in"
 	source "package/python-slob/Config.in"
diff --git a/package/python-singledispatch/Config.in b/package/python-singledispatch/Config.in
deleted file mode 100644
index 4abc219f95..0000000000
--- a/package/python-singledispatch/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYTHON_SINGLEDISPATCH
-	bool "python-singledispatch"
-	depends on BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON_SIX # runtime
-	help
-	  This library brings functools.singledispatch from
-	  Python 3.4 to Python 2.6-3.3
-
-	  https://pypi.python.org/pypi/singledispatch
diff --git a/package/python-singledispatch/python-singledispatch.hash b/package/python-singledispatch/python-singledispatch.hash
deleted file mode 100644
index c4eec53e30..0000000000
--- a/package/python-singledispatch/python-singledispatch.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=af2fc6a3d6cc5a02d0bf54d909785fcb
-md5     af2fc6a3d6cc5a02d0bf54d909785fcb singledispatch-3.4.0.3.tar.gz
-# Locally computed
-sha256  5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c  singledispatch-3.4.0.3.tar.gz
-sha256  5a724c436f88585973787af91cecf58503cbf09e5c1721c516880614700767ef  setup.py
diff --git a/package/python-singledispatch/python-singledispatch.mk b/package/python-singledispatch/python-singledispatch.mk
deleted file mode 100644
index 7e1d5ac8e0..0000000000
--- a/package/python-singledispatch/python-singledispatch.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-singledispatch
-#
-################################################################################
-
-PYTHON_SINGLEDISPATCH_VERSION = 3.4.0.3
-PYTHON_SINGLEDISPATCH_SOURCE = singledispatch-$(PYTHON_SINGLEDISPATCH_VERSION).tar.gz
-PYTHON_SINGLEDISPATCH_SITE = https://pypi.python.org/packages/source/s/singledispatch
-PYTHON_SINGLEDISPATCH_LICENSE = MIT
-PYTHON_SINGLEDISPATCH_LICENSE_FILES = setup.py
-PYTHON_SINGLEDISPATCH_SETUP_TYPE = setuptools
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 099/107] package/python-subprocess32: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                              |  6 ++++
 package/Config.in                             |  1 -
 package/python-subprocess32/Config.in         | 13 --------
 .../python-subprocess32.hash                  |  5 ---
 .../python-subprocess32.mk                    | 31 -------------------
 5 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 package/python-subprocess32/Config.in
 delete mode 100644 package/python-subprocess32/python-subprocess32.hash
 delete mode 100644 package/python-subprocess32/python-subprocess32.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 3cd78ccf1c..8db9558ed4 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_SUBPROCESS32
+	bool "python-subprocess32 removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_SINGLEDISPATCH
 	bool "python-singledispatch removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 0261463f45..18de2a32a5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1243,7 +1243,6 @@ menu "External python modules"
 	source "package/python-sqlalchemy/Config.in"
 	source "package/python-sqliteschema/Config.in"
 	source "package/python-sqlparse/Config.in"
-	source "package/python-subprocess32/Config.in"
 	source "package/python-systemd/Config.in"
 	source "package/python-tabledata/Config.in"
 	source "package/python-tempora/Config.in"
diff --git a/package/python-subprocess32/Config.in b/package/python-subprocess32/Config.in
deleted file mode 100644
index d7fe84f1e6..0000000000
--- a/package/python-subprocess32/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_PYTHON_SUBPROCESS32
-	bool "python-subprocess32"
-	depends on BR2_PACKAGE_PYTHON
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_MIPS_NABI64
-	help
-	  A backport of the Python 3 subprocess module for use
-	  on Python 2.
-
-	  https://github.com/google/python-subprocess32
-
-comment "python-subprocess32 needs a toolchain w/ headers >= 3.10 on MIPS N64"
-	depends on BR2_MIPS_NABI64
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
diff --git a/package/python-subprocess32/python-subprocess32.hash b/package/python-subprocess32/python-subprocess32.hash
deleted file mode 100644
index 65d18763d1..0000000000
--- a/package/python-subprocess32/python-subprocess32.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/subprocess32/json
-md5	748844d560be5f0c707931cba1cdb48b  subprocess32-3.5.4.tar.gz
-sha256	eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d  subprocess32-3.5.4.tar.gz
-# Locally computed sha256 checksums
-sha256	826b43437249d39422642f695154d064da64de92eb1476048a615f50bc1beb4a  LICENSE
diff --git a/package/python-subprocess32/python-subprocess32.mk b/package/python-subprocess32/python-subprocess32.mk
deleted file mode 100644
index fb8a47f974..0000000000
--- a/package/python-subprocess32/python-subprocess32.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-#
-# python-subprocess32
-#
-################################################################################
-
-PYTHON_SUBPROCESS32_VERSION = 3.5.4
-PYTHON_SUBPROCESS32_SOURCE = subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz
-PYTHON_SUBPROCESS32_SITE = https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007
-PYTHON_SUBPROCESS32_SETUP_TYPE = setuptools
-PYTHON_SUBPROCESS32_LICENSE = Python-2.0
-PYTHON_SUBPROCESS32_LICENSE_FILES = LICENSE
-
-# The configure step needs to be run outside of the setup.py since it isn't
-# run correctly for cross-compiling
-define PYTHON_SUBPROCESS32_CONFIGURE_CMDS
-	(cd $(@D) && \
-	$(TARGET_CONFIGURE_OPTS) \
-	$(TARGET_CONFIGURE_ARGS) \
-	./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--sysconfdir=/etc \
-		--program-prefix="" \
-	)
-endef
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 100/107] package/python-typing: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                         |  6 ++++++
 package/Config.in                        |  1 -
 package/python-typing/Config.in          |  8 --------
 package/python-typing/python-typing.hash |  5 -----
 package/python-typing/python-typing.mk   | 15 ---------------
 5 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 package/python-typing/Config.in
 delete mode 100644 package/python-typing/python-typing.hash
 delete mode 100644 package/python-typing/python-typing.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 8db9558ed4..998ea6b231 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_TYPING
+	bool "python-typing removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_SUBPROCESS32
 	bool "python-subprocess32 removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 18de2a32a5..cfc4522be9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1264,7 +1264,6 @@ menu "External python modules"
 	source "package/python-txdbus/Config.in"
 	source "package/python-txtorcon/Config.in"
 	source "package/python-typepy/Config.in"
-	source "package/python-typing/Config.in"
 	source "package/python-typing-extensions/Config.in"
 	source "package/python-u-msgpack/Config.in"
 	source "package/python-ubjson/Config.in"
diff --git a/package/python-typing/Config.in b/package/python-typing/Config.in
deleted file mode 100644
index 81b7d71b4b..0000000000
--- a/package/python-typing/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_PYTHON_TYPING
-	bool "python-typing"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  Type Hints for Python. This is a backport of the standard
-	  library typing module to Python versions older than 3.5.
-
-	  https://docs.python.org/3/library/typing.html
diff --git a/package/python-typing/python-typing.hash b/package/python-typing/python-typing.hash
deleted file mode 100644
index f587eb7bfa..0000000000
--- a/package/python-typing/python-typing.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/typing/json
-md5  d6dd450cfe0c8c6547eef09a0491775d  typing-3.10.0.0.tar.gz
-sha256  13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130  typing-3.10.0.0.tar.gz
-# Locally computed sha256 checksums
-sha256  ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad  LICENSE
diff --git a/package/python-typing/python-typing.mk b/package/python-typing/python-typing.mk
deleted file mode 100644
index dd1d8f29b5..0000000000
--- a/package/python-typing/python-typing.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# python-typing
-#
-################################################################################
-
-PYTHON_TYPING_VERSION = 3.10.0.0
-PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz
-PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/b0/1b/835d4431805939d2996f8772aca1d2313a57e8860fec0e48e8e7dfe3a477
-PYTHON_TYPING_SETUP_TYPE = setuptools
-PYTHON_TYPING_LICENSE = Python-2.0, others
-PYTHON_TYPING_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))
-$(eval $(host-python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 101/107] package/python-yieldfrom: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                               |  6 ++++++
 package/Config.in                              |  1 -
 package/python-yieldfrom/Config.in             |  8 --------
 package/python-yieldfrom/python-yieldfrom.hash |  5 -----
 package/python-yieldfrom/python-yieldfrom.mk   | 15 ---------------
 5 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 package/python-yieldfrom/Config.in
 delete mode 100644 package/python-yieldfrom/python-yieldfrom.hash
 delete mode 100644 package/python-yieldfrom/python-yieldfrom.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 998ea6b231..47e8d696e0 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_YIELDFROM
+	bool "python-yieldfrom removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_TYPING
 	bool "python-typing removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index cfc4522be9..6fb62caa4c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1300,7 +1300,6 @@ menu "External python modules"
 	source "package/python-xmodem/Config.in"
 	source "package/python-yarl/Config.in"
 	source "package/python-yatl/Config.in"
-	source "package/python-yieldfrom/Config.in"
 	source "package/python-zc-lockfile/Config.in"
 	source "package/python-zeroconf/Config.in"
 	source "package/python-zope-interface/Config.in"
diff --git a/package/python-yieldfrom/Config.in b/package/python-yieldfrom/Config.in
deleted file mode 100644
index 1a063d3128..0000000000
--- a/package/python-yieldfrom/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_PYTHON_YIELDFROM
-	bool "python-yieldfrom"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  A backport of the `yield from` semantic from Python 3.x to
-	  Python 2.7.
-
-	  https://github.com/Nurdok/yieldfrom/
diff --git a/package/python-yieldfrom/python-yieldfrom.hash b/package/python-yieldfrom/python-yieldfrom.hash
deleted file mode 100644
index 7730a1e578..0000000000
--- a/package/python-yieldfrom/python-yieldfrom.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/yieldfrom/json
-md5	fd94120625ac1e69bb5946d5e63182da  yieldfrom-1.0.5.tar.gz
-sha256	eb75e58641410f06083f85013a438f28bceaabfe5af9c3206d5049362c37aca0  yieldfrom-1.0.5.tar.gz
-# Locally computed sha256 checksums
-sha256	b3092d61cce29e25f3799285495095d220e5e015b88c1c70e1e72dae052f21e8  LICENSE
diff --git a/package/python-yieldfrom/python-yieldfrom.mk b/package/python-yieldfrom/python-yieldfrom.mk
deleted file mode 100644
index c926936ae8..0000000000
--- a/package/python-yieldfrom/python-yieldfrom.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# python-yieldfrom
-#
-################################################################################
-
-PYTHON_YIELDFROM_VERSION = 1.0.5
-PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz
-PYTHON_YIELDFROM_SITE = https://files.pythonhosted.org/packages/4d/f9/395917f574ace618eb234bcbae8df3fabaa9624532d96d1fbd3a20678b1e
-PYTHON_YIELDFROM_SETUP_TYPE = setuptools
-PYTHON_YIELDFROM_LICENSE = MIT
-PYTHON_YIELDFROM_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))
-$(eval $(host-python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                               |  6 ++++++
 DEVELOPERS                                     |  2 --
 package/Config.in                              |  1 -
 package/Config.in.host                         |  1 -
 package/python-configobj/Config.in             | 10 ----------
 package/python-configobj/python-configobj.hash |  3 ---
 package/python-configobj/python-configobj.mk   | 14 --------------
 7 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 package/python-configobj/Config.in
 delete mode 100644 package/python-configobj/python-configobj.hash
 delete mode 100644 package/python-configobj/python-configobj.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 47e8d696e0..6776048fc4 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_CONFIGOBJ
+	bool "python-configobj removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_YIELDFROM
 	bool "python-yieldfrom removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 9c1411648e..8112873f14 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2796,7 +2796,6 @@ F:	package/ne10/
 F:	package/pkg-python.mk
 F:	package/pkg-autotools.mk
 F:	package/pkg-generic.mk
-F:	package/python/
 F:	package/python3/
 F:	package/python-augeas/
 F:	package/python-flask-expects-json/
@@ -3034,7 +3033,6 @@ F:	package/grantlee/
 F:	package/libusb/
 F:	package/libusb-compat/
 F:	package/proj/
-F:	package/python-configobj/
 F:	package/python-iniparse/
 F:	package/qjson/
 F:	package/quazip/
diff --git a/package/Config.in b/package/Config.in
index 6fb62caa4c..478a4e6b90 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -973,7 +973,6 @@ menu "External python modules"
 	source "package/python-colorama/Config.in"
 	source "package/python-colorlog/Config.in"
 	source "package/python-colorzero/Config.in"
-	source "package/python-configobj/Config.in"
 	source "package/python-configshell-fb/Config.in"
 	source "package/python-constantly/Config.in"
 	source "package/python-couchdb/Config.in"
diff --git a/package/Config.in.host b/package/Config.in.host
index 341e24926b..e5fbb07fc2 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -69,7 +69,6 @@ menu "Host utilities"
 	source "package/pkgconf/Config.in.host"
 	source "package/pru-software-support/Config.in.host"
 	source "package/pwgen/Config.in.host"
-	source "package/python/Config.in.host"
 	source "package/python-cython/Config.in.host"
 	source "package/python-greenlet/Config.in.host"
 	source "package/python-lxml/Config.in.host"
diff --git a/package/python-configobj/Config.in b/package/python-configobj/Config.in
deleted file mode 100644
index fc57e26f1c..0000000000
--- a/package/python-configobj/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_PYTHON_CONFIGOBJ
-	bool "python-configobj"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  ConfigObj is a simple but powerful config file reader and
-	  writer: an ini file round tripper. Its main feature is that
-	  it is very easy to use, with a straightforward programmer's
-	  interface and a simple syntax for config files.
-
-	  http://www.voidspace.org.uk/python/configobj.html
diff --git a/package/python-configobj/python-configobj.hash b/package/python-configobj/python-configobj.hash
deleted file mode 100644
index d43c453796..0000000000
--- a/package/python-configobj/python-configobj.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# md5 from https://pypi.python.org/pypi/configobj/json, sha256 locally computed
-md5	e472a3a1c2a67bb0ec9b5d54c13a47d6  configobj-5.0.6.tar.gz
-sha256	a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902  configobj-5.0.6.tar.gz
diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk
deleted file mode 100644
index 9e281d28e7..0000000000
--- a/package/python-configobj/python-configobj.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-configobj
-#
-################################################################################
-
-PYTHON_CONFIGOBJ_VERSION = 5.0.6
-PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz
-PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab
-PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause
-# License only mentioned in the source
-PYTHON_CONFIGOBJ_SETUP_TYPE = distutils
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 103/107] package/python-dialog: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                         |  6 ++++++
 package/Config.in                        |  1 -
 package/python-dialog/Config.in          | 10 ----------
 package/python-dialog/python-dialog.hash |  5 -----
 package/python-dialog/python-dialog.mk   | 15 ---------------
 5 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 package/python-dialog/Config.in
 delete mode 100644 package/python-dialog/python-dialog.hash
 delete mode 100644 package/python-dialog/python-dialog.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 6776048fc4..630194edba 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_DIALOG
+	bool "python-dialog removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_CONFIGOBJ
 	bool "python-configobj removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 478a4e6b90..b91e190c8e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -994,7 +994,6 @@ menu "External python modules"
 	source "package/python-dbus-next/Config.in"
 	source "package/python-decorator/Config.in"
 	source "package/python-defusedxml/Config.in"
-	source "package/python-dialog/Config.in"
 	source "package/python-dialog3/Config.in"
 	source "package/python-dicttoxml/Config.in"
 	source "package/python-distro/Config.in"
diff --git a/package/python-dialog/Config.in b/package/python-dialog/Config.in
deleted file mode 100644
index c1fdb23723..0000000000
--- a/package/python-dialog/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_PYTHON_DIALOG
-	bool "python-dialog"
-	depends on BR2_PACKAGE_PYTHON
-	depends on BR2_USE_MMU # dialog
-	select BR2_PACKAGE_DIALOG
-	help
-	  A Python interface to the UNIX dialog utility and
-	  mostly-compatible programs.
-
-	  http://pythondialog.sourceforge.net/
diff --git a/package/python-dialog/python-dialog.hash b/package/python-dialog/python-dialog.hash
deleted file mode 100644
index 8f84e198b2..0000000000
--- a/package/python-dialog/python-dialog.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# Locally computed after verifying
-# https://sourceforge.net/projects/pythondialog/files/pythondialog/3.4.0/python3-pythondialog-3.4.0.tar.bz2.asc
-# with key 9B6F19FB52965E6C21FE76142A205688F8489BDD
-sha256	8978d355c8db6728eeb9e23b39449b14597f1c76cb06dc72462642ca7cde46a0  python2-pythondialog-3.4.0.tar.bz2
-sha256	a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING
diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk
deleted file mode 100644
index d5d4a4ceb5..0000000000
--- a/package/python-dialog/python-dialog.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# python-dialog
-#
-################################################################################
-
-PYTHON_DIALOG_VERSION = 3.4.0
-PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
-PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
-PYTHON_DIALOG_LICENSE = LGPL-2.1+
-PYTHON_DIALOG_LICENSE_FILES = COPYING
-PYTHON_DIALOG_SETUP_TYPE = distutils
-PYTHON_DIALOG_DEPENDENCIES = dialog
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 104/107] package/python-enum: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                     |  6 ++++++
 DEVELOPERS                           |  1 -
 package/Config.in                    |  1 -
 package/python-enum/Config.in        | 12 ------------
 package/python-enum/python-enum.hash |  5 -----
 package/python-enum/python-enum.mk   | 14 --------------
 6 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 package/python-enum/Config.in
 delete mode 100644 package/python-enum/python-enum.hash
 delete mode 100644 package/python-enum/python-enum.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 630194edba..bc5df0e489 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_ENUM
+	bool "python-enum removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_DIALOG
 	bool "python-dialog removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 8112873f14..0716729cee 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2243,7 +2243,6 @@ F:	package/python-cached-property/
 F:	package/python-docker/
 F:	package/python-dockerpty/
 F:	package/python-docker-pycreds/
-F:	package/python-enum/
 F:	package/python-enum34/
 F:	package/python-functools32/
 F:	package/python-psutil/
diff --git a/package/Config.in b/package/Config.in
index b91e190c8e..f134b626be 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1010,7 +1010,6 @@ menu "External python modules"
 	source "package/python-ecdsa/Config.in"
 	source "package/python-engineio/Config.in"
 	source "package/python-entrypoints/Config.in"
-	source "package/python-enum/Config.in"
 	source "package/python-enum34/Config.in"
 	source "package/python-esptool/Config.in"
 	source "package/python-falcon/Config.in"
diff --git a/package/python-enum/Config.in b/package/python-enum/Config.in
deleted file mode 100644
index e26ae8bf97..0000000000
--- a/package/python-enum/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_PYTHON_ENUM
-	bool "python-enum"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  Robust enumerated type support in Python
-
-	  An enumeration object is an immutable sequence object built
-	  from a sequence of strings. Each value is also available as
-	  an attribute. Such values are constant. Comparisons and
-	  enumeration are supported.
-
-	  https://pypi.python.org/pypi/enum
diff --git a/package/python-enum/python-enum.hash b/package/python-enum/python-enum.hash
deleted file mode 100644
index 4b4b369e34..0000000000
--- a/package/python-enum/python-enum.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/enum/json
-md5 e7d170e3f84435b77058de625c96ef58 enum-0.4.7.tar.gz
-sha256 8c7cf3587eda51008bcc1eed99ea2c331ccd265c231dbaa95ec5258d3dc03100 enum-0.4.7.tar.gz
-# Locally computed sha256 checksums
-sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL-3
diff --git a/package/python-enum/python-enum.mk b/package/python-enum/python-enum.mk
deleted file mode 100644
index f1de8a9312..0000000000
--- a/package/python-enum/python-enum.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-enum
-#
-################################################################################
-
-PYTHON_ENUM_VERSION = 0.4.7
-PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz
-PYTHON_ENUM_SITE = https://files.pythonhosted.org/packages/02/a0/32e1d5a21b703f600183e205aafc6773577e16429af5ad3c3f9b956b07ca
-PYTHON_ENUM_SETUP_TYPE = setuptools
-PYTHON_ENUM_LICENSE = GPL-3.0+
-PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 105/107] package/python-enum34: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                         |  6 ++++++
 DEVELOPERS                               |  1 -
 package/Config.in                        |  1 -
 package/python-enum34/Config.in          | 12 ------------
 package/python-enum34/python-enum34.hash |  5 -----
 package/python-enum34/python-enum34.mk   | 17 -----------------
 6 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 package/python-enum34/Config.in
 delete mode 100644 package/python-enum34/python-enum34.hash
 delete mode 100644 package/python-enum34/python-enum34.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index bc5df0e489..7df95691ca 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_ENUM34
+	bool "python-enum34 removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_ENUM
 	bool "python-enum removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 0716729cee..92abe8a6dd 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2243,7 +2243,6 @@ F:	package/python-cached-property/
 F:	package/python-docker/
 F:	package/python-dockerpty/
 F:	package/python-docker-pycreds/
-F:	package/python-enum34/
 F:	package/python-functools32/
 F:	package/python-psutil/
 F:	package/python-request-id/
diff --git a/package/Config.in b/package/Config.in
index f134b626be..18388f82c3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1010,7 +1010,6 @@ menu "External python modules"
 	source "package/python-ecdsa/Config.in"
 	source "package/python-engineio/Config.in"
 	source "package/python-entrypoints/Config.in"
-	source "package/python-enum34/Config.in"
 	source "package/python-esptool/Config.in"
 	source "package/python-falcon/Config.in"
 	source "package/python-filelock/Config.in"
diff --git a/package/python-enum34/Config.in b/package/python-enum34/Config.in
deleted file mode 100644
index 2511a350e0..0000000000
--- a/package/python-enum34/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_PYTHON_ENUM34
-	bool "python-enum34"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  Python 3.4 Enum backported to 2.x.
-
-	  An enumeration is a set of symbolic names (members) bound to
-	  unique, constant values. Within an enumeration, the members
-	  can be compared by identity, and the enumeration itself can
-	  be iterated over.
-
-	  https://pypi.python.org/pypi/enum34
diff --git a/package/python-enum34/python-enum34.hash b/package/python-enum34/python-enum34.hash
deleted file mode 100644
index e43e00a5fe..0000000000
--- a/package/python-enum34/python-enum34.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5 from https://pypi.python.org/pypi/enum34/json
-md5  b5ac0bb5ea9e830029599e410d09d3b5  enum34-1.1.10.tar.gz
-# Locally computed
-sha256  cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248  enum34-1.1.10.tar.gz
-sha256  88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d  enum/LICENSE
diff --git a/package/python-enum34/python-enum34.mk b/package/python-enum34/python-enum34.mk
deleted file mode 100644
index 0bd00508aa..0000000000
--- a/package/python-enum34/python-enum34.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# python-enum34
-#
-################################################################################
-
-PYTHON_ENUM34_VERSION = 1.1.10
-PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz
-PYTHON_ENUM34_SITE = https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c
-PYTHON_ENUM34_SETUP_TYPE = setuptools
-PYTHON_ENUM34_LICENSE = BSD-3-Clause
-PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE
-PYTHON_ENUM34_CPE_ID_VENDOR = python
-PYTHON_ENUM34_CPE_ID_PRODUCT = enum34
-
-$(eval $(python-package))
-$(eval $(host-python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 106/107] package/python-functools32: drop python2 specific package

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                                   |  6 ++++++
 DEVELOPERS                                         |  1 -
 package/Config.in                                  |  1 -
 package/python-functools32/Config.in               |  8 --------
 package/python-functools32/python-functools32.hash |  4 ----
 package/python-functools32/python-functools32.mk   | 14 --------------
 6 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 package/python-functools32/Config.in
 delete mode 100644 package/python-functools32/python-functools32.hash
 delete mode 100644 package/python-functools32/python-functools32.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 7df95691ca..49c24e61bf 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_FUNCTOOLS32
+	bool "python-functools32 removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_ENUM34
 	bool "python-enum34 removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 92abe8a6dd..0e759bc168 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2243,7 +2243,6 @@ F:	package/python-cached-property/
 F:	package/python-docker/
 F:	package/python-dockerpty/
 F:	package/python-docker-pycreds/
-F:	package/python-functools32/
 F:	package/python-psutil/
 F:	package/python-request-id/
 F:	package/python-semver/
diff --git a/package/Config.in b/package/Config.in
index 18388f82c3..1a9f3e29d8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1026,7 +1026,6 @@ menu "External python modules"
 	source "package/python-flup/Config.in"
 	source "package/python-fonttools/Config.in"
 	source "package/python-frozenlist/Config.in"
-	source "package/python-functools32/Config.in"
 	source "package/python-future/Config.in"
 	source "package/python-git/Config.in"
 	source "package/python-gitdb2/Config.in"
diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in
deleted file mode 100644
index 606341d828..0000000000
--- a/package/python-functools32/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_PYTHON_FUNCTOOLS32
-	bool "python-functools32"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  Backport of the functools module from Python 3.2.3 for use on
-	  2.7 and PyPy.
-
-	  https://github.com/MiCHiLU/python-functools32
diff --git a/package/python-functools32/python-functools32.hash b/package/python-functools32/python-functools32.hash
deleted file mode 100644
index 606de81774..0000000000
--- a/package/python-functools32/python-functools32.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# md5 from https://pypi.python.org/pypi/functools32/json, sha256 locally computed
-md5	09f24ffd9af9f6cd0f63cb9f4e23d4b2  functools32-3.2.3-2.tar.gz
-sha256	f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d  functools32-3.2.3-2.tar.gz
-sha256	3f9ea6b89abe1556b72aff67b987d64c8272564815cd6a2832e6c4f6abdfe3b1  LICENSE
diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk
deleted file mode 100644
index 8a88bb2a7f..0000000000
--- a/package/python-functools32/python-functools32.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-functools32
-#
-################################################################################
-
-PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2
-PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz
-PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db
-PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils
-PYTHON_FUNCTOOLS32_LICENSE = Python-2.0
-PYTHON_FUNCTOOLS32_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 107/107] docs/manual: drop python2 references

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/adding-packages-python.txt | 8 --------
 docs/manual/writing-rules.txt          | 8 ++++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
index 0c100859be..cfd2f88920 100644
--- a/docs/manual/adding-packages-python.txt
+++ b/docs/manual/adding-packages-python.txt
@@ -67,14 +67,6 @@ Python build system, but are not Python modules, can freely choose
 their name (existing examples in Buildroot are +scons+ and
 +supervisor+).
 
-Packages that are only compatible with one version of Python (as in:
-Python 2 or Python 3) should depend on that version explicitely in
-their +Config.in+ file (+BR2_PACKAGE_PYTHON+ for Python 2,
-+BR2_PACKAGE_PYTHON3+ for Python 3).  Packages that are compatible
-with both versions should not explicitely depend on them in their
-+Config.in+ file, since that condition is already expressed for the
-whole "External python modules" menu.
-
 The main macro of the Python package infrastructure is
 +python-package+. It is similar to the +generic-package+ macro. It is
 also possible to create Python host packages with the
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
index 3eec095d0e..6255a08c1c 100644
--- a/docs/manual/writing-rules.txt
+++ b/docs/manual/writing-rules.txt
@@ -93,9 +93,9 @@ so _make_ recognizes them as commands.
 YES:
 +
 ---------------------
-ifeq ($(BR2_PACKAGE_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIBFOO_CONF_OPTS += --with-python-support
-LIBFOO_DEPENDENCIES += python
+LIBFOO_DEPENDENCIES += python3
 else
 LIBFOO_CONF_OPTS += --without-python-support
 endif
@@ -104,8 +104,8 @@ endif
 NO:
 +
 ---------------------
-LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support
-LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,)
+LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON3),,out)-python-support
+LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,)
 ---------------------
 
 ** Keep configure options and dependencies close together.
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Yann E. MORIN]

Peter ,All,

On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly:
> Python 2.7 is EOL since April 2020 and almost all packages support
> python 3, so drop it before the 2022.02 release.
> 
> It is a big series, but the changes are mainly mechanical in nature.
> 
> There is still some cleanup to do, E.G. the python2 support in
> pkg-python and the host python-setuptools package - But this is IMHO
> the minimum changes before -rc1.
> 
> Peter Korsgaard (107):
...
>   package/python: drop target package
...
>   package/python: drop host package
...
>   docs/manual: drop python2 references

All 107 patches applied, thanks!

I'll reply further to two of them, with ultra-minor nits.

Pfew, 21st century, here we come at last! ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 084/107] package/python: drop host package

[Yann E. MORIN]

Peter, All,

On 2022-02-09 17:51 +0100, Peter Korsgaard spake thusly:
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
...
>  package/python/Config.in.host                 |  16 -
>  package/python/python.hash                    |   5 -
>  package/python/python.mk                      | 302 ------------------
>  37 files changed, 2301 deletions(-)

You forgot to update DEVELOPPERS, so I cherry-picked the hunk from patch
102 and applied it here.

Applied to master, thanks.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package

[Yann E. MORIN]

Peter, All,

On 2022-02-09 17:52 +0100, Peter Korsgaard spake thusly:
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
[--SNIP--]
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 9c1411648e..8112873f14 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -2796,7 +2796,6 @@ F:	package/ne10/
>  F:	package/pkg-python.mk
>  F:	package/pkg-autotools.mk
>  F:	package/pkg-generic.mk
> -F:	package/python/

Not sure how you managed to have this hunk in this patch, but given the
tediousness of this series, I am not going to ask you to fix and respin,
so, as I replied to patch 84, I cherry-picked this hunk in to that
previous patch, and so dropped it here.

Applied to master, thanks.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Peter, All,
 > On 2022-02-09 17:52 +0100, Peter Korsgaard spake thusly:
 >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 >> ---
 > [--SNIP--]
 >> diff --git a/DEVELOPERS b/DEVELOPERS
 >> index 9c1411648e..8112873f14 100644
 >> --- a/DEVELOPERS
 >> +++ b/DEVELOPERS
 >> @@ -2796,7 +2796,6 @@ F:	package/ne10/
 >> F:	package/pkg-python.mk
 >> F:	package/pkg-autotools.mk
 >> F:	package/pkg-generic.mk
 >> -F:	package/python/

 > Not sure how you managed to have this hunk in this patch, but given the
 > tediousness of this series, I am not going to ask you to fix and respin,
 > so, as I replied to patch 84, I cherry-picked this hunk in to that
 > previous patch, and so dropped it here.

Ups, thanks for fixing it. I originally had the python host package
after these (but somehow forgot to amend the DEVELOPERS change), which is why it
ended up here.

 > Applied to master, thanks.

Thanks!

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Arnout Vandecappelle]

On 09/02/2022 22:33, Yann E. MORIN wrote:
> Peter ,All,
> 
> On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly:
>> Python 2.7 is EOL since April 2020 and almost all packages support
>> python 3, so drop it before the 2022.02 release.
>>
>> It is a big series, but the changes are mainly mechanical in nature.
>>
>> There is still some cleanup to do, E.G. the python2 support in
>> pkg-python and the host python-setuptools package - But this is IMHO
>> the minimum changes before -rc1.
>>
>> Peter Korsgaard (107):
> ...
>>    package/python: drop target package
> ...
>>    package/python: drop host package
> ...
>>    docs/manual: drop python2 references
> 
> All 107 patches applied, thanks!
> 
> I'll reply further to two of them, with ultra-minor nits.
> 
> Pfew, 21st century, here we come at last! ;-)

  Thank you Peter and Yann for handling this!

  I did a bit of grepping for leftovers and found these:

package/pkg-python.mk:# BR2_PACKAGE_PYTHON=y, or a host-package with neither
package/pkg-python.mk:# BR2_PACKAGE_PYTHON3=y or BR2_PACKAGE_PYTHON=y.
docs/manual/adding-packages-python.txt: * It is not necessary to add +python+ or 
+host-python+ in the
package/gstreamer1/gst1-devtools/gst1-devtools.mk:GST1_DEVTOOLS_DEPENDENCIES += 
host-python python
package/omniorb/omniorb.mk:# omniorb is not python3 friendly, so force the 
python interpreter
package/omniorb/omniorb.mk:OMNIORB_CONF_OPTS = 
ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
package/omniorb/omniorb.mk:HOST_OMNIORB_CONF_OPTS = 
ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
package/pkg-python.mk:$(2)_DEPENDENCIES += $$(if 
$$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python)
package/pkg-python.mk:ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2)
package/pkg-python.mk:# setuptools for python2.
package/pkg-python.mk:# In all other cases, we install setuptools for python2. 
Those other
package/pkg-python.mk:else ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python2)
package/pkg-python.mk:# We may want to specify the python interpreter to be used 
for building a
package/pkg-python.mk:# - for target packages, we always use the default python 
interpreter (which
package/python-pyrex/python-pyrex.mk:HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2
package/python-setuptools/python-setuptools.mk:HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON 
= python2
package/python-web2py/python-web2py.mk:PYTHON_WEB2PY_DEPENDENCIES = $(if 
$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \
package/python3/python3.mk:# python version chosen for the target.
package/python3/python3.mk:# Only install the python symlink in the host tree if 
python3 is enabled
package/python3/python3.mk:     ln -fs python3 $(HOST_DIR)/bin/python
package/qt5/qt5webengine/qt5webengine.mk:# QtWebengine's build system uses 
python, but only supports python2. We work
package/qt5/qt5webengine/qt5webengine.mk:# around this by forcing python2 early 
in the PATH, via a python->python2
package/qt5/qt5webengine/qt5webengine.mk:       ln -sf $(HOST_DIR)/bin/python2 
$(@D)/host-bin/python
package/rust/rust.mk:           echo 'python = 
"$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \


The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just 
cleanup. qt5webengine is also a bit worrisome...

Also, some cleanups that I think are needed:
- get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON
- symlink $(HOST_DIR)/bin/python to python3, and get rid of the workarounds in 
e.g. nodejs


  Regards,
  Arnout
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Marcus Hoffmann]

Hi all!

On 10.02.22 18:15, Arnout Vandecappelle wrote:
[...]
> 
> 
> The ones in gst1-devtools.mk and omniorb.mk look important, the rest is 
> just cleanup. qt5webengine is also a bit worrisome...
> 
> Also, some cleanups that I think are needed:
> - get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON
> - symlink $(HOST_DIR)/bin/python to python3, and get rid of the 
> workarounds in e.g. nodejs

This last bit would actually supersede the patch I send yesterday :-)

http://patchwork.ozlabs.org/project/buildroot/patch/20220209214305.314272-1-marcus.hoffmann@othermo.de/

> 
> 
>   Regards,
>   Arnout

Best,
Marcus
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Yann E. MORIN]

Arnout, All,

On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly:
> On 09/02/2022 22:33, Yann E. MORIN wrote:
> >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly:
> >>Python 2.7 is EOL since April 2020 and almost all packages support
> >>python 3, so drop it before the 2022.02 release.
[--SNIP--]
>  I did a bit of grepping for leftovers and found these:
[--SNIP--]

Yeah, I knew we had missed a few things, and Peter had already noticed a
few in the cover-letter, but we needed to move forward quick, at the
risk of breaking things.

After all, the post-rc1 period is actually to fix things we broke! ;-)

> The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just
> cleanup. qt5webengine is also a bit worrisome...

For qt5webengine, IIRC James and Adam were working on it, and may have a
pending change ready?

I was thinking maybe about this:
    https://patchwork.ozlabs.org/project/buildroot/list/?series=284619

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

Hi,

 > Arnout, All,
 > On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly:
 >> On 09/02/2022 22:33, Yann E. MORIN wrote:
 >> >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly:
 >> >>Python 2.7 is EOL since April 2020 and almost all packages support
 >> >>python 3, so drop it before the 2022.02 release.
 > [--SNIP--]
 >> I did a bit of grepping for leftovers and found these:
 > [--SNIP--]

 > Yeah, I knew we had missed a few things, and Peter had already noticed a
 > few in the cover-letter, but we needed to move forward quick, at the
 > risk of breaking things.

 > After all, the post-rc1 period is actually to fix things we broke! ;-)

Indeed ;)

 >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just
 >> cleanup. qt5webengine is also a bit worrisome...

 > For qt5webengine, IIRC James and Adam were working on it, and may have a
 > pending change ready?

 > I was thinking maybe about this:
 >     https://patchwork.ozlabs.org/project/buildroot/list/?series=284619

Yes, I guess we'll need something like that. I did a quick test to see
if the current qt5webengine version works with python3 - But it doesn't
:/

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Peter Korsgaard]

>>>>> "Marcus" == Marcus Hoffmann <marcus.hoffmann@othermo.de> writes:

 > Hi all!
 > On 10.02.22 18:15, Arnout Vandecappelle wrote:
 > [...]
 >> 
 >> 
 >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest
 >> is just cleanup. qt5webengine is also a bit worrisome...
 >> 
 >> Also, some cleanups that I think are needed:
 >> - get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON
 >> - symlink $(HOST_DIR)/bin/python to python3, and get rid of the
 >> workarounds in e.g. nodejs

 > This last bit would actually supersede the patch I send yesterday :-)

 > http://patchwork.ozlabs.org/project/buildroot/patch/20220209214305.314272-1-marcus.hoffmann@othermo.de/

Yes, I've sent a patch doing that and marked your patch as superseeded:

https://patchwork.ozlabs.org/project/buildroot/patch/20220210212429.31856-1-peter@korsgaard.com/

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[James Hilliard]

On Thu, Feb 10, 2022 at 2:19 PM Peter Korsgaard <peter@korsgaard.com> wrote:
>
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
>
> Hi,
>
>  > Arnout, All,
>  > On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly:
>  >> On 09/02/2022 22:33, Yann E. MORIN wrote:
>  >> >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly:
>  >> >>Python 2.7 is EOL since April 2020 and almost all packages support
>  >> >>python 3, so drop it before the 2022.02 release.
>  > [--SNIP--]
>  >> I did a bit of grepping for leftovers and found these:
>  > [--SNIP--]
>
>  > Yeah, I knew we had missed a few things, and Peter had already noticed a
>  > few in the cover-letter, but we needed to move forward quick, at the
>  > risk of breaking things.
>
>  > After all, the post-rc1 period is actually to fix things we broke! ;-)
>
> Indeed ;)
>
>  >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just
>  >> cleanup. qt5webengine is also a bit worrisome...
>
>  > For qt5webengine, IIRC James and Adam were working on it, and may have a
>  > pending change ready?
>
>  > I was thinking maybe about this:
>  >     https://patchwork.ozlabs.org/project/buildroot/list/?series=284619
>
> Yes, I guess we'll need something like that. I did a quick test to see
> if the current qt5webengine version works with python3 - But it doesn't

Yeah, that should get qt5webengine working on python3, there's a bunch of other
issues it should fix as well relating to handling the host/target
pkg-config split.

> :/
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 024/107] package/libiio: drop python2 support

[Paul Cercueil]

Hi Peter,

Le mer., févr. 9 2022 at 17:50:50 +0100, Peter Korsgaard 
<peter@korsgaard.com> a écrit :
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Acked-by: Paul Cercueil <paul@crapouillou.net>

Cheers,
-Paul

> ---
>  package/libiio/Config.in |  2 +-
>  package/libiio/libiio.mk | 10 +++-------
>  2 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/package/libiio/Config.in b/package/libiio/Config.in
> index 0d89331c89..98d663e203 100644
> --- a/package/libiio/Config.in
> +++ b/package/libiio/Config.in
> @@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP
> 
>  config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON
>  	bool "Install Python bindings"
> -	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
> +	depends on BR2_PACKAGE_PYTHON3
>  	help
>  	  Install the Python bindings.
> 
> diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk
> index a4fe0d4541..48e2f385e3 100644
> --- a/package/libiio/libiio.mk
> +++ b/package/libiio/libiio.mk
> @@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF
>  endif
> 
>  ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y)
> -ifeq ($(BR2_PACKAGE_PYTHON),y)
> -LIBIIO_DEPENDENCIES += host-python-setuptools python
> -LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python
> -else ifeq ($(BR2_PACKAGE_PYTHON3),y)
>  LIBIIO_DEPENDENCIES += host-python3-setuptools python3
> -LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3
> -endif
> -LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON
> +LIBIIO_CONF_OPTS += \
> +	-DPYTHON_BINDINGS=ON
> +	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3
>  else
>  LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF
>  endif
> --
> 2.20.1
> 


_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Andreas Ziegler]

Hi Peter,

On 2022-02-10 07:24, Peter Korsgaard wrote:
>>>>>> "Andreas" == Andreas Ziegler <br015@umbiko.net> writes:
> 
>  > Hi Yann,
>  > Hi Peter,
> 
>  > On 2022-02-09 21:34, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>  >> Peter ,All,
>  >>
>  >> On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly:
>  >>> Python 2.7 is EOL since April 2020 and almost all packages support
>  >>> python 3, so drop it before the 2022.02 release.
>  >>>
>  >>> It is a big series, but the changes are mainly mechanical in 
> nature.
>  >>>
>  >>> There is still some cleanup to do, E.G. the python2 support in
>  >>> pkg-python and the host python-setuptools package - But this is 
> IMHO
>  >>> the minimum changes before -rc1.
> 
>  > There seem to be some more references to python(2) in packages; this
>  > build failure is from package/crda:
> 
>  > # make clean && make
>  >   ...
>  > make[1]: *** No rule to make target 'host-python', needed by
>  >
> '/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'.
> Stop.
>  > make: *** [Makefile:23: _all] Error 2
> 
> Ahh yes, that is because we end up in package/pkg-python.mk with:
> 
> ifeq ($$($(2)_NEEDS_HOST_PYTHON),)
> $(2)_DEPENDENCIES += $$(if 
> $$(BR2_PACKAGE_PYTHON3),host-python3,host-python)

Ah, this may be the reason I have two sets of host-python packages in my 
build tree :-D

> 
> And you (presumably) don't have python3 enabled. I'll send a fix.

Correct, I do not use Python on the target, but (at lest) one package 
insists on having host-python.

I'm currently testing by changing host-python to host-python3 in 
package/crda, and found another issue; this probably also needs a 
change:

[python3.mk]
# Some packages may have build scripts requiring python3, whatever is 
the
# python version chosen for the target.
# Only install the python symlink in the host tree if python3 is enabled
# for the target.
ifeq ($(BR2_PACKAGE_PYTHON3),y)
define HOST_PYTHON3_INSTALL_SYMLINK
	ln -fs python3 $(HOST_DIR)/bin/python
	ln -fs python3-config $(HOST_DIR)/bin/python-config
endef

Is there any need of keeping separate python3 packages, now that python 
== python3?

Kind regards,
Andreas

> --
> Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Peter Korsgaard]

>>>>> "Andreas" == Andreas Ziegler <br015@umbiko.net> writes:

 > Hi Yann,
 > Hi Peter,

 > On 2022-02-09 21:34, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
 >> Peter ,All,
 >> 
 >> On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly:
 >>> Python 2.7 is EOL since April 2020 and almost all packages support
 >>> python 3, so drop it before the 2022.02 release.
 >>> 
 >>> It is a big series, but the changes are mainly mechanical in nature.
 >>> 
 >>> There is still some cleanup to do, E.G. the python2 support in
 >>> pkg-python and the host python-setuptools package - But this is IMHO
 >>> the minimum changes before -rc1.

 > There seem to be some more references to python(2) in packages; this
 > build failure is from package/crda:

 > # make clean && make
 >   ...
 > make[1]: *** No rule to make target 'host-python', needed by
 > '/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'. Stop.
 > make: *** [Makefile:23: _all] Error 2

Ahh yes, that is because we end up in package/pkg-python.mk with:

ifeq ($$($(2)_NEEDS_HOST_PYTHON),)
$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python)

And you (presumably) don't have python3 enabled. I'll send a fix.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 000/107] Drop python 2.7

[Andreas Ziegler]

Hi Yann,
Hi Peter,

On 2022-02-09 21:34, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Peter ,All,
> 
> On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly:
>> Python 2.7 is EOL since April 2020 and almost all packages support
>> python 3, so drop it before the 2022.02 release.
>> 
>> It is a big series, but the changes are mainly mechanical in nature.
>> 
>> There is still some cleanup to do, E.G. the python2 support in
>> pkg-python and the host python-setuptools package - But this is IMHO
>> the minimum changes before -rc1.

There seem to be some more references to python(2) in packages; this 
build failure is from package/crda:

# make clean && make
   ...
make[1]: *** No rule to make target 'host-python', needed by 
'/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'. 
  Stop.
make: *** [Makefile:23: _all] Error 2

$ grep python-pycryptodomex */*.mk
crda/crda.mk:CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex 
libnl libgcrypt
python3-pycryptodomex/python3-pycryptodomex.mk:# Please keep in sync 
with package/python-pycryptodomex/python-pycryptodomex.mk
python3-pycryptodomex/python3-pycryptodomex.mk:HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR 
= python-pycryptodomex
python-pycryptodomex/python-pycryptodomex.mk:# python-pycryptodomex

Kind regards,
Andreas

>> Peter Korsgaard (107):
> ...
>>   package/python: drop target package
> ...
>>   package/python: drop host package
> ...
>>   docs/manual: drop python2 references
> 
> All 107 patches applied, thanks!
> 
> I'll reply further to two of them, with ultra-minor nits.
> 
> Pfew, 21st century, here we come at last! ;-)
> 
> Regards,
> Yann E. MORIN.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot