summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD20
2 files changed, 16 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 890d157f8d72..eabbc78cbf30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
# Generated by mksrcinfo v8
-# Sun Aug 6 10:47:41 UTC 2017
+# Sun Nov 12 16:15:26 UTC 2017
pkgbase = ros-lunar-ros
pkgdesc = ROS - ROS packaging system.
- pkgver = 1.14.1
+ pkgver = 1.14.2
pkgrel = 1
url = http://www.ros.org/wiki/ROS
arch = any
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-lunar-catkin
depends = ros-lunar-catkin
depends = ros-lunar-rosbash
depends = ros-lunar-roscreate
@@ -21,8 +20,8 @@ pkgbase = ros-lunar-ros
depends = ros-lunar-rosclean
depends = ros-lunar-rosbuild
depends = ros-lunar-roslang
- source = ros-lunar-ros-1.14.1-0.tar.gz::https://github.com/ros-gbp/ros-release/archive/release/lunar/ros/1.14.1-0.tar.gz
- sha256sums = 450f403b700517ab87cdfc4ec810819385d05621ed29e4216585706ab335f666
+ source = ros-lunar-ros-1.14.2-0.tar.gz::https://github.com/ros-gbp/ros-release/archive/release/lunar/ros/1.14.2-0.tar.gz
+ sha256sums = 78f209b97bf15b76b097ba0f9f515ee491f8b1670100c6bfa80aba5f0e3b4901
pkgname = ros-lunar-ros
diff --git a/PKGBUILD b/PKGBUILD
index 266b561dcff2..ef4f416bd191 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@ pkgdesc="ROS - ROS packaging system."
url='http://www.ros.org/wiki/ROS'
pkgname='ros-lunar-ros'
-pkgver='1.14.1'
+pkgver='1.14.2'
_pkgver_patch=0
arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-lunar-catkin)
+ros_makedepends=()
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
@@ -27,6 +27,9 @@ ros_depends=(ros-lunar-catkin
ros-lunar-roslang)
depends=(${ros_depends[@]})
+ros_checkdepends=()
+checkdepends=(${ros_checkdepends[@]})
+
# Git version (e.g. for debugging)
# _tag=release/lunar/ros/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
@@ -36,7 +39,7 @@ depends=(${ros_depends[@]})
# Tarball version (faster download)
_dir="ros-release-release-lunar-ros-${pkgver}-${_pkgver_patch}"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros-release/archive/release/lunar/ros/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('450f403b700517ab87cdfc4ec810819385d05621ed29e4216585706ab335f666')
+sha256sums=('78f209b97bf15b76b097ba0f9f515ee491f8b1670100c6bfa80aba5f0e3b4901')
build() {
# Use ROS environment variables
@@ -44,14 +47,14 @@ build() {
[ -f /opt/ros/lunar/setup.bash ] && source /opt/ros/lunar/setup.bash
# Create build directory
- [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
- cd ${srcdir}/build
+ [ -d "${srcdir}/build" ] || mkdir "${srcdir}/build"
+ cd "${srcdir}/build"
# Fix Python2/Python3 conflicts
- /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+ /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 "${srcdir}/${_dir}"
# Build project
- cmake ${srcdir}/${_dir} \
+ cmake "${srcdir}/${_dir}" \
-DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-DCMAKE_INSTALL_PREFIX=/opt/ros/lunar \
@@ -59,7 +62,8 @@ build() {
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-DPYTHON_BASENAME=-python2.7 \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
+ -DSETUPTOOLS_DEB_LAYOUT=OFF \
+ -DCATKIN_ENABLE_TESTING=OFF
make
}