summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHermann von Kleist2020-05-10 13:50:05 +0200
committerHermann von Kleist2020-05-10 13:50:05 +0200
commit20e1e702904c214b89ad33c5c84433455edaa3f3 (patch)
tree083cf6fd81f376339a9b69d132d9c257a7fe8996
parenta65bfd9f9b1ab8a89fa37826ce19f84a34cd5681 (diff)
downloadaur-20e1e702904c214b89ad33c5c84433455edaa3f3.tar.gz
Update to noetic
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD15
2 files changed, 12 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 83432441f1a..276d43be397 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-std-msgs
+pkgbase = ros-noetic-std-msgs
pkgdesc = ROS - Standard ROS Messages including common message types representing primitive data types and other basic message constructs, such as multiarrays.
pkgver = 0.5.13
pkgrel = 1
@@ -7,11 +7,11 @@ pkgbase = ros-melodic-std-msgs
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-message-generation
- makedepends = ros-melodic-catkin
- depends = ros-melodic-message-runtime
- source = ros-melodic-std-msgs-0.5.13.tar.gz::https://github.com/ros/std_msgs/archive/0.5.13.tar.gz
+ makedepends = ros-noetic-message-generation
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-message-runtime
+ source = ros-noetic-std-msgs-0.5.13.tar.gz::https://github.com/ros/std_msgs/archive/0.5.13.tar.gz
sha256sums = ee6592d37b00a94cab8216aac2cfb5120f6da09ffa94bfe197fe8dc76dd21326
-pkgname = ros-melodic-std-msgs
+pkgname = ros-noetic-std-msgs
diff --git a/PKGBUILD b/PKGBUILD
index e009179272d..dae48268338 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
pkgdesc="ROS - Standard ROS Messages including common message types representing primitive data types and other basic message constructs, such as multiarrays."
url='https://wiki.ros.org/std_msgs'
-pkgname='ros-melodic-std-msgs'
+pkgname='ros-noetic-std-msgs'
pkgver='0.5.13'
arch=('any')
pkgrel=1
license=('BSD')
ros_makedepends=(
- ros-melodic-message-generation
- ros-melodic-catkin
+ ros-noetic-message-generation
+ ros-noetic-catkin
)
makedepends=(
@@ -21,7 +21,7 @@ makedepends=(
)
ros_depends=(
- ros-melodic-message-runtime
+ ros-noetic-message-runtime
)
depends=(
@@ -35,20 +35,17 @@ sha256sums=('ee6592d37b00a94cab8216aac2cfb5120f6da09ffa94bfe197fe8dc76dd21326')
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 \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make