summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 11:31:31 -0400
committeracxz2020-05-24 11:31:31 -0400
commit18ab3d4ae222974f6cd8ac58ae66ff6b7e752a6b (patch)
tree7ea32cd5b3137873bcc399d0e739d09ddeec7ea3
parent6dd87b3fa1294719ac1a3cbf5037cc1713d75fc6 (diff)
downloadaur-18ab3d4ae222974f6cd8ac58ae66ff6b7e752a6b.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO26
-rw-r--r--PKGBUILD37
2 files changed, 28 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea176ad5832..3a2b5468e8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-controller-manager
+pkgbase = ros-noetic-controller-manager
pkgdesc = ROS - The controller manager.
pkgver = 0.15.1
pkgrel = 2
@@ -7,18 +7,18 @@ pkgbase = ros-melodic-controller-manager
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-pluginlib
- makedepends = ros-melodic-controller-manager-msgs
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-hardware-interface
- makedepends = ros-melodic-controller-interface
- makedepends = ros-melodic-rostest
- depends = ros-melodic-pluginlib
- depends = ros-melodic-controller-manager-msgs
- depends = ros-melodic-hardware-interface
- depends = ros-melodic-controller-interface
- source = ros-melodic-controller-manager-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-controller-manager-msgs
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-hardware-interface
+ makedepends = ros-noetic-controller-interface
+ makedepends = ros-noetic-rostest
+ depends = ros-noetic-pluginlib
+ depends = ros-noetic-controller-manager-msgs
+ depends = ros-noetic-hardware-interface
+ depends = ros-noetic-controller-interface
+ source = ros-noetic-controller-manager-0.15.1.tar.gz::https://github.com/ros-controls/ros_control/archive/0.15.1.tar.gz
sha256sums = adf1a9d1fd10f4d89e91c8279d1278d9cd301767b658c143810479b2d10eedca
-pkgname = ros-melodic-controller-manager
+pkgname = ros-noetic-controller-manager
diff --git a/PKGBUILD b/PKGBUILD
index c00f43ce5c5..cfd342490ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,30 @@
pkgdesc="ROS - The controller manager."
url='https://github.com/ros-controls/ros_control/wiki'
-pkgname='ros-melodic-controller-manager'
+pkgname='ros-noetic-controller-manager'
pkgver='0.15.1'
_pkgver_patch=0
arch=('any')
pkgrel=2
license=('BSD')
-ros_makedepends=(ros-melodic-pluginlib
- ros-melodic-controller-manager-msgs
- ros-melodic-catkin
- ros-melodic-hardware-interface
- ros-melodic-controller-interface
- ros-melodic-rostest)
+ros_makedepends=(ros-noetic-pluginlib
+ ros-noetic-controller-manager-msgs
+ ros-noetic-catkin
+ ros-noetic-hardware-interface
+ ros-noetic-controller-interface
+ ros-noetic-rostest)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-melodic-pluginlib
- ros-melodic-controller-manager-msgs
- ros-melodic-hardware-interface
- ros-melodic-controller-interface)
+ros_depends=(ros-noetic-pluginlib
+ ros-noetic-controller-manager-msgs
+ ros-noetic-hardware-interface
+ ros-noetic-controller-interface)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
-# _tag=release/melodic/controller_manager/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/controller_manager/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_control-release.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -39,24 +39,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 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
- -DPYTHON_BASENAME=.cpython-37m \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}