diff options
| author | Ross Burton <ross.burton@arm.com> | 2022-03-11 17:00:25 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-03-11 11:20:55 -0800 |
| commit | 168a39d2bf69d547df363443014904a2293eb815 (patch) | |
| tree | d1267ce9e16530b8f5d7b117c5e7f5bc66e8721f /meta-oe | |
| parent | 1dda315deacc30018385ce2822c622d88682e92e (diff) | |
| download | meta-openembedded-168a39d2bf69d547df363443014904a2293eb815.tar.gz | |
meta-*: remove obsolete PYPA_WHEEL and PIP_INSTALL_PACKAGE assignments
These variables are no longer used by pip_install_wheel, so remove them
from all recipes that set them.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-devtools/guider/guider_3.9.8.bb | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb index c519fa02a3..30d17c84b3 100644 --- a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb +++ b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb | |||
| @@ -14,7 +14,6 @@ SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3" | |||
| 14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
| 15 | 15 | ||
| 16 | inherit setuptools3 | 16 | inherit setuptools3 |
| 17 | PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-3.9.8-*.whl" | ||
| 18 | 17 | ||
| 19 | RDEPENDS:${PN} = "python3 python3-core \ | 18 | RDEPENDS:${PN} = "python3 python3-core \ |
| 20 | python3-ctypes python3-shell python3-json" | 19 | python3-ctypes python3-shell python3-json" |
diff --git a/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb b/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb index e17e773cb4..ec1539b442 100644 --- a/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb +++ b/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb | |||
| @@ -10,8 +10,6 @@ SRCREV = "6145b6484d220685edfd922d364afbf065127efe" | |||
| 10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
| 11 | 11 | ||
| 12 | inherit setuptools3 | 12 | inherit setuptools3 |
| 13 | PIP_INSTALL_PACKAGE = "python_apt" | ||
| 14 | PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.0.0-*.whl" | ||
| 15 | 13 | ||
| 16 | DEPENDS += "apt" | 14 | DEPENDS += "apt" |
| 17 | RDEPENDS:${PN} += "apt python3-core" | 15 | RDEPENDS:${PN} += "apt python3-core" |
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb index d8cb24cab0..ecbfad394d 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb | |||
| @@ -26,9 +26,6 @@ DEPENDS = "libaio util-linux" | |||
| 26 | inherit setuptools3 useradd | 26 | inherit setuptools3 useradd |
| 27 | 27 | ||
| 28 | SETUPTOOLS_SETUP_PATH = "${S}/python" | 28 | SETUPTOOLS_SETUP_PATH = "${S}/python" |
| 29 | PIP_INSTALL_DIST_PATH = "${B}/python/dist" | ||
| 30 | PIP_INSTALL_PACKAGE = "sanlock_python" | ||
| 31 | PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-3.8.4-*.whl" | ||
| 32 | 29 | ||
| 33 | do_compile:prepend () { | 30 | do_compile:prepend () { |
| 34 | oe_runmake -C ${S}/wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" | 31 | oe_runmake -C ${S}/wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" |
