Skip to contentSkip to conversation

package/python: add optional support for lib2to3

PATCH New Bernd Kuhls 2 participants 3 messages Feb 22, 2020 – Mar 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/python: add optional support for lib2to3

Kodi is in transition to support python3 instead of python2:
https://kodi.wiki/view/General_information_about_migration_to_Python_3

"For Kodi 18 (Leia), only addons that are compatible with both Python 2
and 3 will be accepted to the official addon repository."

Some of these addons depend on the Kodi addon script.module.future to provide support for both python versions.

The script.module.future addon contains python-future:
https://kodi.wiki/view/General_information_about_migration_to_Python_3#Future
which in turn needs lib2to3 to be included in the target build of
python2: http://python-future.org/automatic_conversion.html

Kodi addons depending on the script.module.future addon are crashing on buildroot due to lib2to3 missing in the build.

LibreELEC added lib2to3 to python2 to fix the problem:
https://forum.libreelec.tv/thread/21239-lib2to3-pgen2-parse-missing/
https://github.com/LibreELEC/LibreELEC.tv/pull/4147

This patch provides the Config.in option to be used by Kodi.

---
 package/python/Config.in | 5 +++++
 package/python/python.mk | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
package/python/Config.in +5 -0
index a7f16450e3..bded00c9e8 100644
@@ -39,6 +39,11 @@ 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
package/python/python.mk +6 -1
index 1c393b255d..f9d5619612 100644
@@ -118,6 +118,12 @@ 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
@@ -165,7 +171,6 @@ PYTHON_CONF_OPTS += \
 	--with-system-ffi \
 	--disable-pydoc \
 	--disable-test-modules \
-	--disable-lib2to3 \
 	--disable-gdbm \
 	--disable-tk \
 	--disable-nis \
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/kodi: needs python 2to3 library

Kodi is in transition to support python3 instead of python2:
https://kodi.wiki/view/General_information_about_migration_to_Python_3

"For Kodi 18 (Leia), only addons that are compatible with both Python 2
and 3 will be accepted to the official addon repository."

Some of these addons depend on the Kodi addon script.module.future to provide support for both python versions.

The script.module.future addon contains python-future:
https://kodi.wiki/view/General_information_about_migration_to_Python_3#Future
which in turn needs lib2to3 to be included in the target build of
python2: http://python-future.org/automatic_conversion.html

Kodi addons depending on the script.module.future addon are crashing on buildroot due to lib2to3 missing in the build.

LibreELEC added lib2to3 to python2 to fix the problem:
https://forum.libreelec.tv/thread/21239-lib2to3-pgen2-parse-missing/
https://github.com/LibreELEC/LibreELEC.tv/pull/4147

---
 package/kodi/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/kodi/Config.in +1 -0
index b9eea78d57..6508184c64 100644
@@ -92,6 +92,7 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_PCRE_UCP
+	select BR2_PACKAGE_PYTHON_2TO3
 	select BR2_PACKAGE_PYTHON_BSDDB
 	select BR2_PACKAGE_PYTHON_CURSES
 	select BR2_PACKAGE_PYTHON_PYEXPAT
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/2 package/python: add optional support for lib2to3

In reply to Bernd Kuhls
Quoted 21 lines · On Sat, 22 Feb 2020 19:54:59 +0100 Bernd Kuhls <[email protected]> wrote:

Kodi is in transition to support python3 instead of python2:
https://kodi.wiki/view/General_information_about_migration_to_Python_3

"For Kodi 18 (Leia), only addons that are compatible with both Python 2
and 3 will be accepted to the official addon repository."

Some of these addons depend on the Kodi addon script.module.future to provide support for both python versions.

The script.module.future addon contains python-future:
https://kodi.wiki/view/General_information_about_migration_to_Python_3#Future
which in turn needs lib2to3 to be included in the target build of
python2: http://python-future.org/automatic_conversion.html

Kodi addons depending on the script.module.future addon are crashing on buildroot due to lib2to3 missing in the build.

LibreELEC added lib2to3 to python2 to fix the problem:
https://forum.libreelec.tv/thread/21239-lib2to3-pgen2-parse-missing/
https://github.com/LibreELEC/LibreELEC.tv/pull/4147

Quoted 7 lines

This patch provides the Config.in option to be used by Kodi.

---
 package/python/Config.in | 5 +++++
 package/python/python.mk | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

Both patches applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com