summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD20
2 files changed, 15 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0f10c8990ff..1d64049382a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-pkgbase = ros-melodic-socketcan-bridge
+pkgbase = ros-noetic-socketcan-bridge
pkgdesc = Conversion nodes for messages from SocketCAN to a ROS Topic and vice versa.
pkgver = 0.8.1
pkgrel = 2
- url = http://wiki.ros.org/socketcan_bridge?distro=melodic
+ url = http://wiki.ros.org/socketcan_bridge?distro=noetic
arch = i686
arch = x86_64
arch = aarch64
@@ -11,11 +11,11 @@ pkgbase = ros-melodic-socketcan-bridge
license = LGPL3
makedepends = cmake
makedepends = ros-build-tools
- depends = ros-melodic-can-msgs
- depends = ros-melodic-roscpp
- depends = ros-melodic-socketcan-interface
- source = ros-melodic-socketcan-bridge-0.8.1.tar.gz::https://github.com/ros-industrial/ros_canopen/archive/0.8.1.tar.gz
+ depends = ros-noetic-can-msgs
+ depends = ros-noetic-roscpp
+ depends = ros-noetic-socketcan-interface
+ source = ros-noetic-socketcan-bridge-0.8.1.tar.gz::https://github.com/ros-industrial/ros_canopen/archive/0.8.1.tar.gz
sha256sums = aa75077452abea1848405906c989eca2e539943c2d1cc1e6f1d72f8facc74390
-pkgname = ros-melodic-socketcan-bridge
+pkgname = ros-noetic-socketcan-bridge
diff --git a/PKGBUILD b/PKGBUILD
index 7c284d06382d..aee662e88f25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: michaelchou <michaeljchou at the hotmail domain which is .com>
# Contributor: michaelchou <michaeljchou at the hotmail domain which is .com>
-pkgname=ros-melodic-socketcan-bridge
+pkgname=ros-noetic-socketcan-bridge
pkgdesc='Conversion nodes for messages from SocketCAN to a ROS Topic and vice versa.'
-url="http://wiki.ros.org/socketcan_bridge?distro=melodic"
+url="http://wiki.ros.org/socketcan_bridge?distro=noetic"
pkgver='0.8.1'
pkgrel=2
@@ -15,9 +15,9 @@ ros_makedepends=(
makedepends=(cmake ros-build-tools ${ros_makedepends[@]})
ros_depends=(
- ros-melodic-can-msgs
- ros-melodic-roscpp
- ros-melodic-socketcan-interface
+ ros-noetic-can-msgs
+ ros-noetic-roscpp
+ ros-noetic-socketcan-interface
)
depends=(${ros_depends[@]})
@@ -29,22 +29,18 @@ sha256sums=('aa75077452abea1848405906c989eca2e539943c2d1cc1e6f1d72f8facc74390')
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 \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-DCATKIN_ENABLE_TESTING=OFF \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}