upd to noetic, cmake vars, python

1 files changed, 16 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4d798b0fbae3..b42371c905b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 pkgdesc="ROS - roslaunch scripts for starting the TurtleBot3"
 url='https://wiki.ros.org/turtlebot3_bringup'
 
-pkgname='ros-melodic-turtlebot3-bringup'
+pkgname='ros-noetic-turtlebot3-bringup'
 pkgver='1.2.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('Apache-2.0')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -18,17 +18,17 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-roscpp
-    ros-melodic-std-msgs
-    ros-melodic-diagnostic-msgs
-    ros-melodic-sensor-msgs
-    ros-melodic-turtlebot3-msgs
-    ros-melodic-turtlebot3-description
-    ros-melodic-turtlebot3-teleop
-    ros-melodic-joint-state-publisher
-    ros-melodic-robot-state-publisher
-    ros-melodic-rosserial-python
-    ros-melodic-hls-lfcd-lds-driver
+	ros-noetic-roscpp
+    ros-noetic-std-msgs
+    ros-noetic-diagnostic-msgs
+    ros-noetic-sensor-msgs
+    ros-noetic-turtlebot3-msgs
+    ros-noetic-turtlebot3-description
+    ros-noetic-turtlebot3-teleop
+    ros-noetic-joint-state-publisher
+    ros-noetic-robot-state-publisher
+    ros-noetic-rosserial-python
+    ros-noetic-hls-lfcd-lds-driver
 )
 
 depends=(
@@ -42,21 +42,17 @@ sha256sums=('c652438109ea99008f6d2e950e6cb7f6e67653b8daa1079c825b77d9f52a4e1d')
 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
 }