summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 11:31:45 -0400
committeracxz2020-05-24 11:31:45 -0400
commit1c191023cca6f42eae2a1396dd70252ac48e2874 (patch)
treed9b473caf9d17ffe65f8ae6cc66d824cdb31a96b
parent02432bc855edf841b93d06ee6aa2312f56d136da (diff)
downloadaur-1c191023cca6f42eae2a1396dd70252ac48e2874.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD27
2 files changed, 18 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c0f784063f6..7516b90f95e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-controller-manager-msgs
+pkgbase = ros-noetic-controller-manager-msgs
pkgdesc = ROS - Messages and services for the controller manager.
pkgver = 0.15.1
pkgrel = 2
@@ -7,13 +7,13 @@ pkgbase = ros-melodic-controller-manager-msgs
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-message-generation
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-std-msgs
- depends = ros-melodic-message-runtime
- depends = ros-melodic-std-msgs
- source = ros-melodic-controller-manager-msgs-0.15.1.tar.gz::https://github.com/ros-controls/ros_control/archive/0.15.1.tar.gz
+ makedepends = ros-noetic-message-generation
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-std-msgs
+ depends = ros-noetic-message-runtime
+ depends = ros-noetic-std-msgs
+ source = ros-noetic-controller-manager-msgs-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-msgs
+pkgname = ros-noetic-controller-manager-msgs
diff --git a/PKGBUILD b/PKGBUILD
index 4e9c1cdf077..70721a239ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,25 @@
pkgdesc="ROS - Messages and services for the controller manager."
url='https://github.com/ros-controls/ros_control/wiki'
-pkgname='ros-melodic-controller-manager-msgs'
+pkgname='ros-noetic-controller-manager-msgs'
pkgver='0.15.1'
_pkgver_patch=0
arch=('any')
pkgrel=2
license=('BSD')
-ros_makedepends=(ros-melodic-message-generation
- ros-melodic-catkin
- ros-melodic-std-msgs)
+ros_makedepends=(ros-noetic-message-generation
+ ros-noetic-catkin
+ ros-noetic-std-msgs)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-melodic-message-runtime
- ros-melodic-std-msgs)
+ros_depends=(ros-noetic-message-runtime
+ ros-noetic-std-msgs)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
-# _tag=release/melodic/controller_manager_msgs/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/controller_manager_msgs/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_control-release.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -34,24 +34,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
}