upd to noetic, cmake vars, python

1 files changed, 15 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c00f43ce5c58..cfd342490ef8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,30 @@
 pkgdesc="ROS - The controller manager."
 url='https://github.com/ros-controls/ros_control/wiki'
 
-pkgname='ros-melodic-controller-manager'
+pkgname='ros-noetic-controller-manager'
 pkgver='0.15.1'
 _pkgver_patch=0
 arch=('any')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-pluginlib
-  ros-melodic-controller-manager-msgs
-  ros-melodic-catkin
-  ros-melodic-hardware-interface
-  ros-melodic-controller-interface
-  ros-melodic-rostest)
+ros_makedepends=(ros-noetic-pluginlib
+  ros-noetic-controller-manager-msgs
+  ros-noetic-catkin
+  ros-noetic-hardware-interface
+  ros-noetic-controller-interface
+  ros-noetic-rostest)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-pluginlib
-  ros-melodic-controller-manager-msgs
-  ros-melodic-hardware-interface
-  ros-melodic-controller-interface)
+ros_depends=(ros-noetic-pluginlib
+  ros-noetic-controller-manager-msgs
+  ros-noetic-hardware-interface
+  ros-noetic-controller-interface)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/controller_manager/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/controller_manager/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/ros_control-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -39,24 +39,17 @@ sha256sums=('adf1a9d1fd10f4d89e91c8279d1278d9cd301767b658c143810479b2d10eedca')
 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.7m \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-        -DPYTHON_BASENAME=.cpython-37m \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }