Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions recipes-devtools/log4cxx/log4cxx_svn.bb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ SECTION = "libs"
DEPENDS = "apr apr-util expat gdbm"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
HOMEPAGE = "http://logging.apache.org/log4cxx/"
HOMEPAGE = "https://logging.apache.org/log4cxx/"

SRC_URI = "svn://svn.apache.org/repos/asf;module=incubator/log4cxx/trunk;protocol=http"
SRC_URI = "svn://svn.apache.org/repos/asf;module=incubator/log4cxx/trunk;protocol=https"
SRCREV = "1738416"

S = "${WORKDIR}/incubator/log4cxx/trunk"
Expand Down
12 changes: 0 additions & 12 deletions recipes-devtools/python/python-bson_0.4.1.bb

This file was deleted.

26 changes: 26 additions & 0 deletions recipes-devtools/python/python-ecdsa_0.13.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
DESCRIPTION = "ECDSA cryptographic signature library"
HOMEPAGE = "https://github.com/warner/python-ecdsa"
SECTION = "devel/python"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

SRCNAME = "ecdsa"

SRC_URI = "https://pypi.python.org/packages/source/e/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"

SRC_URI[md5sum] = "1f60eda9cb5c46722856db41a3ae6670"
SRC_URI[sha256sum] = "64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa"

S = "${WORKDIR}/${SRCNAME}-${PV}"

inherit setuptools

DEPENDS += " \
python-pip \
python-pbr \
"

# RDEPENDS_default:
RDEPENDS_${PN} += " \
python-pbr \
"
4 changes: 4 additions & 0 deletions recipes-devtools/python/python-imaging_1.1.7.bb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ PACKAGECONFIG[lcms] = ",,lcms"

inherit distutils

do_configure_prepend() {
sed -i -e s:/usr/include/tcl:${STAGING_DIR_HOST}/usr/include/tcl:g ${S}/setup.py
}

do_compile() {
export STAGING_LIBDIR=${STAGING_LIBDIR}
export STAGING_INCDIR=${STAGING_INCDIR}
Expand Down
19 changes: 19 additions & 0 deletions recipes-devtools/python/python-paramiko_1.16.0.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
DESCRIPTION = "SSH2 protocol library"
HOMEPAGE = "https://github.com/paramiko/paramiko/"
SECTION = "devel/python"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5"

PR = "r0"
SRCNAME = "paramiko"

SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"

SRC_URI[md5sum] = "7e1203f5ffeb7d2bc2bffc4feb804216"
SRC_URI[sha256sum] = "3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ecf96892"

S = "${WORKDIR}/${SRCNAME}-${PV}"

inherit setuptools

RDEPENDS_${PN} += "python-pycrypto python-ecdsa"
16 changes: 16 additions & 0 deletions recipes-devtools/python/python-pbr_1.8.0.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
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] = "bc7173f5ccec8e6125e3b68f0285eb8a"
SRC_URI[sha256sum] = "44a0ef9295bb59698f461124741a21a0f7f76d42e160d8a0a4bf1693338036fc"

inherit pypi setuptools

RDEPENDS_${PN}_class-target += " \
python-pip \
"

