summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD27
2 files changed, 18 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5aceb5e1df4f..04a5c5ca1f53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-uuid-msgs
+pkgbase = ros-noetic-uuid-msgs
pkgdesc = ROS - ROS messages for universally unique identifiers.
pkgver = 1.0.6
pkgrel = 2
@@ -7,13 +7,13 @@ pkgbase = ros-melodic-uuid-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-uuid-msgs-1.0.6.tar.gz::https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.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-uuid-msgs-1.0.6.tar.gz::https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz
sha256sums = e376df28058d69da4c3c5fce4ef5d3cc24518ed9b64a181055ff86a2fc11b832
-pkgname = ros-melodic-uuid-msgs
+pkgname = ros-noetic-uuid-msgs
diff --git a/PKGBUILD b/PKGBUILD
index ad25861389a1..87457f0ba3fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,25 @@
pkgdesc="ROS - ROS messages for universally unique identifiers."
url='https://wiki.ros.org/uuid_msgs'
-pkgname='ros-melodic-uuid-msgs'
+pkgname='ros-noetic-uuid-msgs'
pkgver='1.0.6'
_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/uuid_msgs/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/uuid_msgs/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ros-geographic-info/unique_identifier-release.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -34,24 +34,17 @@ sha256sums=('e376df28058d69da4c3c5fce4ef5d3cc24518ed9b64a181055ff86a2fc11b832')
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
}