upd to noetic, cmake vars, python

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7718df507adf..520b0d8f2de9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-mav-msgs
+pkgbase = ros-noetic-mav-msgs
 	pkgdesc = ROS - Package containing messages for communicating with rotary wing MAVs
 	pkgver = 3.3.2
 	pkgrel = 1
@@ -11,20 +11,20 @@ pkgbase = ros-melodic-mav-msgs
 	license = ASL 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-cmake-modules
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-trajectory-msgs
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-cmake-modules
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-trajectory-msgs
 	makedepends = eigen
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-message-generation
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-trajectory-msgs
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-message-generation
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-trajectory-msgs
 	depends = eigen
-	source = ros-melodic-mav-msgs-3.3.2.tar.gz::https://github.com/ethz-asl/mav_comm/archive/3.3.2.tar.gz
+	source = ros-noetic-mav-msgs-3.3.2.tar.gz::https://github.com/ethz-asl/mav_comm/archive/3.3.2.tar.gz
 	sha256sums = 5c24fd711d32a024d226707aca6e18ed31e5ebd01e5bfe725098d07619223459
 
-pkgname = ros-melodic-mav-msgs
+pkgname = ros-noetic-mav-msgs
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d3017d69b28..47efe31bc1f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,19 @@ pkgdesc="ROS - Package containing messages for communicating with rotary wing
 MAVs"
 url='https://wiki.ros.org/mav_msgs'
 
-pkgname='ros-melodic-mav-msgs'
+pkgname='ros-noetic-mav-msgs'
 pkgver='3.3.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=1
 license=('ASL 2.0')
 
 ros_makedepends=(
-    ros-melodic-catkin
-    ros-melodic-cmake-modules
-    ros-melodic-geometry-msgs
-    ros-melodic-message-generation
-    ros-melodic-std-msgs
-    ros-melodic-trajectory-msgs
+    ros-noetic-catkin
+    ros-noetic-cmake-modules
+    ros-noetic-geometry-msgs
+    ros-noetic-message-generation
+    ros-noetic-std-msgs
+    ros-noetic-trajectory-msgs
 )
 
 makedepends=(
@@ -27,10 +27,10 @@ makedepends=(
 )
 
 ros_depends=(
-    ros-melodic-geometry-msgs
-    ros-melodic-message-generation
-    ros-melodic-std-msgs
-    ros-melodic-trajectory-msgs
+    ros-noetic-geometry-msgs
+    ros-noetic-message-generation
+    ros-noetic-std-msgs
+    ros-noetic-trajectory-msgs
 )
 
 depends=(
@@ -45,21 +45,17 @@ sha256sums=('5c24fd711d32a024d226707aca6e18ed31e5ebd01e5bfe725098d07619223459')
 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 \
-		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }