From 97f87d8e9c228cc9e40f831d661bde9ffd55c2e5 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 24 Oct 2019 22:51:28 +0100 Subject: [PATCH] packages: switch from Python2 to Python3 --- .../Adafruit_Python_ADS1x15/package.mk | 2 +- .../Adafruit_Python_ADXL345/package.mk | 2 +- .../Adafruit_Python_BMP/package.mk | 2 +- .../Adafruit_Python_CharLCD/package.mk | 2 +- .../Adafruit_Python_DHT/package.mk | 4 ++-- .../Adafruit_Python_GPIO/package.mk | 2 +- .../Adafruit_Python_LED_Backpack/package.mk | 2 +- .../Adafruit_Python_LSM303/package.mk | 2 +- .../Adafruit_Python_MCP3008/package.mk | 2 +- .../Adafruit_Python_MCP4725/package.mk | 2 +- .../Adafruit_Python_PCA9685/package.mk | 2 +- .../Adafruit_Python_PureIO/package.mk | 2 +- .../Adafruit_Python_SI1145/package.mk | 2 +- .../Adafruit_Python_SSD1306/package.mk | 2 +- .../Adafruit_Python_TCS34725/package.mk | 2 +- .../Adafruit_Python_VCNL40xx/package.mk | 2 +- .../Adafruit_Python_WS2801/package.mk | 2 +- .../rpi-tools-depends/RPi.GPIO/package.mk | 4 ++-- .../rpi-tools-depends/picamera/package.mk | 2 +- .../system-tools-depends/dstat/package.mk | 2 +- .../system-tools-depends/i2c-tools/package.mk | 2 +- packages/addons/service/hyperion/package.mk | 2 +- packages/addons/service/tvheadend42/package.mk | 2 +- packages/devel/boost/package.mk | 3 ++- packages/devel/heimdal/package.mk | 2 +- packages/emulation/libretro-mame/package.mk | 2 +- packages/emulation/libretro-mame2016/package.mk | 2 +- packages/mediacenter/LibreELEC-settings/package.mk | 2 +- packages/mediacenter/kodi/package.mk | 2 +- packages/mediacenter/kodi/scripts/xml_merge.py | 2 +- packages/network/samba/package.mk | 6 +++--- packages/python/devel/distutilscross/package.mk | 2 +- packages/python/devel/ninja/package.mk | 4 ++-- packages/python/devel/pygobject/package.mk | 6 +++--- packages/python/devel/setuptools/package.mk | 4 +--- packages/python/graphics/Pillow/package.mk | 6 +++--- packages/python/security/pycryptodome/package.mk | 6 +++--- packages/python/system/dbus-python/package.mk | 10 +++++----- packages/python/system/simplejson/package.mk | 6 +++--- packages/sysutils/lirc/package.mk | 2 -- packages/tools/qemu/package.mk | 2 +- packages/x11/lib/libxcb/package.mk | 3 ++- packages/x11/proto/xcb-proto/package.mk | 3 ++- projects/Amlogic/bootloader/install | 4 ++-- 44 files changed, 64 insertions(+), 65 deletions(-) diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk index de93747fbe..a73fadf632 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="2f81a9a6b7b7f46b79faa5b01df0c25fa5f16af80842d74e35b5fbf01ab0c619" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the ADS1015 and ADS1115 analog to digital converters with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk index 5ff263f6e2..76e1371b57 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="22ec0fc6679cc3e9b5f0aff5cfeef34cbbf13e59aecfb829c2f0dc2d90b5fb8b" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the ADXL345 triple-axis accelerometer over I2C with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk index 9a56f6d3f2..ef2f9eb563 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="e5e140c34e312f6a00c62b1bd47ebe3f1857009b1c202c18c7b092ebb2e1eb9c" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library for accessing the BMP series pressure and temperature sensors like the BMP085/BMP180 on a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk index eeac263cea..875a13ba1c 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="eae4b446162feb533a469a9dacf6e750250f925561c9f7983a11d340e1dd98d4" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library for accessing Adafruit character LCDs from a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk index 38a6285006..eed74cebff 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="9125f8f42b4874db257a45184b866e8b424aa67230d2ffbc734b53686da7817f" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library to read the DHT series of humidity and temperature sensors on a Raspberry Pi." PKG_TOOLCHAIN="manual" @@ -28,5 +28,5 @@ make_target() { PKG_RPI_VERSION="" esac - python setup.py build $PKG_RPI_VERSION --cross-compile + python3 setup.py build $PKG_RPI_VERSION --cross-compile } diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk index 414e92cdf1..3ca10bd492 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="d3cb74fd033ebe5aea1786a584d64ef5eb8082ef2bf0a568b01691612cd04e88" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Library to provide a cross-platform GPIO interface on the Raspberry Pi ." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk index e90c718453..74d7f88ad5 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="244d2625cdaebdc68e299fedde276efa5c9f7c143681c4ee056fb8350a4f7167" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library for controlling LED backpack displays." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk index b62edbd21b..3317084c5c 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="609591f2add15e849d3bba320417c705a50a3ed077632baf20c12c8b740d5331" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the LSM303 accelerometer & magnetometer with Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk index 4a5c34b2b0..d6101f6583 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="f5e4c847a87716c16f0209df95c281b5071549644a79a143a77b212f25c464dc" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the MCP3008 analog to digital converter with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk index a45b54b77d..ce4da41ae7 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="6ebbd1f76807b01dc2b723064e52b0c82fc45388265b8ec867e0a42a46a6e926" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the MCP4725 digital to analog converter with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk index 211f13d28a..68ef549477 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="46e11dcfbfaab5756ddeb6ab31740cf8c7419ec1d32be2519f19882e7d86e426" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the PCA9685 PWM servo/LED controller with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk index 674cfb592e..974547bcb6 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="891a4d077fe6610de6aa4b0dc5b9933a6c7db3492072df60c0383662f28c2ae9" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Pure python access to Linux IO including I2C and SPI." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk index 39d41188a4..0a55c11674 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="0238b2c01cfbb2890ae78468d2fc19c815748fc94860a4eb92b649d074476264" PKG_LICENSE="MIT" PKG_SITE="https://github.com/THP-JOE/Python_SI1145" PKG_URL="https://github.com/THP-JOE/Python_SI1145/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library for accessing the SI1145 temperature sensor on a Raspberry Pi" PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk index 0f5759f154..513d4d8807 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="ed1163dee2fe6c0c2065a429e1d93cff7397a309071ff83714c84566739680a2" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="SSD1306 oled driver library for 'monochrome' 128x64 and 128x32 OLEDs." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk index f18b9b7bc9..af3e4ec978 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="f2c3218551da55d7fdbe2499a6ffa3a0b8ed1709e4402c6b0e0f37b17d4aa81f" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the TCS34725 color sensor with the Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk index 218d193baa..cbe10ab385 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="78346836965562720248138203a4af9dc6aa18815bda2a5b7842e3b9af9d1ea8" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the VCNL4000 & VCNL4010 proximity sensors with the Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk index 502889c755..43ebf971a8 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk @@ -7,6 +7,6 @@ PKG_SHA256="6219edb5c1d767ff950f5020bacdfb5ba608b4995eb14d6073fdec2f17f584cb" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to control WS2801 and similar SPI interface addressable RGB LED strips on a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk index de71daabd2..fc33db55e0 100644 --- a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk +++ b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk @@ -8,7 +8,7 @@ PKG_ARCH="arm" PKG_LICENSE="MIT" PKG_SITE="http://sourceforge.net/p/raspberry-gpio-python/" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="A module to control Raspberry Pi GPIO channels." PKG_TOOLCHAIN="manual" @@ -19,5 +19,5 @@ pre_configure_target() { } make_target() { - python setup.py build + python3 setup.py build } diff --git a/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk b/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk index 3342a44ba7..8a40c662ce 100644 --- a/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk +++ b/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk @@ -8,6 +8,6 @@ PKG_ARCH="arm" PKG_LICENSE="BSD" PKG_SITE="https://github.com/waveform80/picamera" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host bcm2835-driver" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host bcm2835-driver" PKG_LONGDESC="A python and shell interface for the Raspberry Pi camera module." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk index 1faa9abad0..8a86ebcd08 100644 --- a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="2b2f4ef3a0d1dc6d0a4bc2f54a57ba6f1e278333881a07df7e55aec502a48c7c" PKG_LICENSE="GPL" PKG_SITE="http://dag.wiee.rs/home-made/dstat" PKG_URL="https://github.com/dagwieers/dstat/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2" +PKG_DEPENDS_TARGET="toolchain Python3" PKG_LONGDESC="Versatile resource statistics tool." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk index 2c38170d80..c476d6e29e 100644 --- a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="f939a6242c03950cc568d0efdfa3db7a9c29e0e8f5abd01f2908bdd344c054ff" PKG_LICENSE="GPL" PKG_SITE="http://www.lm-sensors.org/wiki/I2CTools" PKG_URL="http://fossies.org/linux/misc/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="A heterogeneous set of I2C tools for Linux." pre_make_target() { diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk index 5ca8be5f3b..6828218435 100644 --- a/packages/addons/service/hyperion/package.mk +++ b/packages/addons/service/hyperion/package.mk @@ -11,7 +11,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/hyperion-project/hyperion" PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 libusb qtbase protobuf rpi_ws281x" +PKG_DEPENDS_TARGET="toolchain Python3 libusb qtbase protobuf rpi_ws281x" PKG_SECTION="service" PKG_SHORTDESC="Hyperion: an AmbiLight controller" PKG_LONGDESC="Hyperion($PKG_VERSION_DATE) is an modern opensource AmbiLight implementation." diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index b30f02110b..f4ee426efe 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -11,7 +11,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org" PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \ - libiconv openssl pngquant:host Python2:host tvh-dtv-scan-tables" + libiconv openssl pngquant:host Python3:host tvh-dtv-scan-tables" PKG_SECTION="service" PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux" PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T" diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk index be04c26908..2d5e107ea7 100644 --- a/packages/devel/boost/package.mk +++ b/packages/devel/boost/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="boost" PKG_VERSION="1_65_1" @@ -7,7 +8,7 @@ PKG_SHA256="9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81" PKG_LICENSE="OSS" PKG_SITE="http://www.boost.org/" PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.65.1/${PKG_NAME}_${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain boost:host Python2 zlib bzip2" +PKG_DEPENDS_TARGET="toolchain boost:host Python3 zlib bzip2" PKG_LONGDESC="boost: Peer-reviewed STL style libraries for C++" PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="+pic" diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk index 10879da584..762fcb6674 100644 --- a/packages/devel/heimdal/package.mk +++ b/packages/devel/heimdal/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c" PKG_LICENSE="BSD-3c" PKG_SITE="http://www.h5l.org/" PKG_URL="https://github.com/heimdal/heimdal/archive/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="toolchain:host e2fsprogs:host Python2:host ncurses:host" +PKG_DEPENDS_HOST="toolchain:host e2fsprogs:host Python3:host ncurses:host" PKG_LONGDESC="Kerberos 5, PKIX, CMS, GSS-API, SPNEGO, NTLM, Digest-MD5 and, SASL implementation." PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="-parallel" diff --git a/packages/emulation/libretro-mame/package.mk b/packages/emulation/libretro-mame/package.mk index 5fc664f93e..60c5d85ee1 100644 --- a/packages/emulation/libretro-mame/package.mk +++ b/packages/emulation/libretro-mame/package.mk @@ -27,7 +27,7 @@ make_target() { PTR64="1" fi - make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python2 CONFIG=libretro \ + make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python3 CONFIG=libretro \ LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="$ARCH" DISTRO="debian-stable" \ CROSS_BUILD="1" OVERRIDE_CC="$CC" OVERRIDE_CXX="$CXX" \ PTR64="$PTR64" TARGET="mame" \ diff --git a/packages/emulation/libretro-mame2016/package.mk b/packages/emulation/libretro-mame2016/package.mk index d304a8db92..43bb78b4be 100644 --- a/packages/emulation/libretro-mame2016/package.mk +++ b/packages/emulation/libretro-mame2016/package.mk @@ -28,7 +28,7 @@ make_target() { PKG_PTR64="0" fi - make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python2 CONFIG=libretro \ + make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python3 CONFIG=libretro \ LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="${ARCH}" DISTRO="debian-stable" \ CROSS_BUILD="1" OVERRIDE_CC="${CC}" OVERRIDE_CXX="${CXX}" \ PTR64="${PKG_PTR64}" NOASM="${PKG_NOASM}" TARGET="mame" \ diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk index 81ebb6fb31..2524445e51 100644 --- a/packages/mediacenter/LibreELEC-settings/package.mk +++ b/packages/mediacenter/LibreELEC-settings/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="d72329051ac748cb6764597b36b2a6ed965f9b95c11a224b1a92ddf27db721be" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="https://github.com/LibreELEC/service.libreelec.settings/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 connman pygobject dbus-python" +PKG_DEPENDS_TARGET="toolchain Python3 connman pygobject dbus-python" PKG_LONGDESC="LibreELEC-settings: is a settings dialog for LibreELEC" PKG_MAKE_OPTS_TARGET="DISTRONAME=$DISTRONAME ROOT_PASSWORD=$ROOT_PASSWORD" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 6f206c3032..6fe21f21f0 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -5,7 +5,7 @@ PKG_NAME="kodi" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" -PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python2 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers" +PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers" PKG_LONGDESC="A free and open source cross-platform media player." PKG_BUILD_FLAGS="+speed" diff --git a/packages/mediacenter/kodi/scripts/xml_merge.py b/packages/mediacenter/kodi/scripts/xml_merge.py index f7fd547f36..851954094d 100755 --- a/packages/mediacenter/kodi/scripts/xml_merge.py +++ b/packages/mediacenter/kodi/scripts/xml_merge.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # taken from http://stackoverflow.com/a/14879370 with minor modifications diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 128dcb188e..f78730615b 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="14d249bd02f0227156dd77cf98e57cfef8fc5a9ec85e03873737cea7c386350a" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" PKG_URL="https://download.samba.org/pub/samba/stable/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain attr heimdal:host e2fsprogs Python2 zlib readline popt libaio connman" +PKG_DEPENDS_TARGET="toolchain attr heimdal:host e2fsprogs Python3 zlib readline popt libaio connman" PKG_NEED_UNPACK="$(get_pkg_directory heimdal) $(get_pkg_directory e2fsprogs)" PKG_LONGDESC="A free SMB / CIFS fileserver and client." PKG_BUILD_FLAGS="-gold" @@ -108,9 +108,9 @@ configure_target() { cp $PKG_DIR/config/samba4-cache.txt $PKG_BUILD/cache.txt echo "Checking uname machine type: \"$TARGET_ARCH\"" >> $PKG_BUILD/cache.txt - PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python-config" \ + PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python3-config" \ python_LDFLAGS="" python_LIBDIR="" \ - ./configure $PKG_CONFIGURE_OPTS + PYTHON=${TOOLCHAIN}/bin/python3 ./configure $PKG_CONFIGURE_OPTS } make_target() { diff --git a/packages/python/devel/distutilscross/package.mk b/packages/python/devel/distutilscross/package.mk index 4c767be5ee..c2c64b581c 100644 --- a/packages/python/devel/distutilscross/package.mk +++ b/packages/python/devel/distutilscross/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="4ed3fb427708c8a3ed5fe9c599532480f581078a1e0aec0e50f40eb58e9f0015" PKG_LICENSE="GPL" PKG_SITE="http://bitbucket.org/lambacck/distutilscross/" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="Python2:host setuptools:host" +PKG_DEPENDS_HOST="Python3:host setuptools:host" PKG_LONGDESC="distutilscross enhances distutils to support Cross Compile of Python extensions" PKG_TOOLCHAIN="manual" diff --git a/packages/python/devel/ninja/package.mk b/packages/python/devel/ninja/package.mk index 4d5970bef4..3e4f9c6415 100644 --- a/packages/python/devel/ninja/package.mk +++ b/packages/python/devel/ninja/package.mk @@ -8,12 +8,12 @@ PKG_SHA256="5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9" PKG_LICENSE="Apache" PKG_SITE="http://martine.github.io/ninja/" PKG_URL="https://github.com/ninja-build/ninja/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="Python2:host" +PKG_DEPENDS_HOST="Python3:host" PKG_LONGDESC="Small build system with a focus on speed" PKG_TOOLCHAIN="manual" make_host() { - python2 configure.py --bootstrap + python3 configure.py --bootstrap } makeinstall_host() { diff --git a/packages/python/devel/pygobject/package.mk b/packages/python/devel/pygobject/package.mk index e6eafaebfb..dbc746c5a8 100644 --- a/packages/python/devel/pygobject/package.mk +++ b/packages/python/devel/pygobject/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pygobject" PKG_VERSION="2.28.7" @@ -7,19 +8,18 @@ PKG_SHA256="bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a" PKG_LICENSE="LGPL" PKG_SITE="http://www.pygtk.org/" PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain Python2 glib libffi" +PKG_DEPENDS_TARGET="toolchain Python3 glib libffi" PKG_LONGDESC="A convenient wrapper for the GObject+ library for use in Python programs." PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--enable-thread --disable-introspection" pre_configure_target() { - export PYTHON_INCLUDES="$($SYSROOT_PREFIX/usr/bin/python2-config --includes)" + export PYTHON_INCLUDES="$($SYSROOT_PREFIX/usr/bin/python3-config --includes)" } post_makeinstall_target() { find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";" - find $INSTALL/usr/lib -name "*.pyc" -exec rm -rf "{}" ";" rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/share/pygobject diff --git a/packages/python/devel/setuptools/package.mk b/packages/python/devel/setuptools/package.mk index 531e6d7238..778b8d68e1 100644 --- a/packages/python/devel/setuptools/package.mk +++ b/packages/python/devel/setuptools/package.mk @@ -8,16 +8,14 @@ PKG_SHA256="ca8119dd5c2764a7d290518817de0b880d23d790913fcd797c02ad2aa39b8c41" PKG_LICENSE="OSS" PKG_SITE="https://pypi.org/project/setuptools" PKG_URL="https://github.com/pypa/setuptools/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="Python2:host Python3:host" +PKG_DEPENDS_HOST="Python3:host" PKG_LONGDESC="Replaces Setuptools as the standard method for working with Python module distributions." PKG_TOOLCHAIN="manual" make_host() { - python2 bootstrap.py python3 bootstrap.py } makeinstall_host() { - exec_thread_safe python2 setup.py install --prefix=$TOOLCHAIN exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN } diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk index 29f46b48ac..33f2311937 100644 --- a/packages/python/graphics/Pillow/package.mk +++ b/packages/python/graphics/Pillow/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5" PKG_LICENSE="BSD" PKG_SITE="http://www.pythonware.com/products/pil/" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host zlib freetype libjpeg-turbo tiff" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host zlib freetype libjpeg-turbo tiff" PKG_LONGDESC="The Python Imaging Library adds image processing capabilities to your Python interpreter." PKG_TOOLCHAIN="manual" @@ -18,11 +18,11 @@ pre_make_target() { } make_target() { - python setup.py build --cross-compile + python3 setup.py build --cross-compile } makeinstall_target() { - python setup.py install --root=$INSTALL --prefix=/usr + python3 setup.py install --root=$INSTALL --prefix=/usr } post_makeinstall_target() { diff --git a/packages/python/security/pycryptodome/package.mk b/packages/python/security/pycryptodome/package.mk index 77630980df..1afab5b784 100644 --- a/packages/python/security/pycryptodome/package.mk +++ b/packages/python/security/pycryptodome/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="5bc40f8aa7ba8ca7f833ad2477b9d84e1bfd2630b22a46d9bbd221982f8c3ac0" PKG_LICENSE="BSD" PKG_SITE="https://pypi.org/project/pycryptodome" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="PyCryptodome is a self-contained Python package of low-level cryptographic primitives." PKG_TOOLCHAIN="manual" @@ -20,11 +20,11 @@ pre_configure_target() { } make_target() { - python setup.py build --cross-compile + python3 setup.py build --cross-compile } makeinstall_target() { - python setup.py install --root=$INSTALL --prefix=/usr + python3 setup.py install --root=$INSTALL --prefix=/usr # Remove SelfTest bloat find $INSTALL -type d -name SelfTest -exec rm -fr "{}" \; 2>/dev/null || true diff --git a/packages/python/system/dbus-python/package.mk b/packages/python/system/dbus-python/package.mk index 441c8f6779..60ba27ef2b 100644 --- a/packages/python/system/dbus-python/package.mk +++ b/packages/python/system/dbus-python/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dbus-python" PKG_VERSION="1.2.8" @@ -7,17 +8,16 @@ PKG_SHA256="abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f" PKG_LICENSE="GPL" PKG_SITE="https://freedesktop.org/wiki/Software/dbus" PKG_URL="https://dbus.freedesktop.org/releases/dbus-python/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 dbus dbus-glib" +PKG_DEPENDS_TARGET="toolchain Python3 dbus dbus-glib" PKG_LONGDESC="D-BUS is a message bus, used for sending messages between applications." PKG_BUILD_FLAGS="+lto" pre_configure_target() { - export PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python2-config" - export PYTHON_INCLUDES="$($SYSROOT_PREFIX/usr/bin/python2-config --includes)" - export PYTHON_LIBS="$($SYSROOT_PREFIX/usr/bin/python2-config --ldflags)" + export PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python3-config" + export PYTHON_INCLUDES="$($SYSROOT_PREFIX/usr/bin/python3-config --includes)" + export PYTHON_LIBS="$($SYSROOT_PREFIX/usr/bin/python3-config --ldflags)" } post_makeinstall_target() { find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";" - find $INSTALL/usr/lib -name "*.pyc" -exec rm -rf "{}" ";" } diff --git a/packages/python/system/simplejson/package.mk b/packages/python/system/simplejson/package.mk index 29b56ca822..937e28c25b 100644 --- a/packages/python/system/simplejson/package.mk +++ b/packages/python/system/simplejson/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5" PKG_LICENSE="OSS" PKG_SITE="http://pypi.org/project/simplejson" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="A simple, fast, complete, correct and extensible JSON encoder and decoder for Python 2.5+." PKG_TOOLCHAIN="manual" @@ -17,11 +17,11 @@ pre_make_target() { } make_target() { - python setup.py build --cross-compile + python3 setup.py build --cross-compile } makeinstall_target() { - python setup.py install --root=$INSTALL --prefix=/usr + python3 setup.py install --root=$INSTALL --prefix=/usr } post_makeinstall_target() { diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk index 95d595b6b3..5df1b1c7c9 100644 --- a/packages/sysutils/lirc/package.mk +++ b/packages/sysutils/lirc/package.mk @@ -12,8 +12,6 @@ PKG_DEPENDS_TARGET="toolchain libftdi1 libusb-compat libxslt" PKG_LONGDESC="LIRC is a package that allows you to decode and send infra-red signals." PKG_TOOLCHAIN="autotools" -PKG_PYTHON_WANTED=Python2 - PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_alsa_asoundlib_h=no \ ac_cv_lib_asound_snd_async_del_handler=no \ --enable-devinput \ diff --git a/packages/tools/qemu/package.mk b/packages/tools/qemu/package.mk index a3d20ae319..5f30788e64 100644 --- a/packages/tools/qemu/package.mk +++ b/packages/tools/qemu/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="13a93dfe75b86734326f8d5b475fde82ec692d5b5a338b4262aeeb6b0fa4e469" PKG_LICENSE="GPL" PKG_SITE="http://wiki.qemu.org" PKG_URL="https://download.qemu.org/qemu-$PKG_VERSION.tar.xz" -PKG_DEPENDS_HOST="toolchain:host glib:host pixman:host Python2:host zlib:host" +PKG_DEPENDS_HOST="toolchain:host glib:host pixman:host Python3:host zlib:host" PKG_LONGDESC="QEMU is a generic and open source machine emulator and virtualizer." pre_configure_host() { diff --git a/packages/x11/lib/libxcb/package.mk b/packages/x11/lib/libxcb/package.mk index 2405c917ee..1b8bf0411c 100644 --- a/packages/x11/lib/libxcb/package.mk +++ b/packages/x11/lib/libxcb/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libxcb" PKG_VERSION="1.13" @@ -7,7 +8,7 @@ PKG_SHA256="188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b851daa" PKG_LICENSE="OSS" PKG_SITE="http://xcb.freedesktop.org" PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain util-macros Python2:host xcb-proto libpthread-stubs libXau" +PKG_DEPENDS_TARGET="toolchain util-macros Python3:host xcb-proto libpthread-stubs libXau" PKG_LONGDESC="X C-language Bindings library." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/proto/xcb-proto/package.mk b/packages/x11/proto/xcb-proto/package.mk index 50e8b777ad..1e631762dc 100644 --- a/packages/x11/proto/xcb-proto/package.mk +++ b/packages/x11/proto/xcb-proto/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xcb-proto" PKG_VERSION="1.13" @@ -7,5 +8,5 @@ PKG_SHA256="7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain util-macros Python2:host" +PKG_DEPENDS_TARGET="toolchain util-macros Python3:host" PKG_LONGDESC="X C-language Bindings protocol headers." diff --git a/projects/Amlogic/bootloader/install b/projects/Amlogic/bootloader/install index 8f5690e3b9..26119f94f2 100644 --- a/projects/Amlogic/bootloader/install +++ b/projects/Amlogic/bootloader/install @@ -120,7 +120,7 @@ case "${UBOOT_SYSTEM}" in $FIPDIR/fip_create --dump $DESTDIR/fip.bin - python2 $FIPDIR/acs_tool.pyc $DESTDIR/bl2.bin \ + python3 $FIPDIR/acs_tool.pyc $DESTDIR/bl2.bin \ $DESTDIR/bl2_acs.bin \ $DESTDIR/acs.bin 0 @@ -152,7 +152,7 @@ case "${UBOOT_SYSTEM}" in $DESTDIR/bl301_zero.bin \ $DESTDIR/bl30_new.bin bl30 - python2 $FIPDIR/acs_tool.pyc $DESTDIR/bl2.bin $DESTDIR/bl2_acs.bin $DESTDIR/acs.bin 0 + python3 $FIPDIR/acs_tool.pyc $DESTDIR/bl2.bin $DESTDIR/bl2_acs.bin $DESTDIR/acs.bin 0 $FIPDIR/blx_fix.sh $DESTDIR/bl2_acs.bin \ $DESTDIR/zero_tmp \