p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "experimenting to obtain the correct easy_install.pth file" 

This reverts commit aa0c0ec99370f6ffcd19e9c5f3c9cf1a7cf65a76.
This commit is contained in:
Lukas Bulwahn 2012-12-12 13:08:45 +01:00
parent 5c0caae4c1
commit 77c787ff17
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/classes/distutils.bbclass
View File

@ -58,12 +58,8 @@ distutils_do_install() {
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done done
fi fi
if test -e ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth; then rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
echo "easy-install.pth exists"
cat ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
fi
# rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
# #
# FIXME: Bandaid against wrong datadir computation # FIXME: Bandaid against wrong datadir computation

2
meta/recipes-core/images/core-image-bmw.bb
View File

@ -19,4 +19,4 @@ augment_hosts_setting_file () {
# create a custom hosts file # create a custom hosts file
ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; augment_hosts_setting_file ; " ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; augment_hosts_setting_file ; "
IMAGE_INSTALL += "boost boost-dev packagegroup-core-ssh-openssh dhcp-client file ldd python-modules python-rospkg python-rosinstall git cmake python-empy python-pyyaml python-nose log4cxx log4cxx-dev libbz2-dev python-setuptools" IMAGE_INSTALL += "boost boost-dev packagegroup-core-ssh-openssh dhcp-client file ldd python-modules python-setuptools python-rospkg python-rosinstall git cmake python-empy python-pyyaml python-nose log4cxx log4cxx-dev libbz2-dev"

1
meta/recipes-devtools/python/python-rospkg_1.0.15.bb
View File

@ -3,7 +3,6 @@ SECTION = "devel/python"
LICENSE = "BSD" LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://PKG-INFO;md5=083869c8da6fdf8c3a5bbd7d1bf93cac" LIC_FILES_CHKSUM = "file://PKG-INFO;md5=083869c8da6fdf8c3a5bbd7d1bf93cac"
SRCNAME = "rospkg" SRCNAME = "rospkg"
DEPENDS = "python-setuptools"
SRC_URI = "http://pypi.python.org/packages/source/r/rospkg/rospkg-1.0.15.tar.gz" SRC_URI = "http://pypi.python.org/packages/source/r/rospkg/rospkg-1.0.15.tar.gz"
SRC_URI[md5sum] = "3c9b1b8d1e90950944b3f10bad16ecff" SRC_URI[md5sum] = "3c9b1b8d1e90950944b3f10bad16ecff"