| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Subject: [PATCH] iw: version.sh: don't use git describe for versioning |
| 2 | |
| 3 | It will detect top-level git repositories like the Angstrom setup-scripts and break. |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | |
| 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9 | --- |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 10 | diff -Naur iw-4.3-origin/version.sh iw-4.3/version.sh |
| 11 | --- iw-4.3-origin/version.sh 2015-11-20 16:37:58.762077162 +0200 |
| 12 | +++ iw-4.3/version.sh 2015-11-20 16:52:05.526491150 +0200 |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 13 | @@ -3,21 +3,7 @@ |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 14 | VERSION="4.3" |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 15 | OUT="$1" |
| 16 | |
| 17 | -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then |
| 18 | - git update-index --refresh --unmerged > /dev/null |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19 | - descr=$(git describe --match=v*) |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 20 | - |
| 21 | - # on git builds check that the version number above |
| 22 | - # is correct... |
| 23 | - [ "${descr%%-*}" = "v$VERSION" ] || exit 2 |
| 24 | - |
| 25 | - v="${descr#v}" |
| 26 | - if git diff-index --name-only HEAD | read dummy ; then |
| 27 | - v="$v"-dirty |
| 28 | - fi |
| 29 | -else |
| 30 | - v="$VERSION" |
| 31 | -fi |
| 32 | +v="$VERSION" |
| 33 | |
| 34 | echo '#include "iw.h"' > "$OUT" |
| 35 | echo "const char iw_version[] = \"$v\";" >> "$OUT" |