aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-08-17 23:21:12 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-21 21:35:07 +0200
commitc73e26932dcbb8bbe1895ba969e0c41cd9bbf850 (patch)
tree2cc924324ba9a98d9dc7334e535fc7e4ceba7c4e /meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
parentf17c1486c15e35006891be9d53b2175364afe363 (diff)
downloadmeta-openembedded-contrib-c73e26932dcbb8bbe1895ba969e0c41cd9bbf850.tar.gz
iw: uprev to version 3.15
- change to use tar.gz since bz2 is no longer provided in upstream - adjust the patch for new version Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch11
1 files changed, 5 insertions, 6 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
index 97c00cd2d2..e64dd0ad91 100644
--- 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
@@ -9,18 +9,18 @@ Upstream-Status: Unknown
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
- version.sh | 16 +---------------
- 1 files changed, 1 insertions(+), 15 deletions(-)
+ version.sh | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/version.sh b/version.sh
-index 3fb9f6d..e4a56cb 100755
+index 11d124b..5d423c4 100755
--- a/version.sh
+++ b/version.sh
@@ -3,21 +3,7 @@
- VERSION="3.2"
+ VERSION="3.15"
OUT="$1"
--if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+-if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
- git update-index --refresh --unmerged > /dev/null
- descr=$(git describe)
-
@@ -41,4 +41,3 @@ index 3fb9f6d..e4a56cb 100755
echo "const char iw_version[] = \"$v\";" >> "$OUT"
--
1.7.7.3
-