summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD31
2 files changed, 23 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e94d2eb1cd5..b592659d188e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-pr2-msgs
+pkgbase = ros-noetic-pr2-msgs
pkgdesc = ROS - Messages for representing PR2 state
pkgver = 1.12.4
pkgrel = 1
@@ -7,16 +7,16 @@ pkgbase = ros-melodic-pr2-msgs
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-message-generation
- makedepends = ros-melodic-message-runtime
- makedepends = ros-melodic-std-msgs
- makedepends = ros-melodic-geometry-msgs
- depends = ros-melodic-std-msgs
- depends = ros-melodic-geometry-msgs
- depends = ros-melodic-message-runtime
- source = ros-melodic-pr2-msgs-1.12.4.tar.gz::https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-message-generation
+ makedepends = ros-noetic-message-runtime
+ makedepends = ros-noetic-std-msgs
+ makedepends = ros-noetic-geometry-msgs
+ depends = ros-noetic-std-msgs
+ depends = ros-noetic-geometry-msgs
+ depends = ros-noetic-message-runtime
+ source = ros-noetic-pr2-msgs-1.12.4.tar.gz::https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz
sha256sums = 135c6947f7511bcb3644fa6c0cf5972c309516895737e83f8eeed2b2d069f009
-pkgname = ros-melodic-pr2-msgs
+pkgname = ros-noetic-pr2-msgs
diff --git a/PKGBUILD b/PKGBUILD
index c788581187ab..876a87445673 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,23 @@
pkgdesc="ROS - Messages for representing PR2 state"
url='https://wiki.ros.org/pr2_msgs'
-pkgname='ros-melodic-pr2-msgs'
+pkgname='ros-noetic-pr2-msgs'
pkgver='1.12.4'
arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-melodic-catkin
- ros-melodic-message-generation
- ros-melodic-message-runtime
- ros-melodic-std-msgs
- ros-melodic-geometry-msgs)
+ros_makedepends=(ros-noetic-catkin
+ ros-noetic-message-generation
+ ros-noetic-message-runtime
+ ros-noetic-std-msgs
+ ros-noetic-geometry-msgs)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-melodic-std-msgs
- ros-melodic-geometry-msgs
- ros-melodic-message-runtime)
+ros_depends=(ros-noetic-std-msgs
+ ros-noetic-geometry-msgs
+ ros-noetic-message-runtime)
depends=(${ros_depends[@]})
_dir="pr2_common-${pkgver}/pr2_msgs"
@@ -28,24 +28,17 @@ sha256sums=('135c6947f7511bcb3644fa6c0cf5972c309516895737e83f8eeed2b2d069f009')
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.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.7.so \
- -DPYTHON_BASENAME=-python3.7 \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}