diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2016-06-01 16:25:55 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:36:24 +0100 |
| commit | 0c6fc9a01ba58adc221f04cc79ece7efc16c0ee7 (patch) | |
| tree | 1ac49b9822121e8174452b0a6af76f1a927d937f /meta/recipes-connectivity/iw | |
| parent | 77187701e35e858835ae51b3ac089a385e97657a (diff) | |
| download | openembedded-core-contrib-0c6fc9a01ba58adc221f04cc79ece7efc16c0ee7.tar.gz | |
iw: update to version 4.7
4.3 -> 4.7
Refreshed the patch for new version:
1) 0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iw')
| -rw-r--r-- | meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-connectivity/iw/iw_4.7.bb (renamed from meta/recipes-connectivity/iw/iw_4.3.bb) | 4 |
2 files changed, 26 insertions, 20 deletions
diff --git a/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch index 2e52c80c05..715b88d466 100644 --- a/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch +++ b/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch @@ -7,27 +7,33 @@ Upstream-Status: Pending Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Maxin B. John <maxin.john@intel.com> --- -diff -Naur iw-4.3-origin/version.sh iw-4.3/version.sh ---- iw-4.3-origin/version.sh 2015-11-20 16:37:58.762077162 +0200 -+++ iw-4.3/version.sh 2015-11-20 16:52:05.526491150 +0200 -@@ -3,21 +3,7 @@ - VERSION="4.3" - OUT="$1" +diff -Naur iw-4.7-orig/version.sh iw-4.7/version.sh +--- iw-4.7-orig/version.sh 2016-05-31 12:52:46.000000000 +0300 ++++ iw-4.7/version.sh 2016-06-01 11:21:58.307409060 +0300 +@@ -15,27 +15,7 @@ + SRC_DIR=$(cd ${SRC_DIR}; pwd) + cd "${SRC_DIR}" +-v="" -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then -- git update-index --refresh --unmerged > /dev/null -- descr=$(git describe --match=v*) -- -- # on git builds check that the version number above -- # is correct... -- [ "${descr%%-*}" = "v$VERSION" ] || exit 2 +- git update-index --refresh --unmerged > /dev/null +- descr=$(git describe --match=v* 2>/dev/null) +- if [ $? -eq 0 ]; then +- # on git builds check that the version number above +- # is correct... +- if [ "${descr%%-*}" = "v$VERSION" ]; then +- v="${descr#v}" +- if git diff-index --name-only HEAD | read dummy ; then +- v="$v"-dirty +- fi +- fi +- fi +-fi - -- v="${descr#v}" -- if git diff-index --name-only HEAD | read dummy ; then -- v="$v"-dirty -- fi --else -- v="$VERSION" +-# set to the default version when failed to get the version +-# information with git +-if [ -z "${v}" ]; then +- v="$VERSION" -fi +v="$VERSION" diff --git a/meta/recipes-connectivity/iw/iw_4.3.bb b/meta/recipes-connectivity/iw/iw_4.7.bb index 6865e7ad63..e9f414129c 100644 --- a/meta/recipes-connectivity/iw/iw_4.3.bb +++ b/meta/recipes-connectivity/iw/iw_4.7.bb @@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ file://separate-objdir.patch \ " -SRC_URI[md5sum] = "5ca622a270687d6862c9024fab266871" -SRC_URI[sha256sum] = "2a853d95ffbd2b06c058b40ef4e6fa76a52c2709b05fb1976761fe13e9d9e39f" +SRC_URI[md5sum] = "19d1edd276b2ac0c6cccfc7ae8d2b732" +SRC_URI[sha256sum] = "758092229f13d691968060a0ad41364ba8eb8da4503626c20233a5b1eb33b4d9" inherit pkgconfig |