summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGon├žalo Camelo Neves Pereira2018-09-26 13:31:07 +0200
committerGon├žalo Camelo Neves Pereira2018-09-26 13:31:07 +0200
commit7fa83fad8d128c5385b113cbc74a15b9ee602263 (patch)
tree9e2c51c0814e74270efc5ff6e0cd920ac45322fe
parent59fe30c73ae838784aefeb9d674e4e39e0f93a8c (diff)
downloadaur-7fa83fad8d128c5385b113cbc74a15b9ee602263.tar.gz
Update
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD95
2 files changed, 42 insertions, 57 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 83a85ebf16c..50e9695f20b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,8 +9,8 @@ pkgbase = ros-melodic-rosbash
makedepends = ros-build-tools
makedepends = ros-melodic-catkin
depends = ros-melodic-catkin
- source = ros-melodic-rosbash::git+https://github.com/ros-gbp/ros-release.git
- sha256sums = SKIP
+ source = ros-melodic-rosbash-1.14.4-0.tar.gz::https://github.com/ros-gbp/ros-release/archive/release/melodic/rosbash/1.14.4-0.tar.gz
+ sha256sums = 6fbc312e0f21722eef820e2365c96a0a96e1ab8ff136fed53b72819533d0e820
pkgname = ros-melodic-rosbash
diff --git a/PKGBUILD b/PKGBUILD
index 6a3d0a870fc..1ccc59be1fd 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 - Assorted shell commands for using ros with bash."
url='http://www.ros.org/wiki/rosbash'
@@ -10,65 +10,50 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(
- ros-melodic-catkin
-)
+ros_makedepends=(ros-melodic-catkin)
+makedepends=('cmake' 'ros-build-tools'
+ ${ros_makedepends[@]})
-makedepends=(
- 'cmake'
- 'ros-build-tools'
- ${ros_makedepends[@]}
-)
+ros_depends=(ros-melodic-catkin)
+depends=(${ros_depends[@]})
-ros_depends=(
- ros-melodic-catkin
-)
+# Git version (e.g. for debugging)
+# _tag=release/melodic/rosbash/${pkgver}-${_pkgver_patch}
+# _dir=${pkgname}
+# source=("${_dir}"::"git+https://github.com/ros-gbp/ros-release.git"#tag=${_tag})
+# sha256sums=('SKIP')
-depends=(
- ${ros_depends[@]}
-)
-
-_dir=${pkgname}
-source=("${_dir}"::"git+https://github.com/ros-gbp/ros-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
-}
+# Tarball version (faster download)
+_dir="ros-release-release-melodic-rosbash-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros-release/archive/release/melodic/rosbash/${pkgver}-${_pkgver_patch}.tar.gz")
+sha256sums=('6fbc312e0f21722eef820e2365c96a0a96e1ab8ff136fed53b72819533d0e820')
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 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 \
- -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
+ # 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
+
+ # 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/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
}