upd to noetic, cmake vars, python

2 files changed, 17 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa1c048ed12c..bae65a987c12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-tf2-bullet
+pkgbase = ros-noetic-tf2-bullet
 	pkgdesc = ROS - tf2_bullet.
 	pkgver = 0.6.5
 	pkgrel = 1
@@ -7,16 +7,16 @@ pkgbase = ros-melodic-tf2-bullet
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-tf2
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-tf2
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-catkin
 	makedepends = bullet
 	makedepends = pkg-config
-	depends = ros-melodic-tf2
-	depends = ros-melodic-geometry-msgs
+	depends = ros-noetic-tf2
+	depends = ros-noetic-geometry-msgs
 	depends = bullet
-	source = ros-melodic-tf2-bullet-0.6.5.tar.gz::https://github.com/ros/geometry2/archive/0.6.5.tar.gz
+	source = ros-noetic-tf2-bullet-0.6.5.tar.gz::https://github.com/ros/geometry2/archive/0.6.5.tar.gz
 	sha256sums = 9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a
 
-pkgname = ros-melodic-tf2-bullet
+pkgname = ros-noetic-tf2-bullet
 
diff --git a/PKGBUILD b/PKGBUILD
index f1d32be3db1a..e1122a98d659 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,28 @@
 pkgdesc="ROS - tf2_bullet."
 url='https://www.wiki.ros.org/tf2_bullet'
 
-pkgname='ros-melodic-tf2-bullet'
+pkgname='ros-noetic-tf2-bullet'
 pkgver='0.6.5'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-tf2
-  ros-melodic-geometry-msgs
-  ros-melodic-catkin)
+ros_makedepends=(ros-noetic-tf2
+  ros-noetic-geometry-msgs
+  ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   bullet
   pkg-config)
 
-ros_depends=(ros-melodic-tf2
-  ros-melodic-geometry-msgs)
+ros_depends=(ros-noetic-tf2
+  ros-noetic-geometry-msgs)
 depends=(${ros_depends[@]}
   bullet)
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/tf2_bullet/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/tf2_bullet/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/geometry2-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -37,24 +37,17 @@ sha256sums=('9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a')
 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 2 ${srcdir}/${_dir}
-
   # Build project
   cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
         -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }