upd to noetic, cmake vars, python

2 files changed, 17 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 415199bd0a92..c798d0fd7eac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-pr2-common
+pkgbase = ros-noetic-pr2-common
 	pkgdesc = ROS - Metapackage for various PR2-related ROS packages
 	pkgver = 1.12.4
 	pkgrel = 1
@@ -7,13 +7,13 @@ pkgbase = ros-melodic-pr2-common
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-pr2-msgs
-	depends = ros-melodic-pr2-dashboard-aggregator
-	depends = ros-melodic-pr2-description
-	depends = ros-melodic-pr2-machine
-	source = ros-melodic-pr2-common-1.12.4.tar.gz::https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-pr2-msgs
+	depends = ros-noetic-pr2-dashboard-aggregator
+	depends = ros-noetic-pr2-description
+	depends = ros-noetic-pr2-machine
+	source = ros-noetic-pr2-common-1.12.4.tar.gz::https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz
 	sha256sums = 135c6947f7511bcb3644fa6c0cf5972c309516895737e83f8eeed2b2d069f009
 
-pkgname = ros-melodic-pr2-common
+pkgname = ros-noetic-pr2-common
 
diff --git a/PKGBUILD b/PKGBUILD
index 97e266d1e469..20f8e92e7b53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 pkgdesc="ROS - Metapackage for various PR2-related ROS packages"
 url='https://wiki.ros.org/pr2_common'
 
-pkgname='ros-melodic-pr2-common'
+pkgname='ros-noetic-pr2-common'
 pkgver='1.12.4'
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-pr2-msgs
-  ros-melodic-pr2-dashboard-aggregator
-  ros-melodic-pr2-description
-  ros-melodic-pr2-machine)
+ros_depends=(ros-noetic-pr2-msgs
+  ros-noetic-pr2-dashboard-aggregator
+  ros-noetic-pr2-description
+  ros-noetic-pr2-machine)
 depends=(${ros_depends[@]})
 
 _dir="pr2_common-${pkgver}/pr2_common"
@@ -25,24 +25,17 @@ sha256sums=('135c6947f7511bcb3644fa6c0cf5972c309516895737e83f8eeed2b2d069f009')
 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 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.7.so \
-        -DPYTHON_BASENAME=-python3.7 \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }