summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 11:31:15 -0400
committeracxz2020-05-24 11:31:15 -0400
commitcd5961b46cf5ce9995608b2f9a98b42a914b9be8 (patch)
treeb50e25b8be81c76513bf31495157091f19f864f3
parent4c8c81d9c866a8ac1e9e3cb8cc891d1a1e1df9fd (diff)
downloadaur-cd5961b46cf5ce9995608b2f9a98b42a914b9be8.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD28
2 files changed, 22 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 48d7d26735d..90d325e45f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-controller-interface
+pkgbase = ros-noetic-controller-interface
pkgdesc = ROS - Interface base class for controllers.
pkgver = 0.15.1
pkgrel = 3
@@ -11,15 +11,15 @@ pkgbase = ros-melodic-controller-interface
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-pluginlib
- makedepends = ros-melodic-roscpp
- makedepends = ros-melodic-hardware-interface
- makedepends = ros-melodic-catkin
- depends = ros-melodic-pluginlib
- depends = ros-melodic-roscpp
- depends = ros-melodic-hardware-interface
- source = ros-melodic-controller-interface-0.15.1.tar.gz::https://github.com/ros-controls/ros_control/archive/0.15.1.tar.gz
+ makedepends = ros-noetic-pluginlib
+ makedepends = ros-noetic-roscpp
+ makedepends = ros-noetic-hardware-interface
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-pluginlib
+ depends = ros-noetic-roscpp
+ depends = ros-noetic-hardware-interface
+ source = ros-noetic-controller-interface-0.15.1.tar.gz::https://github.com/ros-controls/ros_control/archive/0.15.1.tar.gz
sha256sums = adf1a9d1fd10f4d89e91c8279d1278d9cd301767b658c143810479b2d10eedca
-pkgname = ros-melodic-controller-interface
+pkgname = ros-noetic-controller-interface
diff --git a/PKGBUILD b/PKGBUILD
index c0d7330c2b2..ce336219127 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,27 @@
pkgdesc="ROS - Interface base class for controllers."
url='https://github.com/ros-controls/ros_control/wiki'
-pkgname='ros-melodic-controller-interface'
+pkgname='ros-noetic-controller-interface'
pkgver='0.15.1'
_pkgver_patch=0
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgrel=3
license=('BSD')
-ros_makedepends=(ros-melodic-pluginlib
- ros-melodic-roscpp
- ros-melodic-hardware-interface
- ros-melodic-catkin)
+ros_makedepends=(ros-noetic-pluginlib
+ ros-noetic-roscpp
+ ros-noetic-hardware-interface
+ ros-noetic-catkin)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-melodic-pluginlib
- ros-melodic-roscpp
- ros-melodic-hardware-interface)
+ros_depends=(ros-noetic-pluginlib
+ ros-noetic-roscpp
+ ros-noetic-hardware-interface)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
-# _tag=release/melodic/controller_interface/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/controller_interface/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_control-release.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -36,21 +36,17 @@ sha256sums=('adf1a9d1fd10f4d89e91c8279d1278d9cd301767b658c143810479b2d10eedca')
build() {
# Use ROS environment variables
source /usr/share/ros-build-tools/clear-ros-env.sh
- [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+ [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
# Create build directory
[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
cd ${srcdir}/build
- # Fix Python2/Python3 conflicts
- /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
# Build project
cmake ${srcdir}/${_dir} \
- -DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}