diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-14 17:19:28 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-23 21:38:24 +0300 |
commit | 178f7e3b973a1af0717dc093b0e7656779585eae (patch) | |
tree | 7fd75fb8450d268105c6b810fa9aa01b2c2f99d5 /meta-phosphor | |
parent | 358dfea6a0767d615d9f6f00ea3a78e6ba86d850 (diff) | |
download | openbmc-178f7e3b973a1af0717dc093b0e7656779585eae.tar.xz |
dunfell: remove python2/python3 workarounds
Now that OpenBMC is on python3, these are no longer needed and no longer
work in a python3-only world
(From meta-phosphor rev: ddb3c792f25648dfb83582eee115de2793382d4f)
Change-Id: I1eca2a701686afc1f6a4f16babaeb9811c11b4f3
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-phosphor')
-rw-r--r-- | meta-phosphor/recipes-devtools/python/python-mako_%.bbappend | 12 | ||||
-rw-r--r-- | meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend | 13 |
2 files changed, 0 insertions, 25 deletions
diff --git a/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend b/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend deleted file mode 100644 index 020bdd6ab..000000000 --- a/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# python-mako installs /usr/bin/mako-render for both python2 and python3, -# which causes a bitbake QA failure. Remove it from installation for the -# native target to avoid the collision. -# -# We don't currently use this as a target package and if we did, we shouldn't -# install both python2 and python3 variants. -# -# Once we are done with python2, we can delete this. - -do_install_append_class-native() { - rm ${D}${bindir}/mako-render -} diff --git a/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend b/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend deleted file mode 100644 index e8dd736ef..000000000 --- a/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -# python-pytest installs /usr/bin/pytest for both python2 and python3, -# which causes a bitbake QA failure. Remove it from installation for the -# native target to avoid the collision. -# -# We don't currently use this as a target package and if we did, we shouldn't -# install both python2 and python3 variants. -# -# Once we are done with python2, we can delete this. - -do_install_append_class-native() { - rm ${D}${bindir}/py.test - rm ${D}${bindir}/pytest -} |