From 032fcccd75582223cc297a4a660bd266577a5e94 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 09:47:34 +0200 Subject: [PATCH 01/11] yaml-cpp: updating to 0.5.3 --- .../yaml-cpp/{yaml-cpp_0.5.2.bb => yaml-cpp_0.5.3.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-devtools/yaml-cpp/{yaml-cpp_0.5.2.bb => yaml-cpp_0.5.3.bb} (63%) diff --git a/recipes-devtools/yaml-cpp/yaml-cpp_0.5.2.bb b/recipes-devtools/yaml-cpp/yaml-cpp_0.5.3.bb similarity index 63% rename from recipes-devtools/yaml-cpp/yaml-cpp_0.5.2.bb rename to recipes-devtools/yaml-cpp/yaml-cpp_0.5.3.bb index e963846..0a05595 100644 --- a/recipes-devtools/yaml-cpp/yaml-cpp_0.5.2.bb +++ b/recipes-devtools/yaml-cpp/yaml-cpp_0.5.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1. HOMEPAGE = "https://github.com/jbeder/yaml-cpp/" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://license.txt;md5=7c6a629da965ebdfba9f6fdb76ab8ab4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" DEPENDS = "boost" @@ -11,8 +11,8 @@ PR = "r0" S = "${WORKDIR}/yaml-cpp-release-${PV}" SRC_URI = "https://github.com/jbeder/yaml-cpp/archive/release-${PV}.tar.gz" -SRC_URI[md5sum] = "2728af8a15e2b2c407730c45b99b274b" -SRC_URI[sha256sum] = "6fb92f6f5925e0af918ffbb90acf19b7b88706ebcd40fc186b7caa76609b6350" +SRC_URI[md5sum] = "64200ca0bf5e0af065804d8d3e8f6d42" +SRC_URI[sha256sum] = "ac50a27a201d16dc69a881b80ad39a7be66c4d755eda1f76c3a68781b922af8f" EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" From ba0fd812c78819c90e37c4e4d870100802e55036 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 09:51:09 +0200 Subject: [PATCH 02/11] python-bson: updating to 0.4.3 and improving license info --- .../python/{python-bson_0.4.1.bb => python-bson_0.4.3.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename recipes-devtools/python/{python-bson_0.4.1.bb => python-bson_0.4.3.bb} (59%) diff --git a/recipes-devtools/python/python-bson_0.4.1.bb b/recipes-devtools/python/python-bson_0.4.3.bb similarity index 59% rename from recipes-devtools/python/python-bson_0.4.1.bb rename to recipes-devtools/python/python-bson_0.4.3.bb index 8c11780..a528118 100644 --- a/recipes-devtools/python/python-bson_0.4.1.bb +++ b/recipes-devtools/python/python-bson_0.4.3.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Independent BSON codec for Python that doesn't depend on MongoDB" SECTION = "devel" -LICENSE = "MIT" +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] = "9319364259c7b4eb77a218f7948f9fe8" -SRC_URI[sha256sum] = "b84569685426374242dfc7d4fa08c9694951e85203d085c256866cf87dcb0b7e" +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}" From 81d10605398d563333443338727781c40e0551a7 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 09:54:48 +0200 Subject: [PATCH 03/11] python-netifaces: updating to 0.10.5 --- ...ython-netifaces_0.10.4.bb => python-netifaces_0.10.5.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-devtools/python/{python-netifaces_0.10.4.bb => python-netifaces_0.10.5.bb} (50%) diff --git a/recipes-devtools/python/python-netifaces_0.10.4.bb b/recipes-devtools/python/python-netifaces_0.10.5.bb similarity index 50% rename from recipes-devtools/python/python-netifaces_0.10.4.bb rename to recipes-devtools/python/python-netifaces_0.10.5.bb index 669b9a2..82a63ac 100644 --- a/recipes-devtools/python/python-netifaces_0.10.4.bb +++ b/recipes-devtools/python/python-netifaces_0.10.5.bb @@ -4,9 +4,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=a53cbc7cb75660694e138ba973c148df" SRCNAME = "netifaces" -SRC_URI = "https://pypi.python.org/packages/source/n/netifaces/${SRCNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "36da76e2cfadd24cc7510c2c0012eb1e" -SRC_URI[sha256sum] = "9656a169cb83da34d732b0eb72b39373d48774aee009a3d1272b7ea2ce109cde" +SRC_URI = "https://pypi.python.org/packages/a7/4c/8e0771a59fd6e55aac993a7cc1b6a0db993f299514c464ae6a1ecf83b31d/netifaces-0.10.5.tar.gz" +SRC_URI[md5sum] = "5b4d1f1310ed279e6df27ef3a9b71519" +SRC_URI[sha256sum] = "59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b" S = "${WORKDIR}/${SRCNAME}-${PV}" From 3f800c95270aa7c1ac1a97cb9a05d3f99aab1283 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 10:19:33 +0200 Subject: [PATCH 04/11] removing python-pytz dependency and recipe The recent versions of the rosbridge_library package does not depend on python-pytz anymore. So, this commit removes the dependency in the recipe file and removes the now unneeded python-pytz recipe. Signed-off-by: Lukas Bulwahn --- recipes-devtools/python/python-pytz_2015.6.bb | 12 ------------ .../rosbridge-suite/rosbridge-library_0.7.16.bb | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 recipes-devtools/python/python-pytz_2015.6.bb diff --git a/recipes-devtools/python/python-pytz_2015.6.bb b/recipes-devtools/python/python-pytz_2015.6.bb deleted file mode 100644 index a50b6c2..0000000 --- a/recipes-devtools/python/python-pytz_2015.6.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python Timezone Library" -SECTION = "devel" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=22b38951eb857cf285a4560a914b7cd6" - -SRC_URI = "https://pypi.python.org/packages/source/p/pytz/pytz-${PV}.tar.gz;downloadfilename=pytz-{PV}.tar.gz" -SRC_URI[md5sum] = "ff047a16dafeaa895bedef80a74c3728" -SRC_URI[sha256sum] = "c598a6b6850dbcc00843651878e8282dac77c95e19d84847b6918eeb3ed8f0c2" - -S = "${WORKDIR}/pytz-${PV}" - -inherit setuptools 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 66b4238..c2a859a 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,6 @@ 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 python-pytz" +DEPENDS = "message-generation std-msgs geometry-msgs rospy python-six python-bson" require rosbridge-suite.inc From 301ffdcbaff298bfe4531e4319da9e348caf9174 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 10:24:46 +0200 Subject: [PATCH 05/11] python-six: remove recipe already provided by others The Openembedded Layer Index [1] shows that python-six in version 1.10.0 is already provided in the openembedded-core layer and in the meta-python layer, so there is no need for a third copy of the python-six recipe in meta-ros. The recipe python-six is provided since commit a36869c7 in the meta-openembedded repository (commit date: 2015-04-13), and is provided since commit 9979e35f in the openembedded-core repository (commit date: 2016-07-20). In my opinion, at least the commit a36869c7 is far enough in the past, so that we can safely assume that all new meta-ros use a setup where python-six is included at least in meta-python. For users of older versions, we include a remark in the README.md to allow `git blame` to pinpoint to this commit here. [1] https://layers.openembedded.org/layerindex/branch/master/recipes/?q=python-six [2] http://cgit.openembedded.org/meta-openembedded/commit/?id=a36869c700bed940f7f0aa4b9703ae630dc84eac [3] http://cgit.openembedded.org/openembedded-core/commit/?id=9979e35ffb0dfb20d8aaffa8e2ec5e33f27fc009 Signed-off-by: Lukas.Bulwahn --- README.md | 3 +++ recipes-devtools/python/python-six_1.10.0.bb | 15 --------------- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 recipes-devtools/python/python-six_1.10.0.bb diff --git a/README.md b/README.md index 4b79e76..82cdf0a 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,9 @@ Currently, this layer is still under continuous development. recipes relying on opencv need to activate the DISTRO\_FEATURE opengl. + rosbridge-library depends on python-six, which is provided in meta-python + since a36869c700bed940f7f0aa4b9703ae630dc84eac@meta-openembedded. + ## INSTALLATION ## The repository contains a layer for ROS that builds on top of the diff --git a/recipes-devtools/python/python-six_1.10.0.bb b/recipes-devtools/python/python-six_1.10.0.bb deleted file mode 100644 index feefdf0..0000000 --- a/recipes-devtools/python/python-six_1.10.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Six is a Python 2 and 3 compatibility library. It provides \ - utility functions for smoothing over the differences between the Python \ - versions with the goal of writing Python code that is compatible on both \ - Python versions." -SECTION = "devel" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6f00d4a50713fa859858dd9abaa35b21" - -SRC_URI = "https://pypi.python.org/packages/source/s/six/six-${PV}.tar.gz;downloadfilename=six-{PV}.tar.gz" -SRC_URI[md5sum] = "34eed507548117b2ab523ab14b2f8b55" -SRC_URI[sha256sum] = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a" - -S = "${WORKDIR}/six-${PV}" - -inherit setuptools From f69ca25be8fed870a8ff0e0b64b4783086c3995d Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 10:29:31 +0200 Subject: [PATCH 06/11] python-catkin-pkg: updating to 0.2.10 --- ...python-catkin-pkg_0.2.6.bb => python-catkin-pkg_0.2.10.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-devtools/python/{python-catkin-pkg_0.2.6.bb => python-catkin-pkg_0.2.10.bb} (72%) diff --git a/recipes-devtools/python/python-catkin-pkg_0.2.6.bb b/recipes-devtools/python/python-catkin-pkg_0.2.10.bb similarity index 72% rename from recipes-devtools/python/python-catkin-pkg_0.2.6.bb rename to recipes-devtools/python/python-catkin-pkg_0.2.10.bb index fe54e25..e08b0e5 100644 --- a/recipes-devtools/python/python-catkin-pkg_0.2.6.bb +++ b/recipes-devtools/python/python-catkin-pkg_0.2.10.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665 SRCNAME = "catkin_pkg" SRC_URI = "https://pypi.python.org/packages/source/c/catkin_pkg/catkin_pkg-${PV}.tar.gz" -SRC_URI[md5sum] = "d1b82c9e3acd873e6a07e2c932f4bea4" -SRC_URI[sha256sum] = "7d3d955ec1848565ccfee18e685cf1bd677cdd03283a00d22fb271e072aa48fa" +SRC_URI[md5sum] = "da93566c65dddfa9f821e18944c5ee5e" +SRC_URI[sha256sum] = "d4d069eaeb29d6a9ee71773b20c41515b6e0feb9ea2765ebaf3e599d0ceef050" S = "${WORKDIR}/${SRCNAME}-${PV}" From 5032a5b8e0ea6018de28bb6094e10939edeb0a46 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 10:50:35 +0200 Subject: [PATCH 07/11] python-rosdep: updating to 0.11.5 --- .../{python-rosdep_0.11.0.bb => python-rosdep_0.11.5.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-devtools/python/{python-rosdep_0.11.0.bb => python-rosdep_0.11.5.bb} (65%) diff --git a/recipes-devtools/python/python-rosdep_0.11.0.bb b/recipes-devtools/python/python-rosdep_0.11.5.bb similarity index 65% rename from recipes-devtools/python/python-rosdep_0.11.0.bb rename to recipes-devtools/python/python-rosdep_0.11.5.bb index 3fa41c2..3ed088c 100644 --- a/recipes-devtools/python/python-rosdep_0.11.0.bb +++ b/recipes-devtools/python/python-rosdep_0.11.5.bb @@ -6,9 +6,9 @@ SRCNAME = "rosdep" DEPENDS = "python-nose" -SRC_URI = "http://pypi.python.org/packages/source/r/rosdep/rosdep-${PV}.tar.gz" -SRC_URI[md5sum] = "c1e3f200d9beddb5c70cc0a74ab47734" -SRC_URI[sha256sum] = "6d043e1fb58d8b366f90b63ccfaff3140416bf1a6f4014bb3bb1b85af7a77073" +SRC_URI = "http://download.ros.org/downloads/rosdep/rosdep-${PV}.tar.gz" +SRC_URI[md5sum] = "2c5669bc5cafcb1df8cd21ce14844cc4" +SRC_URI[sha256sum] = "46e072074270a1ea25411829814f4bdc1f34b358c950e9b8a7b75b4a40efd96a" S = "${WORKDIR}/${SRCNAME}-${PV}" From 6ad31b25038cf09c5ee117d84ce25988a5024c24 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 10:56:47 +0200 Subject: [PATCH 08/11] python-rosinstall: updating to 0.7.8 --- ...ython-rosinstall_0.7.4.bb => python-rosinstall_0.7.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-devtools/python/{python-rosinstall_0.7.4.bb => python-rosinstall_0.7.8.bb} (59%) diff --git a/recipes-devtools/python/python-rosinstall_0.7.4.bb b/recipes-devtools/python/python-rosinstall_0.7.8.bb similarity index 59% rename from recipes-devtools/python/python-rosinstall_0.7.4.bb rename to recipes-devtools/python/python-rosinstall_0.7.8.bb index 1d1f67d..d663a23 100644 --- a/recipes-devtools/python/python-rosinstall_0.7.4.bb +++ b/recipes-devtools/python/python-rosinstall_0.7.8.bb @@ -4,9 +4,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" SRCNAME = "rosinstall" -SRC_URI = "https://pypi.python.org/packages/source/r/rosinstall/rosinstall-${PV}.tar.gz" -SRC_URI[md5sum] = "fd49a9cc6ede3d1bf4932effdac414e9" -SRC_URI[sha256sum] = "65de7c1594e80799b2da68fc7c1d466bbec08a0cedd61437ae276e90f8cff411" +SRC_URI = "http://download.ros.org/downloads/rosinstall/rosinstall-${PV}.tar.gz" +SRC_URI[md5sum] = "b52ea80b199efdb94e35229eb427965f" +SRC_URI[sha256sum] = "2ba808bf8bac2cc3f13af9745184b9714c1426e11d09eb96468611b2ad47ed40" S = "${WORKDIR}/${SRCNAME}-${PV}" From c49242efce4a6546ec3903d4f056937875094eec Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 11:03:37 +0200 Subject: [PATCH 09/11] python-rospkg: updating to 1.0.40 --- .../{python-rospkg_1.0.38.bb => python-rospkg_1.0.40.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-devtools/python/{python-rospkg_1.0.38.bb => python-rospkg_1.0.40.bb} (58%) diff --git a/recipes-devtools/python/python-rospkg_1.0.38.bb b/recipes-devtools/python/python-rospkg_1.0.40.bb similarity index 58% rename from recipes-devtools/python/python-rospkg_1.0.38.bb rename to recipes-devtools/python/python-rospkg_1.0.40.bb index 3bececa..a446015 100644 --- a/recipes-devtools/python/python-rospkg_1.0.38.bb +++ b/recipes-devtools/python/python-rospkg_1.0.40.bb @@ -4,9 +4,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" SRCNAME = "rospkg" -SRC_URI = "http://pypi.python.org/packages/source/r/rospkg/rospkg-${PV}.tar.gz" -SRC_URI[md5sum] = "9953ac8a1e6c393ff27dcec8cb88feb5" -SRC_URI[sha256sum] = "774b478fb7b2fe49733d40c120af785af898b838ef1a0082951351e0113b8c32" +SRC_URI = "http://download.ros.org/downloads/rospkg/rospkg-${PV}.tar.gz" +SRC_URI[md5sum] = "36fa86450a397cbe531b214e088d06b7" +SRC_URI[sha256sum] = "ccd1d635319d41b79139b7336af64fc17a48a69ce0d728c1578c78f6350dbe1c" S = "${WORKDIR}/${SRCNAME}-${PV}" From 38c60d5e8e919a0dacaf5bd76b44e977ac3e5dc1 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 11:10:24 +0200 Subject: [PATCH 10/11] python-vcstools: updating to 0.1.39 --- ...{python-vcstools_0.1.36.bb => python-vcstools_0.1.39.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-devtools/python/{python-vcstools_0.1.36.bb => python-vcstools_0.1.39.bb} (59%) diff --git a/recipes-devtools/python/python-vcstools_0.1.36.bb b/recipes-devtools/python/python-vcstools_0.1.39.bb similarity index 59% rename from recipes-devtools/python/python-vcstools_0.1.36.bb rename to recipes-devtools/python/python-vcstools_0.1.39.bb index 929b9ce..40b1ce2 100644 --- a/recipes-devtools/python/python-vcstools_0.1.36.bb +++ b/recipes-devtools/python/python-vcstools_0.1.39.bb @@ -4,9 +4,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" SRCNAME = "vcstools" -SRC_URI = "https://pypi.python.org/packages/source/v/vcstools/vcstools-${PV}.tar.gz" -SRC_URI[md5sum] = "e3ef997da464cf284ca36fd60e993ed6" -SRC_URI[sha256sum] = "83b38c3f055454590333debdb6db23b3f5ed694e6a27fb506e8639bf87a4d61e" +SRC_URI = "http://download.ros.org/downloads/vcstools/vcstools-${PV}.tar.gz" +SRC_URI[md5sum] = "ae2f802460458142727d69c46315ae54" +SRC_URI[sha256sum] = "80c5bef67d9b4933b962565bd9b012d001a44b72b9157da3623ace980213427e" S = "${WORKDIR}/${SRCNAME}-${PV}" From 0d6e694e765b3da776ef036af1d8242208362a9c Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 13 Sep 2016 11:17:12 +0200 Subject: [PATCH 11/11] python-wstool: updating to 0.1.13 --- .../{python-wstool_0.1.5.bb => python-wstool_0.1.13.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-devtools/python/{python-wstool_0.1.5.bb => python-wstool_0.1.13.bb} (59%) diff --git a/recipes-devtools/python/python-wstool_0.1.5.bb b/recipes-devtools/python/python-wstool_0.1.13.bb similarity index 59% rename from recipes-devtools/python/python-wstool_0.1.5.bb rename to recipes-devtools/python/python-wstool_0.1.13.bb index 82e427a..6a0ac6c 100644 --- a/recipes-devtools/python/python-wstool_0.1.5.bb +++ b/recipes-devtools/python/python-wstool_0.1.13.bb @@ -4,9 +4,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" SRCNAME = "wstool" -SRC_URI = "http://pypi.python.org/packages/source/w/wstool/wstool-${PV}.tar.gz" -SRC_URI[md5sum] = "2b5d10fac0bb644146a8c3009e5aa14b" -SRC_URI[sha256sum] = "0c65719af85247e5fcdf07ad2ad50eac3268cf1ca7ba9c9c43037d345de88de8" +SRC_URI = "http://download.ros.org/downloads/wstool/wstool-${PV}.tar.gz" +SRC_URI[md5sum] = "7e41a0e4f92389a6b4e115c80dd5cf10" +SRC_URI[sha256sum] = "4eaed3f94bf7842a2076de6dbef9396a8dbf055a13eee313366818465a270244" S = "${WORKDIR}/${SRCNAME}-${PV}"