summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-09-08 14:50:51 +0200
committerGonçalo Camelo Neves Pereira2018-09-08 14:50:51 +0200
commiteb69b4a54b38eda050ec6d3859027dd4483f4c2b (patch)
tree22368e7d9ad1043537a2b4694641100dda8e8495
parentd63c26b552f3d9baedfe6a433b5de45748a39896 (diff)
downloadaur-eb69b4a54b38eda050ec6d3859027dd4483f4c2b.tar.gz
Update!
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD103
2 files changed, 62 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 045b554d841..3a8c1e78f93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,10 +14,10 @@ pkgbase = ros-melodic-diagnostic-common-diagnostics
depends = ros-melodic-diagnostic-updater
depends = ros-melodic-tf
depends = ros-melodic-rospy
- depends = python2-psutil
depends = hddtemp
- source = ros-melodic-diagnostic-common-diagnostics-1.9.3-0.tar.gz::https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostic_common_diagnostics/1.9.3-0.tar.gz
- sha256sums = e9729593c5e73825e769d670d78ba809db061ffb344132201020eae878c1359c
+ depends = python-psutil
+ source = ros-melodic-diagnostic-common-diagnostics::git+https://github.com/ros-gbp/diagnostics-release.git
+ sha256sums = SKIP
pkgname = ros-melodic-diagnostic-common-diagnostics
diff --git a/PKGBUILD b/PKGBUILD
index 6f154f4cb81..c6b61b28179 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
+# Script generated with import_catkin_packages.py.
+# For more information: https://github.com/bchretien/arch-ros-stacks.
pkgdesc="ROS - diagnostic_common_diagnostics."
url='http://ros.org/wiki/diagnostic_common_diagnostics'
@@ -10,57 +10,72 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-melodic-diagnostic-updater
- ros-melodic-rostest
- ros-melodic-catkin
- ros-melodic-rospy)
-makedepends=('cmake' 'ros-build-tools'
- ${ros_makedepends[@]})
+ros_makedepends=(
+ ros-melodic-diagnostic-updater
+ ros-melodic-rostest
+ ros-melodic-catkin
+ ros-melodic-rospy
+)
-ros_depends=(ros-melodic-diagnostic-updater
- ros-melodic-tf
- ros-melodic-rospy)
-depends=(${ros_depends[@]}
- python2-psutil
- hddtemp)
+makedepends=(
+ 'cmake'
+ 'ros-build-tools'
+ ${ros_makedepends[@]}
+)
-# Git version (e.g. for debugging)
-# _tag=release/melodic/diagnostic_common_diagnostics/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/diagnostics-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+ ros-melodic-diagnostic-updater
+ ros-melodic-tf
+ ros-melodic-rospy
+)
-# Tarball version (faster download)
-_dir="diagnostics-release-release-melodic-diagnostic_common_diagnostics-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostic_common_diagnostics/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('e9729593c5e73825e769d670d78ba809db061ffb344132201020eae878c1359c')
+depends=(
+ ${ros_depends[@]}
+ hddtemp
+ python-psutil
+)
+
+_dir=${pkgname}
+source=("${_dir}"::"git+https://github.com/ros-gbp/diagnostics-release.git")
+sha256sums=('SKIP')
+
+prepare() {
+ cd ${srcdir}/${_dir}
+ git checkout upstream
+ _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g')
+
+ if [ -d ${_pkgname} ]; then
+ git subtree split -P ${_pkgname} --branch ${_pkgname}
+ git checkout ${_pkgname}
+ fi
+}
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
+ # 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
+ # 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 2 ${srcdir}/${_dir}
+ # 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/python2 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPYTHON_BASENAME=-python2.7 \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
- make
+ # Build the 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 \
+ -DSETUPTOOLS_DEB_LAYOUT=OFF
+ make
}
package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}/" install
}