diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-28 15:33:36 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-28 15:34:01 +0300 |
commit | 2d39a06105c717cc742ee37700441975ddd5f81e (patch) | |
tree | 37936399c7297c4557ab2f126fd3fa267e25bbf3 /meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch | |
parent | 47ca1972705ab5691c7774a426139ed01af20c55 (diff) | |
download | openbmc-2d39a06105c717cc742ee37700441975ddd5f81e.tar.xz |
meta-openembedded: subtree update:64224b92e5..18506b797b
Alistair Francis (3):
python3-pako: Initial commit of version 0.2.3
python3-msm: Initial commit of version 0.8.3
mycroft: Fixup remaining issues
Andreas Müller (11):
gtkmm3: upgrade 3.24.1 -> 3.24.2
geany: upgrade 1.34.1 -> 1.36
geany-plugins: upgrade 1.34 -> 1.36
libstemmer: initial add 2.0.0
appstream-glib: initial add 0.7.16
yelp-xsl: initial add 3.34.0
yelp-tools: initial add 3.32.2
yelp: initial add 3.34.0
glibmm: upgrade 2.60.0 -> 2.62.0
libsigc++-3: initial add 3.0.0
libgusb: initial add 0.3.0+
Ankit Navik (1):
glfw: Initial recipe for glfw
Armin Kuster (1):
renderdoc: package need opengl
Christophe PRIOUZEAU (91):
spawn-fcgi: Clarify BSD license variant
webmin: Clarify BSD license variant
cyrus-sasl: Clarify BSD license variant
libnet: Clarify BSD license variant
openhpi: Clarify BSD license variant
ptpd: Clarify BSD license variant
pure-ftpd: Clarify BSD license variant
corosync: Clarify BSD license variant
netkit-ftp: Clarify BSD license variant
netkit-rusers: Clarify BSD license variant
netkit-rwho: Clarify BSD license variant
netkit-telnet: Clarify BSD license variant
freediameter: Clarify BSD license variant
radiusclient: Clarify BSD license variant
celt051: Clarify BSD license variant
libmemcached: Clarify BSD license variant
spice-protocol: Clarify BSD license variant
tcpdump: Clarify BSD license variant
libnet: Clarify BSD license variant
iperf3: Clarify BSD license variant
rfkill: Clarify BSD license variant
postgresql: Clarify BSD license variant
cscope: Clarify BSD license variant
mcpp: Clarify BSD license variant
yasm: Clarify BSD license variant
cmpi binding: Clarify BSD license variant
hwloc: Clarify BSD license variant
liblogging: Clarify BSD license variant
pmdk: Clarify BSD license variant
openwsman: Clarify BSD license variant
redis: Clarify BSD license variant
scsirastools: Clarify BSD license variant
libopus: Clarify BSD license variant
opus-tools: Clarify BSD license variant
wavpack: Clarify BSD license variant
libvpx: Clarify BSD license variant
passwdqc: Clarify BSD license variant
testfloat: Clarify BSD license variant
Python: flask-sqlalchemy: Clarify BSD license variant
Python: meld3: Clarify BSD license variant
Python: ply: Clarify BSD license variant
Python: prompt toolkit: Clarify BSD license variant
Python: pocket sphinx: Clarify BSD license variant
Python: pysmi: Clarify BSD license variant
Python: speaklater: Clarify BSD license variant
Python: wrapt: Clarify BSD license variant
Python: h5py: Clarify BSD license variant
Python: xlrd: Clarify BSD license variant
Python: alembic: Clarify BSD license variant
Python: feed formatter: Clarify BSD license variant
Python: decorator: Clarify BSD license variant
Python: flask babel: Clarify BSD license variant
Python: falsk mail: Clarify BSD license variant
Python: isodate: Clarify BSD license variant
Python: passlib: Clarify BSD license variant
Python: pynetlinux: Clarify BSD license variant
Python: webcolors: Clarify BSD license variant
Python: werkzeug: Clarify BSD license variant
Python: evdev: Clarify BSD license variant
Python: netaddr: Clarify BSD license variant
Python: pretend: Clarify BSD license variant
Python: prettytable: Clarify BSD license variant
Python: pysocks: Clarify BSD license variant
Python: rdflib: Clarify BSD license variant
Python: wtforms: Clarify BSD license variant
Python: supervisor: Clarify BSD license variant
Python: pysnmp: Clarify BSD license variant
Python: flask pymongo: Clarify BSD license variant
Python: flask xstatic: Clarify BSD license variant
Python: lazy object proxy: Clarify BSD license variant
Python: whoosh: Clarify BSD license variant
Python: pyserial: Clarify BSD license variant
Python: pika: Clarify BSD license variant
Python: flask: Clarify BSD license variant
Python: flask wtf: Clarify BSD license variant
Python: click: Clarify BSD license variant
Python: babel: Clarify BSD license variant
Python: flask user: Clarify BSD license variant
Python: jsonpointer: Clarify BSD license variant
Python: xxhash: Clarify BSD license variant
Python: markdown: Clarify BSD license variant
Python: dnspython: Clarify BSD license variant
Python: flask bcrypt: Clarify BSD license variant
Python: jsonpatch: Clarify BSD license variant
Python: ndg httpsclient: Clarify BSD license variant
Python: flask scrypt: Clarify BSD license variant
Python: oauthlib: Clarify BSD license variant
Python: psutil: Clarify BSD license variant
Python: pyhamcrest: Clarify BSD license variant
Python: pyusb: Clarify BSD license variant
Python: ujson: Clarify BSD license variant
David Roman (1):
nlohmann-json: upgrade 3.3.0 -> 3.7.0
Diego Rondini (1):
ttf-roboto: add recipe
Hongxu Jia (2):
postfix: split /etc from ${PN} to ${PN}-cfg for ostree
postfix.inc: make deterministic build
Kai Kang (1):
blueman: fix fail to enable bluetooth issue
Khem Raj (8):
open-vm-tools: Upgrade to 11.0.1
libftdi: Add target deps for python bindings
mraa: Define PYTHON_LIBRARY and PYTHON_INCLUDE_DIR
upm: Define PYTHON_INCLUDE_DIR and PYTHON_LIBRARY for cmake
python3-astor: Upgrade to 0.8
python3-astor: Fix build with setuptools>=41.4
libiio: Inherit distutils3-base for packaging python files
open-vm-tools: Fix build by removing deprecated G_INLINE_FUNC
Michal Lower (1):
update python setuptools-scm from 2.1.0 to 3.3.3
Paolo Valente (1):
s-suite: push SRCREV to version 3.6
Richard Purdie (1):
dconf: Fix build with meson 0.52
Tanu Kaskinen (1):
pavucontrol: polish the recipe
Trevor Gamblin (1):
freeradius: fix PIDFile path in radiusd.service file
Zang Ruochen (18):
ltrace:Bug fix for data type length judgment
python-ipaddress: upgrade 1.0.22 -> 1.0.23
python-cryptography: upgrade 2.7 -> 2.8
python-cryptography-vectors: upgrade 2.7 -> 2.8
python-automat: upgrade 0.7.0 -> 0.8.0
python-asn1crypto: upgrade 1.0.1 -> 1.2.0
python-attrs: upgrade 19.2.0 -> 19.3.0
python-cffi: upgrade 1.13.0 -> 1.13.1
python-cmd2: upgrade 0.9.18 -> 0.9.19
python-pip: upgrade 19.3 -> 19.3.1
python-pyro4: upgrade 4.73 -> 4.77
python-pytun: upgrade 2.2.1 -> 2.3.0
python-astroid: upgrade 1.6.5 -> 2.3.2
python-aws-iot-device-sdk-python: upgrade 1.4.0 -> 1.4.7
python-backports-ssl: upgrade 3.5.0.1 -> 3.7.0.1
python-bcrypt: upgrade 3.1.4 -> 3.1.7
snort: upgrade 2.9.14.1 -> 2.9.15
wolfssl: upgrade 4.1.0 -> 4.2.0
Zheng Ruoqin (9):
byacc: upgrade 20180510 -> 20190617
drbd-utils: upgrade 9.10.0 -> 9.11.0
hwdata: upgrade 327 -> 328
multipath-tools: upgrade 0.8.2 -> 0.8.3
owfs: upgrade 3.2p2 -> 3.2p3
simple-mtpfs: upgrade to 0.3.0.
fuse3: upgrade 3.6.2 -> 3.7.0
f2fs-tools: upgrade 1.11.0 -> 1.13.0
xorriso: upgrade 1.4.0 -> 1.5.0
nick83ola (2):
python3-pyconnman: fix import issues with python3
python3-dbus-next: first commit of dbus-next 0.1.2
Change-Id: I6d500f726de3c5369b19c73e6ca7dc92aaf192d8
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch')
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch | 121 |
1 files changed, 121 insertions, 0 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch new file mode 100644 index 000000000..6f1f6f78d --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch @@ -0,0 +1,121 @@ +From 86a1d18d96f827baa0c1029c85a53fc89d436e17 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Tue, 19 Mar 2019 13:38:44 -0700 +Subject: [PATCH 6/7] Use python3 and pip3 instead of python and pip + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] +--- + bin/mycroft-cli-client | 2 +- + bin/mycroft-pip | 2 +- + bin/mycroft-say-to | 2 +- + bin/mycroft-skill-testrunner | 4 ++-- + bin/mycroft-speak | 2 +- + dev_setup.sh | 6 +++--- + scripts/install-pocketsphinx.sh | 2 +- + 7 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/bin/mycroft-cli-client b/bin/mycroft-cli-client +index f40a316e3f6..de2040d9e67 100755 +--- a/bin/mycroft-cli-client ++++ b/bin/mycroft-cli-client +@@ -21,4 +21,4 @@ DIR="$( dirname "$SOURCE" )" + source "$DIR/../venv-activate.sh" -q + + # Invoke the Command Line Interface +-python -m mycroft.client.text $@ ++python3 -m mycroft.client.text $@ +diff --git a/bin/mycroft-pip b/bin/mycroft-pip +index a42b16b847a..81bd5bfb3cf 100755 +--- a/bin/mycroft-pip ++++ b/bin/mycroft-pip +@@ -21,4 +21,4 @@ DIR="$( dirname "$SOURCE" )" + source "$DIR/../venv-activate.sh" -q + + # Install pip packages within the Mycroft venv +-pip $@ +\ No newline at end of file ++pip3 $@ +\ No newline at end of file +diff --git a/bin/mycroft-say-to b/bin/mycroft-say-to +index 4ae597f3062..8bb4039996d 100755 +--- a/bin/mycroft-say-to ++++ b/bin/mycroft-say-to +@@ -26,4 +26,4 @@ set -- "${1:-$(</dev/stdin)}" "${@:2}" + + # Send a message to be spoken + data="$@" +-output=$(python -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$data\"], \"lang\": \"en-us\"}") ++output=$(python3 -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$data\"], \"lang\": \"en-us\"}") +diff --git a/bin/mycroft-skill-testrunner b/bin/mycroft-skill-testrunner +index 9699a4d138f..282f5ca65b0 100755 +--- a/bin/mycroft-skill-testrunner ++++ b/bin/mycroft-skill-testrunner +@@ -22,7 +22,7 @@ source "$DIR/../venv-activate.sh" -q + + # Invoke the individual skill tester + if [ "$#" -eq 0 ] ; then +- python -m test.integrationtests.skills.runner . ++ python3 -m test.integrationtests.skills.runner . + else +- python -m test.integrationtests.skills.runner $@ ++ python3 -m test.integrationtests.skills.runner $@ + fi +\ No newline at end of file +diff --git a/bin/mycroft-speak b/bin/mycroft-speak +index d80f0e75b13..9448ea3400f 100755 +--- a/bin/mycroft-speak ++++ b/bin/mycroft-speak +@@ -24,4 +24,4 @@ source "$DIR/../venv-activate.sh" -q + + # Send a message to be spoken + data="$@" +-output=$(python -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}") ++output=$(python3 -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}") +diff --git a/dev_setup.sh b/dev_setup.sh +index be4a19de0c3..2d9e17ddfd6 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -48,7 +48,7 @@ param='' + + for var in "$@" ; do + # Check if parameter should be read +- if [[ $param == 'python' ]] ; then ++ if [[ $param == 'python3' ]] ; then + opt_python=$var + param="" + continue +@@ -75,7 +75,7 @@ for var in "$@" ; do + opt_skipmimicbuild=true + fi + if [[ $var == '-p' || $var == '--python' ]] ; then +- param='python' ++ param='python3' + fi + done + +@@ -349,7 +349,7 @@ else + fi + fi + +-PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") ++PYTHON=$(python3 -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") + + SYSMEM=$(free | awk '/^Mem:/ { print $2 }') + MAXCORES=$(($SYSMEM / 512000)) +diff --git a/scripts/install-pocketsphinx.sh b/scripts/install-pocketsphinx.sh +index 44d329b7985..d45f5c22747 100755 +--- a/scripts/install-pocketsphinx.sh ++++ b/scripts/install-pocketsphinx.sh +@@ -47,7 +47,7 @@ function install_pocketsphinx() { + + # build and install pocketsphinx python bindings + cd ${TOP}/pocketsphinx-python +- python setup.py install ++ python3 setup.py install + } + + if [ "$1" = "-q" ] ; then +-- +2.23.0 + |