From 6baafa1d44f8e63e22d9ed49e92fb7c4d1b25ab4 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Date: Thu, 21 Jan 2016 16:46:06 +0000 Subject: python-setuptools: Unify and upgrade python-setuptools and python3-setuptools to 19.4 (From OE-Core rev: 7a42b4c01a0e1fa335ba1c679369d455235ea6ee) Signed-off-by: Alejandro Hernandez Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-setuptools.inc | 21 ++++++++ .../python/python-setuptools_19.2.bb | 55 --------------------- .../python/python-setuptools_19.4.bb | 37 ++++++++++++++ .../python/python3-setuptools_19.2.bb | 56 ---------------------- .../python/python3-setuptools_19.4.bb | 37 ++++++++++++++ 5 files changed, 95 insertions(+), 111 deletions(-) create mode 100644 meta/recipes-devtools/python/python-setuptools.inc delete mode 100644 meta/recipes-devtools/python/python-setuptools_19.2.bb create mode 100644 meta/recipes-devtools/python/python-setuptools_19.4.bb delete mode 100644 meta/recipes-devtools/python/python3-setuptools_19.2.bb create mode 100644 meta/recipes-devtools/python/python3-setuptools_19.4.bb (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc new file mode 100644 index 0000000000..0917e88ab6 --- /dev/null +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -0,0 +1,21 @@ +SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" +HOMEPAGE = "https://pypi.python.org/pypi/setuptools" +SECTION = "devel/python" +LICENSE = "PSF | ZPL-2.0" + +LIC_FILES_CHKSUM = "file://setup.py;beginline=78;endline=78;md5=8a314270dd7a8dbca741775415f1716e" + +SRCNAME = "setuptools" + +SRC_URI = "http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" + +SRC_URI[md5sum] = "c5a7d90c1e0acf8c4ec5c2bf31bc25b5" +SRC_URI[sha256sum] = "214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf" + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +do_install_prepend() { + install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages +} diff --git a/meta/recipes-devtools/python/python-setuptools_19.2.bb b/meta/recipes-devtools/python/python-setuptools_19.2.bb deleted file mode 100644 index 404d301021..0000000000 --- a/meta/recipes-devtools/python/python-setuptools_19.2.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Downloads, builds, installs, upgrades, and uninstalls Python packages" -HOMEPAGE = "https://pypi.python.org/pypi/setuptools" -SECTION = "devel/python" -LICENSE = "Python-2.0 | ZPL-2.0" -LIC_FILES_CHKSUM = "file://setup.py;beginline=78;endline=78;md5=8a314270dd7a8dbca741775415f1716e" - -SRCNAME = "setuptools" - -PROVIDES = "python-distribute" - -DEPENDS += "python" -DEPENDS_class-native += "python-native" - -inherit distutils - -SRC_URI = "https://pypi.python.org/packages/source/s/setuptools/setuptools-${PV}.tar.gz" -SRC_URI[md5sum] = "78353b1f80375ca5e088f4b4627ffe03" -SRC_URI[sha256sum] = "f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a" -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - - -DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages" - -do_install_prepend() { - install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages -} - -RDEPENDS_${PN} = "\ - python-stringold \ - python-email \ - python-shell \ - python-distutils \ - python-compression \ - python-pkgutil \ - python-plistlib \ - python-numbers \ - python-html \ - python-netserver \ - python-ctypes \ - python-subprocess \ - python-unittest \ -" - -RDEPENDS_${PN}_class-native = "\ - python-distutils \ - python-compression \ -" - -RREPLACES_${PN} = "python-distribute" -RPROVIDES_${PN} = "python-distribute" -RCONFLICTS_${PN} = "python-distribute" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python-setuptools_19.4.bb b/meta/recipes-devtools/python/python-setuptools_19.4.bb new file mode 100644 index 0000000000..86bbebf081 --- /dev/null +++ b/meta/recipes-devtools/python/python-setuptools_19.4.bb @@ -0,0 +1,37 @@ +require python-setuptools.inc + +PROVIDES = "python-distribute" + +DEPENDS += "python" +DEPENDS_class-native += "python-native" + +inherit distutils + +DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages" + +RDEPENDS_${PN} = "\ + python-stringold \ + python-email \ + python-shell \ + python-distutils \ + python-compression \ + python-pkgutil \ + python-plistlib \ + python-numbers \ + python-html \ + python-netserver \ + python-ctypes \ + python-subprocess \ + python-unittest \ +" + +RDEPENDS_${PN}_class-native = "\ + python-distutils \ + python-compression \ +" + +RREPLACES_${PN} = "python-distribute" +RPROVIDES_${PN} = "python-distribute" +RCONFLICTS_${PN} = "python-distribute" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python3-setuptools_19.2.bb b/meta/recipes-devtools/python/python3-setuptools_19.2.bb deleted file mode 100644 index bb5798229f..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools_19.2.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" -HOMEPAGE = "http://packages.python.org/setuptools" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://setup.py;beginline=78;endline=78;md5=8a314270dd7a8dbca741775415f1716e" - -SRCNAME = "setuptools" -DEPENDS += "python3" -DEPENDS_class-native += "python3-native" - -SRC_URI = " \ - http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "78353b1f80375ca5e088f4b4627ffe03" -SRC_URI[sha256sum] = "f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a" -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils3 - -DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages" - -do_install_prepend() { - install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages -} -# -# The installer puts the wrong path in the setuptools.pth file. Correct it. -# -do_install_append() { - rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth - mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install - echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth -} - -RDEPENDS_${PN} = "\ - python3-distutils \ - python3-compression \ -" -RDEPENDS_${PN}_class-target = "\ - python3-ctypes \ - python3-distutils \ - python3-email \ - python3-importlib \ - python3-numbers \ - python3-compression \ - python3-shell \ - python3-subprocess \ - python3-textutils \ - python3-pkgutil \ - python3-threading \ - python3-misc \ - python3-unittest \ - python3-xml \ -" -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/python/python3-setuptools_19.4.bb b/meta/recipes-devtools/python/python3-setuptools_19.4.bb new file mode 100644 index 0000000000..fb2931c3f2 --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools_19.4.bb @@ -0,0 +1,37 @@ +require python-setuptools.inc + +DEPENDS += "python3" +DEPENDS_class-native += "python3-native" + +inherit distutils3 + +DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages" + +# The installer puts the wrong path in the setuptools.pth file. Correct it. +do_install_append() { + rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth + mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install + echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth +} + +RDEPENDS_${PN} = "\ + python3-distutils \ + python3-compression \ +" +RDEPENDS_${PN}_class-target = "\ + python3-ctypes \ + python3-distutils \ + python3-email \ + python3-importlib \ + python3-numbers \ + python3-compression \ + python3-shell \ + python3-subprocess \ + python3-textutils \ + python3-pkgutil \ + python3-threading \ + python3-misc \ + python3-unittest \ + python3-xml \ +" +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf