upd to noetic, cmake vars, python

2 files changed, 13 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8850b60703fb..9c18994b25aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-pkgbase = ros-melodic-socketcan-interface
+pkgbase = ros-noetic-socketcan-interface
 	pkgdesc = Generic CAN interface description with helpers for filtering and driver implementation. Further a socketcan implementation based on boost::asio is included.
 	pkgver = 0.8.1
 	pkgrel = 3
-	url = http://wiki.ros.org/socketcan_interface?distro=melodic
+	url = http://wiki.ros.org/socketcan_interface?distro=noetic
 	arch = i686
 	arch = x86_64
 	arch = aarch64
@@ -11,12 +11,12 @@ pkgbase = ros-melodic-socketcan-interface
 	license = LGPL3
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-catkin
 	depends = boost
 	depends = linux-headers
-	depends = ros-melodic-class-loader
-	source = ros-melodic-socketcan-interface-0.8.1.tar.gz::https://github.com/ros-industrial/ros_canopen/archive/0.8.1.tar.gz
+	depends = ros-noetic-class-loader
+	source = ros-noetic-socketcan-interface-0.8.1.tar.gz::https://github.com/ros-industrial/ros_canopen/archive/0.8.1.tar.gz
 	sha256sums = aa75077452abea1848405906c989eca2e539943c2d1cc1e6f1d72f8facc74390
 
-pkgname = ros-melodic-socketcan-interface
+pkgname = ros-noetic-socketcan-interface
 
diff --git a/PKGBUILD b/PKGBUILD
index da30c2cd6fe1..f564a4e9c6a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
 # Maintainer: michaelchou <michaeljchou at the hotmail domain which is .com>
 # Contributor: michaelchou <michaeljchou at the hotmail domain which is .com>
 
-pkgname=ros-melodic-socketcan-interface
+pkgname=ros-noetic-socketcan-interface
 pkgdesc='Generic CAN interface description with helpers for filtering and driver implementation. Further a socketcan implementation based on boost::asio is included.'
-url="http://wiki.ros.org/socketcan_interface?distro=melodic"
+url="http://wiki.ros.org/socketcan_interface?distro=noetic"
 
 pkgver='0.8.1'
 pkgrel=3
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 license=('LGPL3')
 
-ros_makedepends=( ros-melodic-catkin
+ros_makedepends=( ros-noetic-catkin
 )
 makedepends=(cmake ros-build-tools ${ros_makedepends[@]})
 
 ros_depends=(
-  ros-melodic-class-loader
+  ros-noetic-class-loader
 )
 depends=(boost linux-headers ${ros_depends[@]})
 
@@ -26,21 +26,17 @@ 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 \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }