diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2018-07-27 00:04:55 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-07-27 07:19:17 -0700 |
| commit | e9455606c968ad92a48c9cc010512c28d8119e41 (patch) | |
| tree | cefd46bcd48667c870bf9fc1303d3356cf31ae2d | |
| parent | e9fa640dd7e5f2fa2965e4e5169e011f961947d2 (diff) | |
| download | meta-openembedded-contrib-e9455606c968ad92a48c9cc010512c28d8119e41.tar.gz | |
clean up var-DISTUTILS_INSTALL_ARGS
Since the following commit applied in oe-core
...
21f0c5a distutils/setuptools, distutils3/setuptools3: improve reproducibility
...
It unified var-DISTUTILS_INSTALL_ARGS in distutils and setuptools,
so clean up the duplicated var-DISTUTILS_INSTALL_ARGS in each recipe.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
4 files changed, 3 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/python/python-distutils-extra.bb b/meta-oe/recipes-devtools/python/python-distutils-extra.bb index 56dd33d7ff..eb84f74365 100644 --- a/meta-oe/recipes-devtools/python/python-distutils-extra.bb +++ b/meta-oe/recipes-devtools/python/python-distutils-extra.bb @@ -2,8 +2,6 @@ require python-distutils-extra.inc inherit setuptools -DISTUTILS_INSTALL_ARGS += "--install-lib=${libdir}/${PYTHON_DIR}/site-packages" - RDEPENDS_${PN} = "\ python-distutils \ " diff --git a/meta-oe/recipes-devtools/python/python3-distutils-extra.bb b/meta-oe/recipes-devtools/python/python3-distutils-extra.bb index af242b8509..5836b090e0 100644 --- a/meta-oe/recipes-devtools/python/python3-distutils-extra.bb +++ b/meta-oe/recipes-devtools/python/python3-distutils-extra.bb @@ -4,8 +4,6 @@ inherit setuptools3 S = "${WORKDIR}/python-distutils-extra-${PV}" -DISTUTILS_INSTALL_ARGS += "--install-lib=${libdir}/${PYTHON_DIR}/site-packages" - RDEPENDS_${PN} = "\ python3-setuptools \ " diff --git a/meta-python/recipes-connectivity/gateone/gateone_git.bb b/meta-python/recipes-connectivity/gateone/gateone_git.bb index 4577873ded..5d2ca00ef5 100644 --- a/meta-python/recipes-connectivity/gateone/gateone_git.bb +++ b/meta-python/recipes-connectivity/gateone/gateone_git.bb @@ -16,9 +16,7 @@ S = "${WORKDIR}/git" inherit setuptools python-dir systemd update-rc.d -DISTUTILS_INSTALL_ARGS = "--root=${D} \ - --prefix=${prefix} \ - --install-lib=${PYTHON_SITEPACKAGES_DIR} \ +DISTUTILS_INSTALL_ARGS += " \ --install-data=${PYTHON_SITEPACKAGES_DIR} \ --install-scripts=${bindir} \ --skip_init_scripts" diff --git a/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb b/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb index 0ca58c7b73..eb42fe978c 100644 --- a/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb +++ b/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/mike-fabian/langtable.git;branch=master \ inherit setuptools3 python3native -DISTUTILS_INSTALL_ARGS = "--prefix=${D}/${prefix} \ - --install-data=${D}/${datadir}/langtable" +DISTUTILS_INSTALL_ARGS += " \ + --install-data=${datadir}/langtable" FILES_${PN} += "${datadir}/*" |