summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-07-27 00:04:55 +0800
committerKhem Raj <raj.khem@gmail.com>2018-07-27 07:19:17 -0700
commite9455606c968ad92a48c9cc010512c28d8119e41 (patch)
treecefd46bcd48667c870bf9fc1303d3356cf31ae2d
parente9fa640dd7e5f2fa2965e4e5169e011f961947d2 (diff)
downloadmeta-openembedded-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>
-rw-r--r--meta-oe/recipes-devtools/python/python-distutils-extra.bb2
-rw-r--r--meta-oe/recipes-devtools/python/python3-distutils-extra.bb2
-rw-r--r--meta-python/recipes-connectivity/gateone/gateone_git.bb4
-rw-r--r--meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb4
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
2 2
3inherit setuptools 3inherit setuptools
4 4
5DISTUTILS_INSTALL_ARGS += "--install-lib=${libdir}/${PYTHON_DIR}/site-packages"
6
7RDEPENDS_${PN} = "\ 5RDEPENDS_${PN} = "\
8 python-distutils \ 6 python-distutils \
9" 7"
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
4 4
5S = "${WORKDIR}/python-distutils-extra-${PV}" 5S = "${WORKDIR}/python-distutils-extra-${PV}"
6 6
7DISTUTILS_INSTALL_ARGS += "--install-lib=${libdir}/${PYTHON_DIR}/site-packages"
8
9RDEPENDS_${PN} = "\ 7RDEPENDS_${PN} = "\
10 python3-setuptools \ 8 python3-setuptools \
11" 9"
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"
16 16
17inherit setuptools python-dir systemd update-rc.d 17inherit setuptools python-dir systemd update-rc.d
18 18
19DISTUTILS_INSTALL_ARGS = "--root=${D} \ 19DISTUTILS_INSTALL_ARGS += " \
20 --prefix=${prefix} \
21 --install-lib=${PYTHON_SITEPACKAGES_DIR} \
22 --install-data=${PYTHON_SITEPACKAGES_DIR} \ 20 --install-data=${PYTHON_SITEPACKAGES_DIR} \
23 --install-scripts=${bindir} \ 21 --install-scripts=${bindir} \
24 --skip_init_scripts" 22 --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 \
16 16
17inherit setuptools3 python3native 17inherit setuptools3 python3native
18 18
19DISTUTILS_INSTALL_ARGS = "--prefix=${D}/${prefix} \ 19DISTUTILS_INSTALL_ARGS += " \
20 --install-data=${D}/${datadir}/langtable" 20 --install-data=${datadir}/langtable"
21 21
22FILES_${PN} += "${datadir}/*" 22FILES_${PN} += "${datadir}/*"
23 23