From e1e59ebd7cdaa18a7a683c0db74f8f19abe3d0a5 Mon Sep 17 00:00:00 2001 From: Ivo Raisr Date: Tue, 29 Aug 2017 16:13:02 +0200 Subject: [PATCH] Fix FMRI of built Solaris packages. --- solaris/build_solaris_package | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/solaris/build_solaris_package b/solaris/build_solaris_package index c4ca2c9a33..19781219d2 100755 --- a/solaris/build_solaris_package +++ b/solaris/build_solaris_package @@ -58,10 +58,11 @@ create_dirs() { } export_sources() { - printf "Exporting sources... " old_dir=$( pwd ) git_commit=$( cd $source_directory; git rev-parse HEAD ) + echo "Valgrind git commit: $git_commit." + printf "Exporting sources... " git clone ${GITREPO} ${SRCDIR} 2> $TMPDIR/git-clone-valgrind.log.stderr (( $? != 0 )) && fail "Failed to clone git repo from $source_directory." cd ${SRCDIR} @@ -72,12 +73,10 @@ export_sources() { } modify_ips_manifest() { - valgrind_commit=$( cd $source_directory; git rev-parse --short=11 HEAD ) - [[ -z $valgrind_commit ]] && fail "Failed to find Valgrind revision." - - echo "Valgrind commit: $valgrind_commit." + current_date=$( date '+%Y%m%d' ) + [[ -z $current_date ]] && fail "Failed to determine current date." - sed -i -e "s/VVVVV/${valgrind_commit}/" $SRCDIR/$IPS_MANIFEST + sed -i -e "s/VVVVV/${current_date}/" $SRCDIR/$IPS_MANIFEST } run_autogen() { -- 2.47.3