From 2712004be96948cf21f470f4c2d4385eb8d0c6bf Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 12:39:38 +0200
Subject: [PATCH] roscpp-core: collected common definition in .inc file

---
 recipes-ros/roscpp-core/cpp-common_0.3.16.bb           | 2 --
 recipes-ros/roscpp-core/roscpp-core.inc                | 2 +-
 recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb | 2 --
 recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb        | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/recipes-ros/roscpp-core/cpp-common_0.3.16.bb b/recipes-ros/roscpp-core/cpp-common_0.3.16.bb
index b8764bc..dfa645c 100644
--- a/recipes-ros/roscpp-core/cpp-common_0.3.16.bb
+++ b/recipes-ros/roscpp-core/cpp-common_0.3.16.bb
@@ -4,5 +4,3 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 require roscpp-core.inc
-
-S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
diff --git a/recipes-ros/roscpp-core/roscpp-core.inc b/recipes-ros/roscpp-core/roscpp-core.inc
index 71a19cf..0aa7f98 100644
--- a/recipes-ros/roscpp-core/roscpp-core.inc
+++ b/recipes-ros/roscpp-core/roscpp-core.inc
@@ -2,6 +2,6 @@ SRC_URI = "https://github.com/ros/roscpp_core/archive/${PV}.tar.gz;downloadfilen
 SRC_URI[md5sum] = "d02c9d1270d1f68487944fb0e76adcb7"
 SRC_URI[sha256sum] = "805b08c5b7044dd93bfaf4a0dd5807b391d1d86db9f6d143f9946b5528500eda"
 
-S = "${WORKDIR}/roscpp_core-${PV}/${BPN}"
+S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
 
 inherit catkin
diff --git a/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb b/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb
index 03a2833..07bd9ef 100644
--- a/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb
+++ b/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb
@@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9de
 DEPENDS = "cpp-common roscpp-traits rostime"
 
 require roscpp-core.inc
-
-S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
diff --git a/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb b/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb
index f3c21f2..9039bfd 100644
--- a/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb
+++ b/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb
@@ -4,5 +4,3 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 require roscpp-core.inc
-
-S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"