iw: drop redundant downstream patch

A similar fix has already been applied upstream, making this patch
unnecessary.

Remove the downstream patch to avoid duplication and keep the tree
in sync with upstream.

Upstream commit:
https://kernel.googlesource.com/pub/scm/linux/kernel/git/jberg/iw/+/26e074a04287919a848da997ab71b982ec404ddf%5E%21/#F0

Signed-off-by: Maxin John <maxin.john@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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
deleted file mode 100644 (file)
index 715b88d..0000000
--- a/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.
-
-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.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* 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
--
--# set to the default version when failed to get the version
--# information with git
--if [ -z "${v}" ]; then
--    v="$VERSION"
--fi
-+v="$VERSION"
- 
- echo '#include "iw.h"' > "$OUT"
- echo "const char iw_version[] = \"$v\";" >> "$OUT"

diff --git a/meta/recipes-connectivity/iw/iw_6.17.bb b/meta/recipes-connectivity/iw/iw_6.17.bb
index a9a4695d39d0a04806cd727502e81d4cbf59390a..f3e80c3697e2e7d057fdbd85a122e7a45e957afb 100644 (file)
--- a/meta/recipes-connectivity/iw/iw_6.17.bb
+++ b/meta/recipes-connectivity/iw/iw_6.17.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
 DEPENDS = "libnl"
 
 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 \
            file://separate-objdir.patch \
 "