Skip to content

Commit

Permalink
catkin: use upstream branch reference_extra_files_relatively
Browse files Browse the repository at this point in the history
The local version was replaced by a solution from a catkin
maintainer.

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
  • Loading branch information
herbrechtsmeier committed Mar 14, 2013
1 parent b578097 commit 974fc95
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 139 deletions.

This file was deleted.

This file was deleted.

3 changes: 1 addition & 2 deletions recipes-ros/catkin/catkin_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
DEPENDS = "cmake python-empy python-catkin-pkg"

SRC_URI = "git://github.com/ros/${BPN}.git \
file://0001-pkgConfig.cmake-use-filenames-in-PKG_CFG_EXTRAS.patch \
file://0002-catkin_package.cmake-use-PROJECT_NAME-_EXTRAS_DIR-fo.patch \
"

SRCREV = "cbe6a0ce3ac6d13914d3b4b010148f72e7984149"
SRCREV = "e54faacad535791a2aed2f37d1a7ff18249c61cd"
PV = "0.5.63+gitr${SRCPV}"

S = "${WORKDIR}/git"
Expand Down

1 comment on commit 974fc95

@bulwahn
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could convince Dirk Thomas to address our issue in catkin (cf. ros/catkin@efb9671).
The discussion before-hand with Dirk can be found at ros/catkin#369.

Please sign in to comment.