diff options
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 | 42 |
1 files changed, 24 insertions, 18 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 | |||
| 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
| 8 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 8 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
| 9 | --- | 9 | --- |
| 10 | diff -Naur iw-4.3-origin/version.sh iw-4.3/version.sh | 10 | diff -Naur iw-4.7-orig/version.sh iw-4.7/version.sh |
| 11 | --- iw-4.3-origin/version.sh 2015-11-20 16:37:58.762077162 +0200 | 11 | --- iw-4.7-orig/version.sh 2016-05-31 12:52:46.000000000 +0300 |
| 12 | +++ iw-4.3/version.sh 2015-11-20 16:52:05.526491150 +0200 | 12 | +++ iw-4.7/version.sh 2016-06-01 11:21:58.307409060 +0300 |
| 13 | @@ -3,21 +3,7 @@ | 13 | @@ -15,27 +15,7 @@ |
| 14 | VERSION="4.3" | 14 | SRC_DIR=$(cd ${SRC_DIR}; pwd) |
| 15 | OUT="$1" | 15 | cd "${SRC_DIR}" |
| 16 | 16 | ||
| 17 | -v="" | ||
| 17 | -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then | 18 | -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then |
| 18 | - git update-index --refresh --unmerged > /dev/null | 19 | - git update-index --refresh --unmerged > /dev/null |
| 19 | - descr=$(git describe --match=v*) | 20 | - descr=$(git describe --match=v* 2>/dev/null) |
| 20 | - | 21 | - if [ $? -eq 0 ]; then |
| 21 | - # on git builds check that the version number above | 22 | - # on git builds check that the version number above |
| 22 | - # is correct... | 23 | - # is correct... |
| 23 | - [ "${descr%%-*}" = "v$VERSION" ] || exit 2 | 24 | - if [ "${descr%%-*}" = "v$VERSION" ]; then |
| 25 | - v="${descr#v}" | ||
| 26 | - if git diff-index --name-only HEAD | read dummy ; then | ||
| 27 | - v="$v"-dirty | ||
| 28 | - fi | ||
| 29 | - fi | ||
| 30 | - fi | ||
| 31 | -fi | ||
| 24 | - | 32 | - |
| 25 | - v="${descr#v}" | 33 | -# set to the default version when failed to get the version |
| 26 | - if git diff-index --name-only HEAD | read dummy ; then | 34 | -# information with git |
| 27 | - v="$v"-dirty | 35 | -if [ -z "${v}" ]; then |
| 28 | - fi | 36 | - v="$VERSION" |
| 29 | -else | ||
| 30 | - v="$VERSION" | ||
| 31 | -fi | 37 | -fi |
| 32 | +v="$VERSION" | 38 | +v="$VERSION" |
| 33 | 39 | ||