BBCLASSEXTEND = "native"
22 changes: 22 additions & 0 deletions recipes-devtools/python/python-pycrypto/cross-compiling.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Index: pycrypto-2.6/setup.py
===================================================================
--- pycrypto-2.6.orig/setup.py
+++ pycrypto-2.6/setup.py
@@ -271,7 +271,8 @@ class PCTBuildConfigure(Command):
if not os.path.exists("config.status"):
if os.system("chmod 0755 configure") != 0:
raise RuntimeError("chmod error")
- cmd = "sh configure" # we use "sh" here so that it'll work on mingw32 with standard python.org binaries
+ host = os.environ.get("HOST_SYS")
+ cmd = "ac_cv_func_malloc_0_nonnull=yes sh configure --host " + host # we use "sh" here so that it'll work on mingw32 with standard python.org binaries
if self.verbose < 1:
cmd += " -q"
if os.system(cmd) != 0:
@@ -370,7 +371,7 @@ kw = {'name':"pycrypto",
'ext_modules': plat_ext + [
# _fastmath (uses GNU mp library)
Extension("Crypto.PublicKey._fastmath",
- include_dirs=['src/','/usr/include/'],
+ include_dirs=['src/'],
libraries=['gmp'],
sources=["src/_fastmath.c"]),
35 changes: 35 additions & 0 deletions recipes-devtools/python/python-pycrypto_2.6.1.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
DESCRIPTION = "Cryptographic modules for Python."
HOMEPAGE = "http://www.pycrypto.org/"
SECTION = "devel/python"
LICENSE = "PSFv2"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35f354d199e8cb7667b059a23578e63d"

SRCNAME = "pycrypto"

SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
file://cross-compiling.patch"

SRC_URI[md5sum] = "55a61a054aa66812daf5161a0d5d7eda"
SRC_URI[sha256sum] = "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c"

S = "${WORKDIR}/${SRCNAME}-${PV}"

inherit distutils

export STAGING_INCDIR
export STAGING_LIBDIR
export BUILD_SYS
export HOST_SYS

inherit autotools autotools-brokensep distutils

DEPENDS += " gmp"

do_compile[noexec] = "1"

# We explicitly call distutils_do_install, since we want it to run, but
# *don't* want the autotools install to run, since this package doesn't
# provide a "make install" target.
do_install() {
distutils_do_install
}
13 changes: 13 additions & 0 deletions recipes-devtools/python/python-pymongo_3.2.2.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
DESCRIPTION = "Python driver for MongoDB"
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Commit is subsumed by other changes.

This is a valuable commit; this issue is however already addressed in
bmwcarit#509.

SECTION = "devel"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2a944942e1496af1886903d274dedb13"
SRCNAME = "pymongo"

SRC_URI = "http://pypi.python.org/packages/source/p/pymongo/pymongo-${PV}.tar.gz"
SRC_URI[md5sum] = "70408f8115d7aa52fb6eef0e552834a6"
SRC_URI[sha256sum] = "f2018165823b341d83d398165d1c625e5db5cc779e7c44c107034407808463b6"

S = "${WORKDIR}/${SRCNAME}-${PV}"

inherit setuptools
4 changes: 2 additions & 2 deletions recipes-devtools/yaml-cpp/yaml-cpp_0.5.2.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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] = "96bdfa47d38711737d973b23d384d4f2"
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

On indigo (bmwcarit/master) and kinetic-experimental-v3-alpha1, yaml-cpp is updated
to 0.5.3 and loaded with git. So, this issue of this hunk has been resolved in indigo (bmwcarit/master)
and kinetic-experimental-v3-alpha1.

SRC_URI[sha256sum] = "60d8ad7bdb925ed0b53529713ffe0271965870435f72bd196aed5a7e3f073ec2"

EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON"

Expand Down
4 changes: 2 additions & 2 deletions recipes-extended/cmusphinx/sphinxbase_0.8.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ acoustic feature and audio files."
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=c550e8ca1106e5eeaf4e2b4cbf960fcf"

SRC_URI[md5sum] = "7335d233f7ad4ecc4b508aec7b5dc101"
SRC_URI[sha256sum] = "55708944872bab1015b8ae07b379bf463764f469163a8fd114cbb16c5e486ca8"
SRC_URI[md5sum] = "cb530d737c8f2d1023797cf0587b4e05"
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

I executed bitbake sphinxbase -c cleanall && bitbake sphinxbase -c fetch, it downloaded
the archive and I did not get any hash mismatch error reported. So, I cannot reproduce this
issue and we both, committer and reviewer, must recheck which is the right hash.

SRC_URI[sha256sum] = "7a07d3f7cca5c0b38ca811984ef8da536da32932d68c1a6cce33ec2462b930bf"

require cmusphinx.inc

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://licence/licence.txt;md5=18346072db6eb834b6edbd2cdc4f1
DEPENDS = "wxwidgets"

SRC_URI = "${SOURCEFORGE_MIRROR}/wxpython/wxPython-src-${PV}.tar.bz2"
SRC_URI[md5sum] = "a2a28fe8223391c93bf8788316767c9e"
SRC_URI[sha256sum] = "1a5b7e771eff467538d0834136188e8a7506a4fe6e85d0a46c40158cdbd4c48c"
SRC_URI[md5sum] = "922b02ff2c0202a7bf1607c98bbbbc04"
SRC_URI[sha256sum] = "d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61"

S = "${WORKDIR}/wxPython-src-${PV}/wxPython"

inherit pkgconfig pythonnative python-dir distutils

CFLAGS += "-I${STAGING_INCDIR}/wx-2.9/ -I${STAGING_LIBDIR}/wx/include/${TARGET_PREFIX}gtk2-unicode-2.9/"
CFLAGS += "-I${STAGING_INCDIR}/wx-3.0/ -I${STAGING_LIBDIR}/wx/include/${TARGET_PREFIX}gtk2-unicode-3.0/"
CFLAGS += "-std=gnu++11"

# Enable output on stdout for buildpaths
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ HOMEPAGE = "http://www.wxwidgets.org"
LICENSE = "WXwindows"
LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=18346072db6eb834b6edbd2cdc4f109b"

DEPENDS = "webkit-gtk gstreamer gtk+ jpeg tiff libpng zlib expat libxinerama libglu"
DEPENDS = "webkitgtk gstreamer gtk+ jpeg tiff libpng zlib expat libxinerama libglu"

SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.bz2"
SRC_URI[md5sum] = "e98c5f92805493f150656403ffef3bb0"
SRC_URI[sha256sum] = "b74ba96ca537cc5d049d21ec9ab5eb2670406a4aa9f1ea4845ea84a9955a6e02"
SRC_URI = "https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2"
SRC_URI[md5sum] = "ba23578300f33eeb26bc75894b9aaf11"
SRC_URI[sha256sum] = "08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b"

S = "${WORKDIR}/wxWidgets-${PV}"

Expand Down Expand Up @@ -40,9 +40,11 @@ do_install_prepend() {

# wx-config doesn't handle the suffixed libwx_media, xrc, etc, make a compat symlink
do_install_append() {
for lib in adv aui core html media propgrid qa ribbon richtext stc webview xrc ; do
ln -sf libwx_gtk2u_$lib-2.9.so.5.0.0 ${D}${libdir}/libwx_gtk2u_$lib-2.9.so
for lib in adv aui core gl html media propgrid qa ribbon richtext stc xrc ; do
ln -sf libwx_gtk2u_$lib-3.0.so.0.3.0 ${D}${libdir}/libwx_gtk2u_$lib-3.0.so
done
rm ${D}${bindir}/wx-config
cp -f ${S}/wx-config ${D}${bindir}/wx-config
}

SYSROOT_PREPROCESS_FUNCS += "wxwidgets_sysroot_preprocess"
Expand Down
2 changes: 1 addition & 1 deletion recipes-ros/control-toolbox/control-toolbox_1.15.0.bb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"

DEPENDS = "rosconsole tf roscpp angles message-generation dynamic-reconfigure libtinyxml \
realtime-tools message-filters"
realtime-tools message-filters control-msgs"
Copy link
Copy Markdown
Owner

@bulwahn bulwahn Jan 2, 2018

Choose a reason for hiding this comment

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

Commit is subsumed by other changes.

On kinetic-experimental-v3-alpha1, this issue is already addressed with commit b5f8edd ("control-toolbox: add control-msgs").

For the indigo release, the control_toolbox package does not need control_msgs [1]; commit b5f8edd is specific to kinetic and does not need be backported to master.

[1] https://github.com/ros-controls/control_toolbox/blob/indigo-devel/package.xml


SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "3ad4d04d1ba3f09ed6078512a8466e55"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "537c8dca08fe8a936438252b3ee6cdc8"
SRC_URI[sha256sum] = "2d9b10f1e3c22145d58ba922dcafc72b149bb4561e641fff17eddf1510294271"
SRC_URI[md5sum] = "855253ebefbcf508d2af7dd3e8d5d15a"
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

On kinetic-experimental-v3-alpha1, image-transport-plugins have already been
updated to version 1.9.5. So, this hunk does not apply to kinetic-experimental-v3-alpha1
anymore.

SRC_URI[sha256sum] = "aed643f5a8306368456642b74d878875faf8e7b68d60818605ad921bbb7f7263"

S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

Expand Down
1 change: 1 addition & 0 deletions recipes-ros/ros-comm/roslaunch_1.12.2.bb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ RDEPENDS_${PN} = "\
rosgraph \
python-pyyaml \
python-defusedxml \
python-paramiko \
roslib \
rosclean \
rosmaster \
Expand Down
2 changes: 1 addition & 1 deletion recipes-ros/rosbridge-suite/rosbridge-library_0.7.16.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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-pymongo python-pytz python-html python-imaging python-twisted"
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Commit is subsumed by other changes.

This is a valuable commit; this issue is however already addressed in
bmwcarit#509.


require rosbridge-suite.inc