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 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" |