Update mkit

mkit/include/release.sh

@@ -23,6 +23,9 @@ __release() {
     # Span release routines: make a signed tag, check branch
     # and update release branch
     #
+    # FIXME: Using PRERELEASE as build.sh:get_version() does may not be
+    #        compatible with this release strategy
+    #
     local level=$1
     git rev-parse HEAD >&/dev/null || die "cannot release outside git repo"
     local lastfile=$(git diff-tree --no-commit-id --name-only -r HEAD)
@@ -34,18 +37,29 @@ __release() {
     local newver=$(__make_ver $level ${lasttag#v})
     local newtag=v$newver
     local higher=$(echo -e "$oldtag\n$newtag" | sort -V | tail -n1)
-    test "$newtag" = "$higher"     || die "generated tag looks older: $oldtag<$newtag"
 
-    grep -qw "$newver" config.mk   || die "new version not in config.mk: $newver"
-    test -n "$lasttag"             || die "cannot find last tag"
-    grep '^....... WIP ' <<<"$changelog" && die "WIP commit since $lasttag"
-    grep -qw "$curbranch" <<<"$RELSRC"   || die "you are not on RELSRC branch: $RELSRC"
-    test -z "$dirt"                || die "tree is dirty: $dirt"
+    test "$newtag" = "$higher" \
+     || die "generated tag looks older: $oldtag<$newtag"
+
+    grep -qw "$newver" config.mk \
+     || die "new version not in config.mk: $newver"
+
+    test -n "$lasttag" \
+     || die "cannot find last tag"
+
+    grep '^....... WIP ' <<<"$changelog" \
+     && die "WIP commit since $lasttag"
+
+    grep -qw "$curbranch" <<<"$RELSRC" \
+     || die "you are not on RELSRC branch: $RELSRC"
+
+    test -z "$dirt" \
+     || die "tree is dirty: $dirt"
 
     # FIXME: Have user prepare proper message with changelog
 
     set -e
-    git tag -m "$MKIT_PROJNAME $newtag-$STAGE - $CODENAME" $newtag
+    git tag -m "$MKIT_PROJNAME $newtag - $CODENAME" $newtag
     git branch -f $RELDST $newtag
 }