[oe] [meta-oe/meta-python][PATCH] clean up var-DISTUTILS_INSTALL_ARGS

Hongxu Jia hongxu.jia at windriver.com
Thu Jul 26 16:04:55 UTC 2018


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 at windriver.com>
---
 meta-oe/recipes-devtools/python/python-distutils-extra.bb       | 2 --
 meta-oe/recipes-devtools/python/python3-distutils-extra.bb      | 2 --
 meta-python/recipes-connectivity/gateone/gateone_git.bb         | 4 +---
 meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb | 4 ++--
 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 56dd33d..eb84f74 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 af242b8..5836b09 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 4577873..5d2ca00 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 0ca58c7..eb42fe9 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}/*"
 
-- 
2.7.4




More information about the Openembedded-devel mailing list