From 361e04697c5c189285057309361962a4ce6552e7 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Tue, 5 Mar 2019 15:49:58 -0800
Subject: [PATCH 1/3] layer.conf: Update LAYERSERIES_COMPAT to 'thud'

---
 conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 7136473df15..3a593a5a928 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,6 +10,6 @@ BBFILE_PRIORITY_ros-layer = "7"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
-LAYERSERIES_COMPAT_ros-layer = "sumo"
+LAYERSERIES_COMPAT_ros-layer = "thud"
 
 ROSDISTRO := "melodic"

From f0d92f64a810a03a0364c3d47662e05835a63ed7 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Tue, 5 Mar 2019 16:22:45 -0800
Subject: [PATCH 2/3] python-pbr: Remove package at v3.1.1 (meta-openemedded
 has v4.2.0)

---
 recipes-devtools/python/python-pbr.inc       | 16 ----------------
 recipes-devtools/python/python-pbr_3.1.1.bb  |  3 ---
 recipes-devtools/python/python3-pbr_3.1.1.bb |  3 ---
 3 files changed, 22 deletions(-)
 delete mode 100644 recipes-devtools/python/python-pbr.inc
 delete mode 100644 recipes-devtools/python/python-pbr_3.1.1.bb
 delete mode 100644 recipes-devtools/python/python3-pbr_3.1.1.bb

diff --git a/recipes-devtools/python/python-pbr.inc b/recipes-devtools/python/python-pbr.inc
deleted file mode 100644
index 00305514e69..00000000000
--- a/recipes-devtools/python/python-pbr.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Python Build Reasonableness: PBR is a library that injects some useful and sensible default behaviors into your setuptools run"
-HOMEPAGE = "https://pypi.python.org/pypi/pbr"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRC_URI[md5sum] = "4e82c2e07af544c56a5b71c801525b00"
-SRC_URI[sha256sum] = "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1"
-
-inherit pypi
-
-RDEPENDS_${PN}_class-target += " \
-        ${PYTHON_PN}-pip \
-        "
-
-BBCLASSEXTEND = "native"
diff --git a/recipes-devtools/python/python-pbr_3.1.1.bb b/recipes-devtools/python/python-pbr_3.1.1.bb
deleted file mode 100644
index 9752a6282a2..00000000000
--- a/recipes-devtools/python/python-pbr_3.1.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require python-pbr.inc
-
-inherit setuptools
diff --git a/recipes-devtools/python/python3-pbr_3.1.1.bb b/recipes-devtools/python/python3-pbr_3.1.1.bb
deleted file mode 100644
index 9606c423d08..00000000000
--- a/recipes-devtools/python/python3-pbr_3.1.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require python-pbr.inc
-
-inherit setuptools3

From 9dbda49d98ede07b5f03753ca2cc2abebcefe468 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Wed, 6 Mar 2019 14:40:10 -0800
Subject: [PATCH 3/3] ros-comm: Fix error running rosbag

Error was:

File /opt/ros/melodic/lib/python2.7/site-packages/rosbag/bag.py, line 53, in <module>
  from Crypto import Random
ImportError: No module named Crypto
---
 recipes-ros/ros-comm/rosbag_1.14.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-ros/ros-comm/rosbag_1.14.2.bb b/recipes-ros/ros-comm/rosbag_1.14.2.bb
index 8322a47c2ad..08f8e726a2f 100644
--- a/recipes-ros/ros-comm/rosbag_1.14.2.bb
+++ b/recipes-ros/ros-comm/rosbag_1.14.2.bb
@@ -12,4 +12,4 @@ require ros-comm.inc
 ROS_PKG_SUBDIR = "tools"
 
 RDEPENDS_${PN} = "python-compression python-threading python-pyyaml python-io \
-    genmsg genpy roslib rospy python-gnupg"
+    genmsg genpy roslib rospy python-gnupg python-pycrypto"