commit 3a9c476166dd60c069fd3fe51e6ef160194a5ec2
author Michel Lespinasse <walken@google.com> Tue Dec 20 02:39:54 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 20 02:39:54 2016 +0000
tree fc5487fd601251b802250f685cb22a14e789a142
parent c8afa714283d2001ac2a32ff4ffd0b51e78b668c
parent 771a6d4331e60a236920822bc4b97684a83f15d4

Merge "postbuild.sh: add force_version"

support/scripts/postbuild.sh

diff --git a/support/scripts/postbuild.sh b/support/scripts/postbuild.sh
index 84cc09f..d0a8e94 100755
--- a/support/scripts/postbuild.sh
+++ b/support/scripts/postbuild.sh
@@ -32,8 +32,8 @@
   exit 1;
 fi
 
-version="${PLATFORM_PREFIX}$(support/scripts/version.sh)"
-echo -n "$version" >"$TARGET_DIR/etc/version" 2>/dev/null
+version=$(support/scripts/version.sh "$TARGET_DIR/..")
+echo -n "$PLATFORM_PREFIX$version" >"$TARGET_DIR/etc/version" 2>/dev/null
 echo -n "fiberos" >"$TARGET_DIR/etc/os" 2>/dev/null
 
 if [ "$PROD" != "y" ]; then

support/scripts/version.sh

diff --git a/support/scripts/version.sh b/support/scripts/version.sh
index 582d638..a28e57e 100755
--- a/support/scripts/version.sh
+++ b/support/scripts/version.sh
@@ -2,6 +2,12 @@
 # Returns current version being built, without leading platform string
 # For ex. "-48-pre1-test-rel-739-gf1d6349"
 
+OUTPUT_DIR="$1"
+if [ -n "$OUTPUT_DIR" -a -r "$OUTPUT_DIR/force_version" ]; then
+  echo -n "-" && cat "$OUTPUT_DIR/force_version"
+  exit
+fi
+
 if support/scripts/is-repo.sh; then
   FORALL="repo forall -c"
 elif support/scripts/is-git.sh; then