From 86da5a104758a199099eee1446f27cdd237754e1 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 11 Nov 2016 07:47:42 -0800
Subject: [PATCH] scripts/mkimage: fix generation of version string
use git tag if we are at a given tag. use timestamp otherwise
---
scripts/mkimage-yaml.sh | 6 ------
scripts/mkimage.sh | 11 ++++++++++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/scripts/mkimage-yaml.sh b/scripts/mkimage-yaml.sh
index 0170f3ee0013..466ee88a7545 100755
--- a/scripts/mkimage-yaml.sh
+++ b/scripts/mkimage-yaml.sh
@@ -34,12 +34,6 @@ fi
[ -n "$arch" ] || arch=$(apk --print-arch)
-if [ -z "$release" ]; then
- release=$(git describe --always)
- if git describe --exact-match >/dev/null 2>&1; then
- release=${release#v}
- fi
-fi
for image; do
filepath="$releasedir/${image##*/}"
diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh
index 983a2ec47d41..b8203fb2052e 100644
--- a/scripts/mkimage.sh
+++ b/scripts/mkimage.sh
@@ -29,7 +29,6 @@ _simulate=""
_checksum=""
OUTDIR="$PWD"
-RELEASE="${build_date}"
msg() {
if [ -n "$quiet" ]; then return 0; fi
@@ -208,6 +207,15 @@ while [ $# -gt 0 ]; do
esac
done
+if [ -z "$RELEASE" ]; then
+ if git describe --exact-match >/dev/null 2>&1; then
+ RELEASE=$(git describe --always)
+ RELEASE=${RELEASE#v}
+ else
+ RELEASE="${build_date}"
+ fi
+fi
+
# setup defaults
if [ -z "$WORKDIR" ]; then
WORKDIR="$(mktemp -d -t mkimage.XXXXXX)"
@@ -253,3 +261,4 @@ for ARCH in $req_arch; do
(build_profile) || exit 1
done
done
+echo "Images generated in $OUTDIR"
--
GitLab