diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 37 |
2 files changed, 31 insertions, 28 deletions
@@ -1,20 +1,22 @@ -pkgbase = ros-melodic-ros-base +pkgbase = ros-noetic-ros-base pkgdesc = ROS - A metapackage which extends ros_core and includes other basic non-robot tools like actionlib, dynamic reconfigure, nodelets, and pluginlib. pkgver = 1.4.1 - pkgrel = 2 + pkgrel = 1 url = https://wiki.ros.org/ros_base arch = any license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-bond-core - depends = ros-melodic-nodelet-core - depends = ros-melodic-dynamic-reconfigure - depends = ros-melodic-ros-core - depends = ros-melodic-actionlib - source = ros-melodic-ros-base-1.4.1.tar.gz::https://github.com/ros/metapackages/archive/1.4.1.tar.gz + makedepends = ros-noetic-catkin + depends = ros-noetic-bond-core + depends = ros-noetic-nodelet-core + depends = ros-noetic-dynamic-reconfigure + depends = ros-noetic-ros-core + depends = ros-noetic-actionlib + source = ros-noetic-ros-base-1.4.1.tar.gz::https://github.com/ros/metapackages/archive/1.4.1.tar.gz + source = https://patch-diff.githubusercontent.com/raw/ros/metapackages/pull/31.patch sha256sums = ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1 + sha256sums = a8648852cff7b2740c5fe523b78309557b7f58e5c010e71a94c341b8cbfd5ba2 -pkgname = ros-melodic-ros-base +pkgname = ros-noetic-ros-base @@ -3,14 +3,14 @@ pkgdesc="ROS - A metapackage which extends ros_core and includes other basic non-robot tools like actionlib, dynamic reconfigure, nodelets, and pluginlib." url='https://wiki.ros.org/ros_base' -pkgname='ros-melodic-ros-base' +pkgname='ros-noetic-ros-base' pkgver='1.4.1' arch=('any') -pkgrel=2 +pkgrel=1 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -20,11 +20,11 @@ makedepends=( ) ros_depends=( - ros-melodic-bond-core - ros-melodic-nodelet-core - ros-melodic-dynamic-reconfigure - ros-melodic-ros-core - ros-melodic-actionlib + ros-noetic-bond-core + ros-noetic-nodelet-core + ros-noetic-dynamic-reconfigure + ros-noetic-ros-core + ros-noetic-actionlib ) depends=( @@ -32,30 +32,31 @@ depends=( ) _dir="metapackages-${pkgver}/ros_base" -source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/metapackages/archive/${pkgver}.tar.gz") -sha256sums=('ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1') +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/metapackages/archive/${pkgver}.tar.gz" + "https://patch-diff.githubusercontent.com/raw/ros/metapackages/pull/31.patch") +sha256sums=('ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1' + 'a8648852cff7b2740c5fe523b78309557b7f58e5c010e71a94c341b8cbfd5ba2') + +prepare() { + cd ${srcdir}/${_dir}/.. + patch -p1 < ${srcdir}/31.patch +} 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 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ - -DPYTHON_BASENAME=.cpython-37m \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |