Skip to content

Commit b6c965d

Browse files
committed
Support for making releases in an ordered fashion
For now this entails: - git tag foo - RELEASE=foo make then manually verifying the selected (bar_defconfig) build. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
1 parent f08c53f commit b6c965d

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

bin/mkversion

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ VERSION=`git describe --tags --dirty 2>/dev/null`
3838

3939
# Are we are building an official release from master, do not print branchname.
4040
# Check if top commit is the tag, to support -betaXX etc.
41-
git describe --tags 2>/dev/null | grep "[0-9]\+\.[0-9]\+\.[0-9]\+-\{0,1\}[^-]*$" >/dev/null
41+
git describe --tags 2>/dev/null | grep "[0-9]\+\.[0-9]\+-r[0-9]\+" >/dev/null
4242
if [ $? -eq 0 -a -n "$RELEASE" ]; then
4343
print_version $VERSION
4444
else
4545
if [ -z "$VERSION" ]; then
46-
VERSION=`git describe --all --dirty --long |sed 's/heads\/\(.*\)/\1/'`
46+
VERSION=`git describe --dirty --long |sed 's/heads\/\(.*\)/\1/'`
4747
print_version $VERSION
4848
else
4949
print_version "$(git_branch_name)"$VERSION

board/common/post-build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/sh
22

3+
# Source .config for BR2_DEFCONFIG to figure out platform name
4+
. $BR2_CONFIG 2>/dev/null
5+
36
TARGET_DIR=$1
47

58
# Used for matching host and guest

board/common/post-image.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
2-
# Source .config in case we're building from distclean
3-
. $BR2_EXTERNAL/output/.config
2+
3+
# Source .config for BR2_DEFCONFIG to figure out platform name
4+
. $BR2_CONFIG 2>/dev/null
45

56
err=0
67
plf=`echo $BR2_DEFCONFIG | sed 's/.*_\(.*\)_defconfig.*$/\1/'`

0 commit comments

Comments
 (0)