diff --git a/config/functions b/config/functions index fa14e0e8e6..8a7430ca3d 100644 --- a/config/functions +++ b/config/functions @@ -432,10 +432,10 @@ endian = 'little' [properties] root = '$TOOLCHAIN' -$(python -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))") -$(python -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))") -$(python -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('CXXFLAGS').split()]))") -$(python -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))") +$(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))") +$(python3 -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))") +$(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('CXXFLAGS').split()]))") +$(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))") ${!properties} EOF } @@ -462,10 +462,10 @@ endian = 'little' [properties] root = '$SYSROOT_PREFIX/usr' -$(python -c "import os; print('c_args = {}'.format([x for x in os.getenv('TARGET_CFLAGS').split()]))") -$(python -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))") -$(python -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('TARGET_CXXFLAGS').split()]))") -$(python -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))") +$(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('TARGET_CFLAGS').split()]))") +$(python3 -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))") +$(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('TARGET_CXXFLAGS').split()]))") +$(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))") ${!properties} EOF } diff --git a/packages/x11/driver/xf86-video-nvidia/scripts/compare_nvidia.py b/packages/x11/driver/xf86-video-nvidia/scripts/compare_nvidia.py index c7bb41f9eb..d3e5b84dfd 100755 --- a/packages/x11/driver/xf86-video-nvidia/scripts/compare_nvidia.py +++ b/packages/x11/driver/xf86-video-nvidia/scripts/compare_nvidia.py @@ -1,15 +1,18 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv -from __future__ import print_function - import re import os import requests import sys -from lxml import html + +try: + from lxml import html +except: + print('lxml module not installed.\n\nOn Ubuntu, use "sudo apt install python3-lxml"') + sys.exit(1) category = { 1: 'Nvidia Geforce GPUs', diff --git a/packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py b/packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py index 23b8210781..e1bfb8bcda 100755 --- a/packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py +++ b/packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py @@ -1,8 +1,13 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 -import os +import os, sys import requests -from lxml import html + +try: + from lxml import html +except: + print('lxml module not installed.\n\nOn Ubuntu, use "sudo apt install python3-lxml"') + sys.exit(1) __cwd__ = os.path.dirname(os.path.realpath(__file__)) __rules__ = __cwd__ + '/../udev.d/96-nvidia.rules' diff --git a/scripts/genbuildplan.py b/scripts/genbuildplan.py index 91b58f07fb..15e4dca4cf 100755 --- a/scripts/genbuildplan.py +++ b/scripts/genbuildplan.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) -from __future__ import print_function import sys, os, codecs, json, argparse, re ROOT_PKG = "__root__" diff --git a/scripts/uboot_helper b/scripts/uboot_helper index a71cab6604..ee96481d67 100755 --- a/scripts/uboot_helper +++ b/scripts/uboot_helper @@ -1,9 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) -from __future__ import print_function import sys # When adding new devices to the list please keep them in alphabetical order diff --git a/tools/fixlecode.py b/tools/fixlecode.py index 03d270acf5..e958d4cad5 100755 --- a/tools/fixlecode.py +++ b/tools/fixlecode.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) -from __future__ import print_function import os import sys import re diff --git a/tools/mtstats.py b/tools/mtstats.py index 8fdc4ff9b2..f7c6707e57 100755 --- a/tools/mtstats.py +++ b/tools/mtstats.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # SPDX-License-Identifier: GPL-2.0