[ARVADOS] updated: 2.1.0-2244-g0e81bf238
Git user
git at public.arvados.org
Fri Apr 8 14:08:11 UTC 2022
Summary of changes:
build/run-library.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
via 0e81bf2385f88c9252ecc096204d51275d25b7ed (commit)
from 4bbeec35d296b6a655b78a45e5433c9a579acd01 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 0e81bf2385f88c9252ecc096204d51275d25b7ed
Author: Ward Vandewege <ward at curii.com>
Date: Fri Apr 8 10:07:11 2022 -0400
Fix the libarvados-perl package build. Fix the version number for that
package.
No issue #
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index fa2be6ac7..47c5e2a39 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -698,12 +698,15 @@ handle_arvados_src () {
# Usage: handle_libarvados_perl
handle_libarvados_perl () {
- if [[ -n "$ONLY_BUILD" ]] || [[ "$ONLY_BUILD" != "libarvados-perl" ]] ; then
+ if [[ -n "$ONLY_BUILD" ]] && [[ "$ONLY_BUILD" != "libarvados-perl" ]] ; then
debug_echo -e "Skipping build of libarvados-perl package."
return 0
fi
- cd "$WORKSPACE/sdk/perl"
+ # The perl sdk subdirectory is so old that it has no tag in its history,
+ # which causes version_at_commit.sh to fail. Just rebuild it every time.
+ cd "$WORKSPACE"
libarvados_perl_version="$(version_from_git)"
+ cd "$WORKSPACE/sdk/perl"
cd $WORKSPACE/packages/$TARGET
test_package_presence libarvados-perl "$libarvados_perl_version"
@@ -721,7 +724,7 @@ handle_libarvados_perl () {
perl Makefile.PL INSTALL_BASE=install >"$STDOUT_IF_DEBUG" && \
make install INSTALLDIRS=perl >"$STDOUT_IF_DEBUG" && \
fpm_build "$WORKSPACE/sdk/perl" install/lib/=/usr/share libarvados-perl \
- dir "$(version_from_git)" install/man/=/usr/share/man \
+ dir "$libarvados_perl_version" install/man/=/usr/share/man \
"$WORKSPACE/apache-2.0.txt=/usr/share/doc/libarvados-perl/apache-2.0.txt" && \
mv --no-clobber libarvados-perl*.$FORMAT "$WORKSPACE/packages/$TARGET/"
fi
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list