summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
2 files changed, 8 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2fc20e4b20f2..c09e69285e25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-tracetools
+pkgbase = ros-noetic-tracetools
pkgdesc = ROS - Wrapper interface for tracing libraries.
pkgver = 0.2.1
pkgrel = 3
@@ -11,11 +11,11 @@ pkgbase = ros-melodic-tracetools
license = APLv2
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
+ makedepends = ros-noetic-catkin
makedepends = boost
makedepends = pkg-config
- source = ros-melodic-tracetools-0.2.1.tar.gz::https://github.com/bosch-robotics-cr/tracetools/archive/0.2.1.tar.gz
+ source = ros-noetic-tracetools-0.2.1.tar.gz::https://github.com/bosch-robotics-cr/tracetools/archive/0.2.1.tar.gz
sha256sums = 3a2aa03551d6de84939260bb4e02b528bec53de81f0bebf44cc4f4610470eaff
-pkgname = ros-melodic-tracetools
+pkgname = ros-noetic-tracetools
diff --git a/PKGBUILD b/PKGBUILD
index 23adc4515f7d..50300695a020 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
pkgdesc="ROS - Wrapper interface for tracing libraries."
url='https://github.com/bosch-robotics-cr/tracetools'
-pkgname='ros-melodic-tracetools'
+pkgname='ros-noetic-tracetools'
pkgver='0.2.1'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgrel=3
license=('APLv2')
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]}
boost
@@ -25,20 +25,16 @@ sha256sums=('3a2aa03551d6de84939260bb4e02b528bec53de81f0bebf44cc4f4610470eaff')
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/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make