diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2015-11-20 17:27:32 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:31:04 +0000 |
| commit | 11e6536bbed515a360870e3f0491c93dd8c9e098 (patch) | |
| tree | 85bfc0c4f6a6cc73a40b7eb9bf53f215e64fa20c /meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch | |
| parent | 43fffa763f87b80a2497a51d6bd827d2bf837a11 (diff) | |
| download | openembedded-core-contrib-11e6536bbed515a360870e3f0491c93dd8c9e098.tar.gz | |
iw: upgrade to version 4.3
Refreshed the following patches to work with this release:
1) 0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
2) separate-objdir.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch')
| -rw-r--r-- | meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch | 20 |
1 files changed, 6 insertions, 14 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 a0a77b2e54..2e52c80c05 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 @@ -1,6 +1,3 @@ -From 5310abba864cfe3a8b65af130729447604190b29 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Tue, 29 Nov 2011 17:03:27 +0100 Subject: [PATCH] iw: version.sh: don't use git describe for versioning It will detect top-level git repositories like the Angstrom setup-scripts and break. @@ -8,21 +5,18 @@ It will detect top-level git repositories like the Angstrom setup-scripts and br Upstream-Status: Pending Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +Signed-off-by: Maxin B. John <maxin.john@intel.com> --- - version.sh | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/version.sh b/version.sh -index 11d124b..5d423c4 100755 ---- a/version.sh -+++ b/version.sh +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="3.15" + VERSION="4.3" OUT="$1" -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then - git update-index --refresh --unmerged > /dev/null -- descr=$(git describe) +- descr=$(git describe --match=v*) - - # on git builds check that the version number above - # is correct... @@ -39,5 +33,3 @@ index 11d124b..5d423c4 100755 echo '#include "iw.h"' > "$OUT" echo "const char iw_version[] = \"$v\";" >> "$OUT" --- -1.7.7.3 |