summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 11:55:48 -0400
committeracxz2020-05-24 11:55:48 -0400
commitcf9c3e5f3d20a4a115d11a07a153e592694230b3 (patch)
tree1f6b92ab33e2002df5775067aec68c3ce7407fae
parentd1ba07e0e7f6d47affdd104ca76a98df4b0aca95 (diff)
downloadaur-cf9c3e5f3d20a4a115d11a07a153e592694230b3.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD26
2 files changed, 21 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f81fc54358f5..22ed078335c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-mavros-msgs
+pkgbase = ros-noetic-mavros-msgs
pkgdesc = ROS - mavros_msgs defines messages for MAVROS.
pkgver = 1.0.0
pkgrel = 1
@@ -11,15 +11,15 @@ pkgbase = ros-melodic-mavros-msgs
license = GPLv3, LGPLv3, BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-message-generation
- depends = ros-melodic-message-runtime
- depends = ros-melodic-std-msgs
- depends = ros-melodic-geometry-msgs
- depends = ros-melodic-sensor-msgs
- depends = ros-melodic-geographic-msgs
- source = ros-melodic-mavros-msgs-1.0.0.tar.gz::https://github.com/mavlink/mavros/archive/1.0.0.tar.gz
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-message-generation
+ depends = ros-noetic-message-runtime
+ depends = ros-noetic-std-msgs
+ depends = ros-noetic-geometry-msgs
+ depends = ros-noetic-sensor-msgs
+ depends = ros-noetic-geographic-msgs
+ source = ros-noetic-mavros-msgs-1.0.0.tar.gz::https://github.com/mavlink/mavros/archive/1.0.0.tar.gz
sha256sums = 08c911a3e92990e260ab25715b6605303b1ac52a8de0e3b0f504bcfab6390b0d
-pkgname = ros-melodic-mavros-msgs
+pkgname = ros-noetic-mavros-msgs
diff --git a/PKGBUILD b/PKGBUILD
index 429b04520703..dd979234a458 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
pkgdesc="ROS - mavros_msgs defines messages for MAVROS."
url='https://wiki.ros.org/mavros_msgs'
-pkgname='ros-melodic-mavros-msgs'
+pkgname='ros-noetic-mavros-msgs'
pkgver='1.0.0'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgrel=1
license=('GPLv3, LGPLv3, BSD')
ros_makedepends=(
- ros-melodic-catkin
- ros-melodic-message-generation
+ ros-noetic-catkin
+ ros-noetic-message-generation
)
makedepends=(
@@ -21,11 +21,11 @@ makedepends=(
)
ros_depends=(
- ros-melodic-message-runtime
- ros-melodic-std-msgs
- ros-melodic-geometry-msgs
- ros-melodic-sensor-msgs
- ros-melodic-geographic-msgs
+ ros-noetic-message-runtime
+ ros-noetic-std-msgs
+ ros-noetic-geometry-msgs
+ ros-noetic-sensor-msgs
+ ros-noetic-geographic-msgs
)
depends=(
@@ -39,21 +39,17 @@ sha256sums=('08c911a3e92990e260ab25715b6605303b1ac52a8de0e3b0f504bcfab6390b0d')
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
}