From 52d7f363d64405fa7dc0de815887158a7e975a13 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn <lukas.bulwahn@bmw-carit.de> Date: Thu, 6 Dec 2012 09:18:25 +0100 Subject: [PATCH] Revert "trying if rospkg-dev can replace native installation of rospkg in the installation script" This reverts commit 1fb1afe23d78b45711f8435d64eadf1597847c8c. rospkg-dev does not solve the issue. It is still unclear which files are missing or which pathes are set wrong. --- install.sh | 6 +++--- meta/recipes-core/images/core-image-bmw.bb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 33f12ef..8723ac6 100644 --- a/install.sh +++ b/install.sh @@ -7,9 +7,9 @@ scp lukas@192.168.7.1:/home/lukas/ros_server/fuerte-ros-base.rosinstall . mkdir ~/ros rosinstall --catkin ~/ros fuerte-ros-base.rosinstall # install rospkg manually -## git clone ssh://lukas@192.168.7.1//home/lukas/ros_server/rospkg -## cd ~/rospkg -## python setup.py install +git clone ssh://lukas@192.168.7.1//home/lukas/ros_server/rospkg +cd ~/rospkg +python setup.py install # cmake invocation cd ~/ros mkdir build diff --git a/meta/recipes-core/images/core-image-bmw.bb b/meta/recipes-core/images/core-image-bmw.bb index a0fd4c8..0fc2e3f 100644 --- a/meta/recipes-core/images/core-image-bmw.bb +++ b/meta/recipes-core/images/core-image-bmw.bb @@ -13,4 +13,4 @@ IMAGE_ROOTFS_EXTRA_SPACE = "524288" # remove not needed ipkg informations ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " -IMAGE_INSTALL += "boost boost-dev packagegroup-core-ssh-openssh dhcp-client file ldd python-modules python-setuptools python-rospkg python-rospkg-dev python-rosinstall git cmake python-empy python-pyyaml python-nose log4cxx log4cxx-dev libbz2-dev" +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" -- GitLab