create ros-noetic-ackermann-steering-controller package

2 files changed, 52 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8d0c143fa7e..1562de63dbc1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-ackermann-steering-controller
+pkgbase = ros-noetic-ackermann-steering-controller
 	pkgdesc = ROS - Controller for a steer drive mobile base.
 	pkgver = 0.17.0
 	pkgrel = 1
@@ -11,29 +11,21 @@ pkgbase = ros-melodic-ackermann-steering-controller
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-diff-drive-controller
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-urdf
-	makedepends = ros-melodic-hardware-interface
-	makedepends = ros-melodic-controller-interface
-	makedepends = ros-melodic-nav-msgs
-	makedepends = ros-melodic-realtime-tools
-	makedepends = ros-melodic-pluginlib
-	makedepends = boost
-	depends = ros-melodic-tf
-	depends = ros-melodic-diff-drive-controller
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-urdf
-	depends = ros-melodic-hardware-interface
-	depends = ros-melodic-controller-interface
-	depends = ros-melodic-nav-msgs
-	depends = ros-melodic-realtime-tools
-	depends = ros-melodic-pluginlib
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-pluginlib
+	makedepends = ros-noetic-urdf
+	depends = ros-noetic-controller-interface
+	depends = ros-noetic-diff-drive-controller
+	depends = ros-noetic-hardware-interface
+	depends = ros-noetic-nav-msgs
+	depends = ros-noetic-realtime-tools
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-tf
+	depends = ros-noetic-pluginlib
+	depends = ros-noetic-urdf
 	depends = boost
-	source = ros-melodic-ackermann-steering-controller-0.17.0-.tar.gz::https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/ackermann_steering_controller/0.17.0-.tar.gz
-	sha256sums = 51080af6bb85aec200e53b327731f99e4df05bca13429348296b9d113ab86859
+	source = ros-noetic-ackermann-steering-controller-0.17.0.tar.gz::https://github.com/ros-controls/ros_controllers/archive/0.17.0.tar.gz
+	sha256sums = d1b46651956d19a36eedc628c2761526ec4769390e596bd76688abc45f59ace8
 
-pkgname = ros-melodic-ackermann-steering-controller
+pkgname = ros-noetic-ackermann-steering-controller
 
diff --git a/PKGBUILD b/PKGBUILD
index c9a65d412635..8a8932770ff1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,85 +1,64 @@
-# Script generated with create_pkgbuild.py
-# For more information: https://github.com/ros-melodic-arch/ros-build-tools-py3
 pkgdesc="ROS - Controller for a steer drive mobile base."
 url='http://wiki.ros.org/ackermann_steering_controller'
 
-pkgname='ros-melodic-ackermann-steering-controller'
+pkgname='ros-noetic-ackermann-steering-controller'
 pkgver='0.17.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-  ros-melodic-tf
-  ros-melodic-diff-drive-controller
-  ros-melodic-catkin
-  ros-melodic-roscpp
-  ros-melodic-urdf
-  ros-melodic-hardware-interface
-  ros-melodic-controller-interface
-  ros-melodic-nav-msgs
-  ros-melodic-realtime-tools
-  ros-melodic-pluginlib
+    ros-noetic-catkin
+    ros-noetic-pluginlib
+    ros-noetic-urdf
 )
 
 makedepends=(
-  'cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
-  boost
+    cmake
+    ros-build-tools
+    ${ros_makedepends[@]}
 )
 
 ros_depends=(
-  ros-melodic-tf
-  ros-melodic-diff-drive-controller
-  ros-melodic-roscpp
-  ros-melodic-urdf
-  ros-melodic-hardware-interface
-  ros-melodic-controller-interface
-  ros-melodic-nav-msgs
-  ros-melodic-realtime-tools
-  ros-melodic-pluginlib
+    ros-noetic-controller-interface
+    ros-noetic-diff-drive-controller
+    ros-noetic-hardware-interface
+    ros-noetic-nav-msgs
+    ros-noetic-realtime-tools
+    ros-noetic-roscpp
+    ros-noetic-tf
+    ros-noetic-pluginlib
+    ros-noetic-urdf
 )
 
 depends=(
-  ${ros_depends[@]}
-  boost
+    ${ros_depends[@]}
+    boost
 )
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/effort_controllers/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_controllers-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
-
-# Tarball version (faster download)
-_dir="ros_controllers-release-release-melodic-ackermann_steering_controller"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/ackermann_steering_controller/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('51080af6bb85aec200e53b327731f99e4df05bca13429348296b9d113ab86859')
+_dir="ros_controllers-${pkgver}/ackermann_steering_controller"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-controls/ros_controllers/archive/${pkgver}.tar.gz")
+sha256sums=('d1b46651956d19a36eedc628c2761526ec4769390e596bd76688abc45f59ace8')
 
 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
-
-  # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
+    # Use ROS environment variables
+    source /usr/share/ros-build-tools/clear-ros-env.sh
+    [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
-  # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
+    # Create build directory
+    [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+    cd ${srcdir}/build
 
-  # 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 \
-          -DSETUPTOOLS_DEB_LAYOUT=OFF
-  make
+    # Build project
+    cmake ${srcdir}/${_dir} \
+            -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+            -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+            -DPYTHON_EXECUTABLE=/usr/bin/python \
+            -DSETUPTOOLS_DEB_LAYOUT=OFF
+    make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+    cd "${srcdir}/build"
+    make DESTDIR="${pkgdir}/" install
 }
-