This commit removes the patch that has been accepted upstream
and has been included in the version 1.5.45.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
After running oe-stylize.py on all recipes in recipes-ros, this
commit improves the formatting of some recipes.
To achieve this, I executed these commands in recipes-ros:
find . -name *.bb | sed 's#\(.*\)#./oe-stylize.py \1 > \1_sanitized#' | sh
find . -name *.bb | sed 's#\(.*\)#diff -Naur \1 \1_sanitized#' | sh > diffs
Then, I manually inspected the diffs file, and improved the
recipes.
For the DESCRIPTION line in the addressed recipes, the line width
of 100 characters was chosen, as the LIC_FILES_CHKSUM line and
SRC_URI line usually are also around about 100 characters long.
Hence, choosing a shorter line width, e.g. 80 characters, would
have only created more line breaks, but not reduced the need to
use a file viewer with which 100 characters line width can be
displayed. For the github file and diff viewer and most editors
on reasonably-sized screens, 100 character line width is no
problem.
Resolves:
File "/usr/lib/python2.7/site-packages/dynamic_reconfigure/server.py", line 45, in <module>
import rosservice
ImportError: No module named rosservice
The update to version 1.5.34 includes a patch [1] that removes
whitespaces from the license line in the package.xml.
Hence, the hash is now the common hash similar to all other
BSD-licensed ROS packages.
[1] ab496af75c
The dynamic-reconfigure recipe is updated to 1.5.33 to be in line with
4551e7c32d/hydro/release.yaml.
The previously applied patch has been included in 1.5.33 and is
removed from the recipe and this repository.
Before this commit, the following sequence of bitbake commands
failed because the path was set during compile time, and not at
runtime. After the patch from Dirk Thomas, the following sequence
now works.
bitbake nodelet-topic-tools -c cleansstate && \
bitbake dynamic-reconfigure && bitbake nodelet-topic-tools
To compile nodelet-topic-tools, we must provide a working
dynamic-reconfigure in the native sysroot. This requires
some adjustments to the native versions of the required
python modules.
In particular, the following tasks ran successfully for this
commit:
This command tests compiling rospack-native:
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake rospack-native
This command tests compiling roslib-native:
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake roslib-native
As nodelet-topic-tools uses rospack-native and roslib-native to
some extent (dependency: rospack-native -> roslib-native ->
dynamic-reconfigure-native -> nodelet-topic-tools), this command
tests running rospack-native and roslib-native:
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake nodelet-topic-tools
This command tests compiling rospack and roslib:
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake rospack
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake roslib
All these command run with this commit without errors, and
future commits to these files should keep them run without
errors or justify modifications with better tests.
A minor open issue related to rospack is issue #116
(cf. https://github.com/bmwcarit/meta-ros/issues/116).
This commit incorporates feedback from Stefan Herbrechtsmeier.
Lukas Bulwahn