From 30ea610d0405e687877e946faa71e20d19baa57e Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 3 Jul 2018 17:55:22 -0700 Subject: python-setuptools.inc: avoid using += with an over-ride An over-ride replaces the original value regardless of whether or not it's set up with +=. As replacing the original value seems to be the intention here, drop the += to make it more explicit. Also some minor recipe formatting tweaks. (From OE-Core rev: bda531e65bb6cc9f654c333e2f71283eccd17f27) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-setuptools.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index 25be446cb3..b121b2ab3c 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -2,7 +2,6 @@ SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" HOMEPAGE = "https://pypi.python.org/pypi/setuptools" SECTION = "devel/python" LICENSE = "MIT" - LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158" PYPI_PACKAGE_EXT = "zip" @@ -13,16 +12,12 @@ SRC_URI[md5sum] = "260630ae1a64bafa39dcc53404d63829" SRC_URI[sha256sum] = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f" DEPENDS += "${PYTHON_PN}" -DEPENDS_class-native += "${PYTHON_PN}-native" -DEPENDS_class-nativesdk += "nativesdk-${PYTHON_PN}" +DEPENDS_class-native = "${PYTHON_PN}-native" +DEPENDS_class-nativesdk = "nativesdk-${PYTHON_PN}" DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR} \ --script-dir=${bindir}" -RDEPENDS_${PN}_class-native = "\ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-compression \ -" RDEPENDS_${PN} = "\ ${PYTHON_PN}-compile \ ${PYTHON_PN}-compression \ @@ -41,6 +36,11 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-xml \ " +RDEPENDS_${PN}_class-native = "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-distutils \ +" + do_install_prepend() { install -d ${D}${PYTHON_SITEPACKAGES_DIR} } -- cgit v1.2.3-54-g00ecf