diff --git a/meta-iotqa/lib/oeqa/runtime/programming/python/files/apprt_test_python_helloworld.py b/meta-iotqa/lib/oeqa/runtime/programming/python/files/apprt_test_python_helloworld.py index b54eee6251..8a3095e1dc 100644 --- a/meta-iotqa/lib/oeqa/runtime/programming/python/files/apprt_test_python_helloworld.py +++ b/meta-iotqa/lib/oeqa/runtime/programming/python/files/apprt_test_python_helloworld.py @@ -11,7 +11,7 @@ # @{ ## -print 'Hello World!' +print('Hello World!') ## diff --git a/meta-iotqa/lib/oeqa/runtime/programming/python/files/apprt_test_python_stdout.py b/meta-iotqa/lib/oeqa/runtime/programming/python/files/apprt_test_python_stdout.py index 720f0b96b2..fc3881b840 100644 --- a/meta-iotqa/lib/oeqa/runtime/programming/python/files/apprt_test_python_stdout.py +++ b/meta-iotqa/lib/oeqa/runtime/programming/python/files/apprt_test_python_stdout.py @@ -12,7 +12,7 @@ ## a = 9.01e+21 - 9.01e+21 + 0.01 -print 'the value of a is %s' % a +print('the value of a is %s' % a) ## # @} diff --git a/meta-refkit-core/recipes-devtools/python/python3_%.bbappend b/meta-refkit-core/recipes-devtools/python/python3_%.bbappend index 166825968b..a2faabda15 100644 --- a/meta-refkit-core/recipes-devtools/python/python3_%.bbappend +++ b/meta-refkit-core/recipes-devtools/python/python3_%.bbappend @@ -1 +1,14 @@ require refkit-python.inc + +# This is a temporary solution until OE-core upstream supports alternatives for python +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'refkit-config', 'update-alternatives', '', d)} +ALTERNATIVE_PRIORITY_refkit-config = "80" +ALTERNATIVE_${PN}-core_refkit-config = "python python_config" + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'refkit-config', True, False, d): + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'python', d.getVar('bindir') + '/python') + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'python_config', d.getVar('bindir') + '/python-config') + d.setVarFlag('ALTERNATIVE_TARGET', 'python', d.getVar('bindir') + '/python3') + d.setVarFlag('ALTERNATIVE_TARGET', 'python_config', d.getVar('bindir') + '/python3-config') +} diff --git a/meta-refkit-core/recipes-devtools/python/python_%.bbappend b/meta-refkit-core/recipes-devtools/python/python_%.bbappend index 166825968b..3e09aaa0ce 100644 --- a/meta-refkit-core/recipes-devtools/python/python_%.bbappend +++ b/meta-refkit-core/recipes-devtools/python/python_%.bbappend @@ -1 +1,12 @@ require refkit-python.inc + +# This is a temporary solution until OE-core upstream supports alternatives for python +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'refkit-config', 'update-alternatives', '', d)} +ALTERNATIVE_PRIORITY_refkit-config = "100" +ALTERNATIVE_${PN}-core_refkit-config = "python python_config" + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'refkit-config', True, False, d): + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'python', d.getVar('bindir') + '/python') + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'python_config', d.getVar('bindir') + '/python-config') +} diff --git a/meta-refkit-core/recipes-sensors/mraa/mraa_git.bb b/meta-refkit-core/recipes-sensors/mraa/mraa_git.bb index 0ff356091a..1214c79ccb 100644 --- a/meta-refkit-core/recipes-sensors/mraa/mraa_git.bb +++ b/meta-refkit-core/recipes-sensors/mraa/mraa_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http" S = "${WORKDIR}/git" -inherit cmake distutils-base +inherit cmake distutils3-base DEPENDS += "json-c" diff --git a/meta-refkit-core/recipes-sensors/upm/upm_git.bb b/meta-refkit-core/recipes-sensors/upm/upm_git.bb index 50ba17e59e..b38b486feb 100644 --- a/meta-refkit-core/recipes-sensors/upm/upm_git.bb +++ b/meta-refkit-core/recipes-sensors/upm/upm_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http" S = "${WORKDIR}/git" -inherit distutils-base cmake +inherit distutils3-base cmake # override this in local.conf to get needed bindings. diff --git a/meta-refkit/conf/distro/include/refkit-supported-recipes.txt b/meta-refkit/conf/distro/include/refkit-supported-recipes.txt index 8b4e67b83a..5cc88ba66a 100644 --- a/meta-refkit/conf/distro/include/refkit-supported-recipes.txt +++ b/meta-refkit/conf/distro/include/refkit-supported-recipes.txt @@ -285,7 +285,6 @@ linux-yocto-rt@core linux-yocto@core lms8@intel log4cxx@ros-layer -lowpan-tools@networking-layer lttng-ust@core lvm2@openembedded-layer m4@core @@ -342,11 +341,6 @@ procps@core protobuf@openembedded-layer ptest-runner@core pulseaudio@core -python-dbus@core -python-nose@core -python-numpy@core -python-pygobject@core -python-setuptools@core python3-catkin-pkg@ros-layer python3-dbus@core python3-lxml@meta-python