upd to noetic, cmake vars, python

2 files changed, 16 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d37074f78ff2..e4b48625b85b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-turtlebot3-teleop
+pkgbase = ros-noetic-turtlebot3-teleop
 	pkgdesc = ROS - Provides teleoperation using keyboard for Turtlebot3.
 	pkgver = 1.2.2
 	pkgrel = 2
@@ -7,13 +7,13 @@ pkgbase = ros-melodic-turtlebot3-teleop
 	license = Apache-2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-rospy
-	depends = ros-melodic-geometry-msgs
-	source = ros-melodic-turtlebot3-teleop-1.2.2.tar.gz::https://github.com/ROBOTIS-GIT/turtlebot3/archive/1.2.2.tar.gz
-	source = python3-compatibility.patch::https://github.com/ROBOTIS-GIT/turtlebot3/commit/ddca617172a3549a3077682cd2cf7dc377616e01.diff
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-rospy
+	depends = ros-noetic-geometry-msgs
+	source = ros-noetic-turtlebot3-teleop-1.2.2.tar.gz::https://github.com/ROBOTIS-GIT/turtlebot3/archive/1.2.2.tar.gz
+	source = python-compatibility.patch::https://github.com/ROBOTIS-GIT/turtlebot3/commit/ddca617172a3549a3077682cd2cf7dc377616e01.diff
 	sha256sums = c652438109ea99008f6d2e950e6cb7f6e67653b8daa1079c825b77d9f52a4e1d
 	sha256sums = 67678a5af67a9cc2753235fbc78cc2cb57841b63884b5b35599ea32f382fcc89
 
-pkgname = ros-melodic-turtlebot3-teleop
+pkgname = ros-noetic-turtlebot3-teleop
 
diff --git a/PKGBUILD b/PKGBUILD
index 2e3d8bd0fae9..9a3acf5b8a33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 pkgdesc="ROS - Provides teleoperation using keyboard for Turtlebot3."
 url='https://wiki.ros.org/turtlebot3_teleop'
 
-pkgname='ros-melodic-turtlebot3-teleop'
+pkgname='ros-noetic-turtlebot3-teleop'
 pkgver='1.2.2'
 arch=('any')
 pkgrel=2
 license=('Apache-2.0')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -18,8 +18,8 @@ makedepends=(
 )
 
 ros_depends=(
-    ros-melodic-rospy
-	ros-melodic-geometry-msgs
+    ros-noetic-rospy
+	ros-noetic-geometry-msgs
 )
 
 depends=(
@@ -28,33 +28,29 @@ depends=(
 
 _dir="turtlebot3-${pkgver}/turtlebot3_teleop"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ROBOTIS-GIT/turtlebot3/archive/${pkgver}.tar.gz"
-	"python3-compatibility.patch"::"https://github.com/ROBOTIS-GIT/turtlebot3/commit/ddca617172a3549a3077682cd2cf7dc377616e01.diff")
+	"python-compatibility.patch"::"https://github.com/ROBOTIS-GIT/turtlebot3/commit/ddca617172a3549a3077682cd2cf7dc377616e01.diff")
 sha256sums=('c652438109ea99008f6d2e950e6cb7f6e67653b8daa1079c825b77d9f52a4e1d'
             '67678a5af67a9cc2753235fbc78cc2cb57841b63884b5b35599ea32f382fcc89')
 
 prepare() {
 	cd ${srcdir}/turtlebot3-${pkgver}
-	patch -p1 --input="${srcdir}/python3-compatibility.patch"
+	patch -p1 --input="${srcdir}/python-compatibility.patch"
 }
 
 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
 }