summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 23:24:12 -0400
committeracxz2020-05-24 23:24:12 -0400
commitdc7d468118d4261d861f00f1423a9fa035049eb9 (patch)
tree57881c8f8e2e11fc7336be3d97cbc7cb654018c2
parent8767fe0ad0d288cf66bdc23c11d95a9e94306aa8 (diff)
downloadaur-dc7d468118d4261d861f00f1423a9fa035049eb9.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO34
-rw-r--r--PKGBUILD40
2 files changed, 35 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 71d259a85d9..5e8de52e873 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rotors-hil-interface
+pkgbase = ros-noetic-rotors-hil-interface
pkgdesc = ROS - RotorS Hardware-in-the-loop interface package
pkgver = 2.2.3
pkgrel = 1
@@ -11,22 +11,22 @@ pkgbase = ros-melodic-rotors-hil-interface
license = ASL 2.0
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-cmake-modules
- makedepends = ros-melodic-geometry-msgs
- makedepends = ros-melodic-mav-msgs
- makedepends = ros-melodic-mavros
- makedepends = ros-melodic-mavros-msgs
- makedepends = ros-melodic-roscpp
- makedepends = ros-melodic-sensor-msgs
- depends = ros-melodic-geometry-msgs
- depends = ros-melodic-mav-msgs
- depends = ros-melodic-mavros
- depends = ros-melodic-mavros-msgs
- depends = ros-melodic-roscpp
- depends = ros-melodic-sensor-msgs
- source = ros-melodic-rotors-hil-interface-2.2.3.tar.gz::https://github.com/ethz-asl/rotors_simulator/archive/2.2.3.tar.gz
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-cmake-modules
+ makedepends = ros-noetic-geometry-msgs
+ makedepends = ros-noetic-mav-msgs
+ makedepends = ros-noetic-mavros
+ makedepends = ros-noetic-mavros-msgs
+ makedepends = ros-noetic-roscpp
+ makedepends = ros-noetic-sensor-msgs
+ depends = ros-noetic-geometry-msgs
+ depends = ros-noetic-mav-msgs
+ depends = ros-noetic-mavros
+ depends = ros-noetic-mavros-msgs
+ depends = ros-noetic-roscpp
+ depends = ros-noetic-sensor-msgs
+ source = ros-noetic-rotors-hil-interface-2.2.3.tar.gz::https://github.com/ethz-asl/rotors_simulator/archive/2.2.3.tar.gz
sha256sums = 46e6be40ebd08ba41a4a532c1774228d240d11aa39ad82f9ab50e445dc4a6f20
-pkgname = ros-melodic-rotors-hil-interface
+pkgname = ros-noetic-rotors-hil-interface
diff --git a/PKGBUILD b/PKGBUILD
index f95c256e21e..b639640bda8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,21 @@
pkgdesc="ROS - RotorS Hardware-in-the-loop interface package"
url='https://wiki.ros.org/rotors_hil_interface'
-pkgname='ros-melodic-rotors-hil-interface'
+pkgname='ros-noetic-rotors-hil-interface'
pkgver='2.2.3'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgrel=1
license=('ASL 2.0')
ros_makedepends=(
- ros-melodic-catkin
- ros-melodic-cmake-modules
- ros-melodic-geometry-msgs
- ros-melodic-mav-msgs
- ros-melodic-mavros
- ros-melodic-mavros-msgs
- ros-melodic-roscpp
- ros-melodic-sensor-msgs
+ ros-noetic-catkin
+ ros-noetic-cmake-modules
+ ros-noetic-geometry-msgs
+ ros-noetic-mav-msgs
+ ros-noetic-mavros
+ ros-noetic-mavros-msgs
+ ros-noetic-roscpp
+ ros-noetic-sensor-msgs
)
makedepends=(
@@ -27,12 +27,12 @@ makedepends=(
)
ros_depends=(
- ros-melodic-geometry-msgs
- ros-melodic-mav-msgs
- ros-melodic-mavros
- ros-melodic-mavros-msgs
- ros-melodic-roscpp
- ros-melodic-sensor-msgs
+ ros-noetic-geometry-msgs
+ ros-noetic-mav-msgs
+ ros-noetic-mavros
+ ros-noetic-mavros-msgs
+ ros-noetic-roscpp
+ ros-noetic-sensor-msgs
)
depends=(
@@ -46,21 +46,17 @@ sha256sums=('46e6be40ebd08ba41a4a532c1774228d240d11aa39ad82f9ab50e445dc4a6f20')
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 the 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 the 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
}