From 29f9f9d468b2fdb84f7a758ee34f2844c21d0b22 Mon Sep 17 00:00:00 2001 From: Johannes Schrimpf Date: Tue, 16 May 2017 14:27:23 +0200 Subject: [PATCH 1/5] rosbridge-library: Replace build time dependency from python-bson to python-pymongo, Added runtime dependency bson is provided by python-pymongo in meta-python Not all runtime dependencies are automatically added, which leads to dependency problems in the package management. Added two packages to RDEPENDS. Signed-off-by: Martin Jansa --- recipes-ros/rosbridge-suite/rosbridge-library_0.7.16.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-ros/rosbridge-suite/rosbridge-library_0.7.16.bb b/recipes-ros/rosbridge-suite/rosbridge-library_0.7.16.bb index c2a859a..e85cb4c 100644 --- a/recipes-ros/rosbridge-suite/rosbridge-library_0.7.16.bb +++ b/recipes-ros/rosbridge-suite/rosbridge-library_0.7.16.bb @@ -3,6 +3,8 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=68b329da9893e34099c7d8ad5cb9c940" -DEPENDS = "message-generation std-msgs geometry-msgs rospy python-six python-bson" +DEPENDS = "message-generation std-msgs geometry-msgs rospy python-six python-pymongo" + +RDEPENDS_${PN} = "python-pymongo python-imaging" require rosbridge-suite.inc From 615016f462f61aa149c87fdcdabc8615fb4aacc7 Mon Sep 17 00:00:00 2001 From: Johannes Schrimpf Date: Tue, 16 May 2017 14:30:51 +0200 Subject: [PATCH 2/5] python-bson: Remove recipe bson is provided by python-pymongo in meta-python --- recipes-devtools/python/python-bson_0.4.3.bb | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 recipes-devtools/python/python-bson_0.4.3.bb diff --git a/recipes-devtools/python/python-bson_0.4.3.bb b/recipes-devtools/python/python-bson_0.4.3.bb deleted file mode 100644 index a528118..0000000 --- a/recipes-devtools/python/python-bson_0.4.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Independent BSON codec for Python that doesn't depend on MongoDB" -SECTION = "devel" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=db7a1eab1d8b38da1e06abbf08d2498d" - -SRC_URI = "https://github.com/py-bson/bson/archive/${PV}.tar.gz;downloadfilename=py-bson_${PV}.tar.gz" -SRC_URI[md5sum] = "989acb13782d20c71b8bae03d600a6da" -SRC_URI[sha256sum] = "dcdcf3e8a01ac13375faf791e1ed47ee178c0ec19332252ba539a3a131ca7739" - -S = "${WORKDIR}/bson-${PV}" - -inherit setuptools From ce8d938ed73b3a733f37c3637ace3a082fa5a61c Mon Sep 17 00:00:00 2001 From: Johannes Schrimpf Date: Tue, 16 May 2017 16:21:51 +0200 Subject: [PATCH 3/5] rosbridge-server: Added runtime dependency Signed-off-by: Martin Jansa --- recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb b/recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb index b40f9e4..cece8b3 100644 --- a/recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb +++ b/recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb @@ -5,4 +5,6 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=9add477069b61 DEPENDS = "rosbridge-library rosapi rospy rosauth" +RDEPENDS_${PN} = "rosauth rosbridge-library python-twisted" + require rosbridge-suite.inc From 55c3d4f348a92a0b2d877672413890f701bb34ca Mon Sep 17 00:00:00 2001 From: Johannes Schrimpf Date: Thu, 18 May 2017 11:33:34 +0200 Subject: [PATCH 4/5] rosapi: Added runtime dependency src/rosapi/params.py depends on python-json --- recipes-ros/rosbridge-suite/rosapi_0.7.16.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-ros/rosbridge-suite/rosapi_0.7.16.bb b/recipes-ros/rosbridge-suite/rosapi_0.7.16.bb index 54710ec..384aee0 100644 --- a/recipes-ros/rosbridge-suite/rosapi_0.7.16.bb +++ b/recipes-ros/rosbridge-suite/rosapi_0.7.16.bb @@ -5,4 +5,6 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de DEPENDS = "message-generation rospy rosservice" +RDEPENDS_${PN} = "python-json" + require rosbridge-suite.inc From b86bbc0cc05b223bbf9b4e9908dc5785d3b00a5e Mon Sep 17 00:00:00 2001 From: Johannes Schrimpf Date: Thu, 18 May 2017 11:35:01 +0200 Subject: [PATCH 5/5] rosbridge-server: Added runtime dependencies src/tornado/escape.py depends on python-html and python-json --- recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb b/recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb index cece8b3..65e9d80 100644 --- a/recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb +++ b/recipes-ros/rosbridge-suite/rosbridge-server_0.7.16.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=9add477069b61 DEPENDS = "rosbridge-library rosapi rospy rosauth" -RDEPENDS_${PN} = "rosauth rosbridge-library python-twisted" +RDEPENDS_${PN} = "rosauth rosbridge-library python-twisted python-html python-json" require rosbridge-suite.inc