speedtest-cli: Use Python 3 instead of Python 2

This seems to be required although the documentation says
that Python 2 is supported.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/speedtest-cli b/config/rootfiles/packages/speedtest-cli
index f21c7afa71ad0f2b691b7fff2dc56d6f29076f44..7dc60ca81d18ceb57c95e68f4b7a28814078d6f8 100644 (file)
--- a/config/rootfiles/packages/speedtest-cli
+++ b/config/rootfiles/packages/speedtest-cli
@@ -1,10 +1,10 @@
 usr/bin/speedtest
 usr/bin/speedtest-cli
-usr/lib/python2.7/site-packages/speedtest.py
-usr/lib/python2.7/site-packages/speedtest.pyc
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/PKG-INFO
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/SOURCES.txt
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/dependency_links.txt
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/entry_points.txt
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/top_level.txt
+usr/lib/python3.6/site-packages/__pycache__/speedtest.cpython-36.pyc
+usr/lib/python3.6/site-packages/speedtest.py
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/entry_points.txt
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/top_level.txt

diff --git a/lfs/speedtest-cli b/lfs/speedtest-cli
index aa2af73bbad1d7c759ad5f55f1bbba0bd4ad1fbe..6c11d53140061a40335dc03bc9158b74299acdef 100644 (file)
--- a/lfs/speedtest-cli
+++ b/lfs/speedtest-cli
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = speedtest-cli
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = ""
+DEPS       = "python3"
 
 ###############################################################################
 # Top-level Rules
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && python setup.py build
-       cd $(DIR_APP) && python setup.py install --root=/
+       cd $(DIR_APP) && python3 setup.py build
+       cd $(DIR_APP) && python3 setup.py install --root=/
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)