diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch')
-rw-r--r-- | meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch new file mode 100644 index 000000000..e64dd0ad9 --- /dev/null +++ b/meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 5310abba864cfe3a8b65af130729447604190b29 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 29 Nov 2011 17:03:27 +0100 | ||
4 | Subject: [PATCH] iw: version.sh: don't use git describe for versioning | ||
5 | |||
6 | It will detect top-level git repositories like the Angstrom setup-scripts and break. | ||
7 | |||
8 | Upstream-Status: Unknown | ||
9 | |||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | --- | ||
12 | version.sh | 16 +--------------- | ||
13 | 1 file changed, 1 insertion(+), 15 deletions(-) | ||
14 | |||
15 | diff --git a/version.sh b/version.sh | ||
16 | index 11d124b..5d423c4 100755 | ||
17 | --- a/version.sh | ||
18 | +++ b/version.sh | ||
19 | @@ -3,21 +3,7 @@ | ||
20 | VERSION="3.15" | ||
21 | OUT="$1" | ||
22 | |||
23 | -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then | ||
24 | - git update-index --refresh --unmerged > /dev/null | ||
25 | - descr=$(git describe) | ||
26 | - | ||
27 | - # on git builds check that the version number above | ||
28 | - # is correct... | ||
29 | - [ "${descr%%-*}" = "v$VERSION" ] || exit 2 | ||
30 | - | ||
31 | - v="${descr#v}" | ||
32 | - if git diff-index --name-only HEAD | read dummy ; then | ||
33 | - v="$v"-dirty | ||
34 | - fi | ||
35 | -else | ||
36 | - v="$VERSION" | ||
37 | -fi | ||
38 | +v="$VERSION" | ||
39 | |||
40 | echo '#include "iw.h"' > "$OUT" | ||
41 | echo "const char iw_version[] = \"$v\";" >> "$OUT" | ||
42 | -- | ||
43 | 1.7.7.3 | ||