Use python-distribute-native in packagegroup-toolset-native
Also fixes warnings like
WARNING: The recipe python-setuptools is trying to install files into a
shared area when those files already exist. Those files and their
manifest location are:
/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/setuptools.pth
Matched in manifest-qemux86-64-python-distribute
/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/site.pyc
Matched in manifest-qemux86-64-python-distribute
/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/site.py
Matched in manifest-qemux86-64-python-distribute
Signed-off-by: Khem Raj <raj.k...@gmail.com>
Conflicts:
meta/recipes-devtools/python/python-setuptools_1.4.bb
---
.../python/python-distribute_0.6.32.bb | 3 ++
.../python/python-setuptools_1.4.bb | 40 --------------------
.../python/python3-distribute_0.6.32.bb | 2 +
.../packagegroups/packagegroup-toolset-native.bb | 2 +-
4 files changed, 6 insertions(+), 41 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python-setuptools_1.4.bb
diff --git a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
index 86ac871..21af29d 100644
--- a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
+++ b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
@@ -41,6 +41,9 @@ RDEPENDS_${PN} = "\
python-compression \
"
+PROVIDES += "python-setuptools"
+
+
SRC_URI[md5sum] = "acb7a2da81e3612bfb1608abe4f0e568"
SRC_URI[sha256sum] =
"8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df"
diff --git a/meta/recipes-devtools/python/python-setuptools_1.4.bb
b/meta/recipes-devtools/python/python-setuptools_1.4.bb
deleted file mode 100644
index 4138d28..0000000
--- a/meta/recipes-devtools/python/python-setuptools_1.4.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Downloads, builds, installs, upgrades, and uninstalls Python
packages"
-HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools";
-SECTION = "devel/python"
-LICENSE = "PSF"
-LIC_FILES_CHKSUM =
"file://setup.py;beginline=107;endline=107;md5=8a314270dd7a8dbca741775415f1716e"
-
-SRCNAME = "setuptools"
-DEPENDS += "python"
-DEPENDS_class-native += "python-native"
-
-SRC_URI = "\
-
http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
-"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-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 \
-"
-
-RDEPENDS_${PN}_class-native = "\
- python-distutils \
- python-compression \
-"
-
-SRC_URI[md5sum] = "5710464bc5a61d75f5087f15ce63cfe0"
-SRC_URI[sha256sum] =
"75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
b/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
index 31fc56d..79e3cfc 100644
--- a/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
+++ b/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
@@ -41,6 +41,8 @@ RDEPENDS_${PN} = "\
python3-compression \
"
+PROVIDES += "python3-setuptools"
+
SRC_URI[md5sum] = "acb7a2da81e3612bfb1608abe4f0e568"
SRC_URI[sha256sum] =
"8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df"
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb
b/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb
index 07d4f1d..f08cf1d 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb
@@ -185,7 +185,7 @@ DEPENDS = "\
python-pygobject-native \
python-pyrex-native \
python-scons-native \
- python-setuptools-native \
+ python-distribute-native \
python-smartpm-native \
qemu-helper-native \
qemu-native \
--
1.7.10.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
