upd to noetic, cmake vars, python

2 files changed, 15 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6dd2eaa487d8..1b77b55bc2b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-hls-lfcd-lds-driver
+pkgbase = ros-noetic-hls-lfcd-lds-driver
 	pkgdesc = ROS - ROS package for LDS(HLS-LFCD2). The LDS (Laser Distance Sensor) is a sensor sending the data to Host for the simultaneous localization and mapping (SLAM).
 	pkgver = 1.1.0
 	pkgrel = 2
@@ -11,13 +11,13 @@ pkgbase = ros-melodic-hls-lfcd-lds-driver
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-catkin
 	depends = boost
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-sensor-msgs
-	source = ros-melodic-hls-lfcd-lds-driver-1.1.0.tar.gz::https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver/archive/1.1.0.tar.gz
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-sensor-msgs
+	source = ros-noetic-hls-lfcd-lds-driver-1.1.0.tar.gz::https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver/archive/1.1.0.tar.gz
 	sha256sums = 02ccf80d649756cab7f92113680f9fa1fa88d599882ded5322eaa999ca21e2ae
 
-pkgname = ros-melodic-hls-lfcd-lds-driver
+pkgname = ros-noetic-hls-lfcd-lds-driver
 
diff --git a/PKGBUILD b/PKGBUILD
index 878ad21a40a6..95b8af1d2acd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@ is a sensor sending the data to Host for the simultaneous localization and
 mapping (SLAM)."
 url='https://wiki.ros.org/hls_lfcd_lds_driver'
 
-pkgname='ros-melodic-hls-lfcd-lds-driver'
+pkgname='ros-noetic-hls-lfcd-lds-driver'
 pkgver='1.1.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -20,9 +20,9 @@ makedepends=(
 )
 
 ros_depends=(
-    ros-melodic-roscpp
-    ros-melodic-std-msgs
-    ros-melodic-sensor-msgs
+    ros-noetic-roscpp
+    ros-noetic-std-msgs
+    ros-noetic-sensor-msgs
 )
 
 depends=(
@@ -37,21 +37,17 @@ sha256sums=('02ccf80d649756cab7f92113680f9fa1fa88d599882ded5322eaa999ca21e2ae')
 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
 }