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>

2 files changed, 8 insertions, 9 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
-
diff --git a/meta-oe/recipes-connectivity/iw/iw_3.11.bb b/meta-oe/recipes-connectivity/iw/iw_3.15.bb
index d72a1401c0..7800e905ee 100644
--- a/meta-oe/recipes-connectivity/iw/iw_3.11.bb
+++ b/meta-oe/recipes-connectivity/iw/iw_3.15.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
 
 DEPENDS = "libnl pkgconfig"
 
-SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.bz2 \
+SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
            file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
 "
 
-SRC_URI[md5sum] = "e633cf7c875c7d8b547abafc0d95f6c4"
-SRC_URI[sha256sum] = "09348d4f7371fad00c07cfb67b9e34f24403cbd9361f9634cfb4dff9cdd40139"
+SRC_URI[md5sum] = "ebb16e6c29b075e3a58b99552583fd79"
+SRC_URI[sha256sum] = "1223ebab68dc337f16ed80c45af37b78f112ea091e919eafe96a4cbd63942081"
 
 EXTRA_OEMAKE = ""