summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch20
-rw-r--r--meta/recipes-connectivity/iw/iw/separate-objdir.patch36
-rw-r--r--meta/recipes-connectivity/iw/iw_4.3.bb (renamed from meta/recipes-connectivity/iw/iw_4.1.bb)4
3 files changed, 15 insertions, 45 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 @@
1From 5310abba864cfe3a8b65af130729447604190b29 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 29 Nov 2011 17:03:27 +0100
4Subject: [PATCH] iw: version.sh: don't use git describe for versioning 1Subject: [PATCH] iw: version.sh: don't use git describe for versioning
5 2
6It will detect top-level git repositories like the Angstrom setup-scripts and break. 3It 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
8Upstream-Status: Pending 5Upstream-Status: Pending
9 6
10Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 7Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
8Signed-off-by: Maxin B. John <maxin.john@intel.com>
11--- 9---
12 version.sh | 16 +--------------- 10diff -Naur iw-4.3-origin/version.sh iw-4.3/version.sh
13 1 file changed, 1 insertion(+), 15 deletions(-) 11--- iw-4.3-origin/version.sh 2015-11-20 16:37:58.762077162 +0200
14 12+++ iw-4.3/version.sh 2015-11-20 16:52:05.526491150 +0200
15diff --git a/version.sh b/version.sh
16index 11d124b..5d423c4 100755
17--- a/version.sh
18+++ b/version.sh
19@@ -3,21 +3,7 @@ 13@@ -3,21 +3,7 @@
20 VERSION="3.15" 14 VERSION="4.3"
21 OUT="$1" 15 OUT="$1"
22 16
23-if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then 17-if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
24- git update-index --refresh --unmerged > /dev/null 18- git update-index --refresh --unmerged > /dev/null
25- descr=$(git describe) 19- descr=$(git describe --match=v*)
26- 20-
27- # on git builds check that the version number above 21- # on git builds check that the version number above
28- # is correct... 22- # is correct...
@@ -39,5 +33,3 @@ index 11d124b..5d423c4 100755
39 33
40 echo '#include "iw.h"' > "$OUT" 34 echo '#include "iw.h"' > "$OUT"
41 echo "const char iw_version[] = \"$v\";" >> "$OUT" 35 echo "const char iw_version[] = \"$v\";" >> "$OUT"
42--
431.7.7.3
diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch
index 883f8b2c60..0ea6a52789 100644
--- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch
+++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch
@@ -1,6 +1,3 @@
1From 9e27fc2e1b3dc8c36ef6a502edffc3a3d84d9dd9 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Wed, 26 Aug 2015 17:23:48 -0700
4Subject: [PATCH] Support separation of SRCDIR and OBJDIR 1Subject: [PATCH] Support separation of SRCDIR and OBJDIR
5 2
6Typical use of VPATH to locate the sources. 3Typical use of VPATH to locate the sources.
@@ -8,26 +5,21 @@ Typical use of VPATH to locate the sources.
8Upstream-Status: Pending 5Upstream-Status: Pending
9 6
10Signed-off-by: Christopher Larson <chris_larson@mentor.com> 7Signed-off-by: Christopher Larson <chris_larson@mentor.com>
11 8Signed-off-by: Maxin B. John <maxin.john@intel.com>
12--- 9---
13 Makefile | 7 +++++-- 10diff -Naur iw-4.3-origin/Makefile iw-4.3/Makefile
14 version.sh | 2 +- 11--- iw-4.3-origin/Makefile 2015-11-20 16:37:58.752077287 +0200
15 2 files changed, 6 insertions(+), 3 deletions(-) 12+++ iw-4.3/Makefile 2015-11-20 16:57:15.510615815 +0200
16 13@@ -1,5 +1,7 @@
17diff --git a/Makefile b/Makefile
18index 548591a..da8d33a 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -1,5 +1,8 @@
22 MAKEFLAGS += --no-print-directory 14 MAKEFLAGS += --no-print-directory
23 15-
24+SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) 16+SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
25+OBJDIR ?= $(PWD) 17+OBJDIR ?= $(PWD)
26+VPATH = $(SRCDIR) 18+VPATH = $(SRCDIR)
27 PREFIX ?= /usr 19 PREFIX ?= /usr
28 SBINDIR ?= $(PREFIX)/sbin 20 SBINDIR ?= $(PREFIX)/sbin
29 MANDIR ?= $(PREFIX)/share/man 21 MANDIR ?= $(PREFIX)/share/man
30@@ -95,11 +98,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) 22@@ -95,11 +97,11 @@
31 version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ 23 version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \
32 $(wildcard .git/index .git/refs/tags) 24 $(wildcard .git/index .git/refs/tags)
33 @$(NQ) ' GEN ' $@ 25 @$(NQ) ' GEN ' $@
@@ -41,17 +33,3 @@ index 548591a..da8d33a 100644
41 33
42 ifeq ($(IW_ANDROID_BUILD),) 34 ifeq ($(IW_ANDROID_BUILD),)
43 iw: $(OBJS) 35 iw: $(OBJS)
44diff --git a/version.sh b/version.sh
45index 5354383..fa954cf 100755
46--- a/version.sh
47+++ b/version.sh
48@@ -5,5 +5,5 @@ OUT="$1"
49
50 v="$VERSION"
51
52-echo '#include "iw.h"' > "$OUT"
53+echo '#include <iw.h>' > "$OUT"
54 echo "const char iw_version[] = \"$v\";" >> "$OUT"
55--
562.2.1
57
diff --git a/meta/recipes-connectivity/iw/iw_4.1.bb b/meta/recipes-connectivity/iw/iw_4.3.bb
index fafb0e3c9e..6865e7ad63 100644
--- a/meta/recipes-connectivity/iw/iw_4.1.bb
+++ b/meta/recipes-connectivity/iw/iw_4.3.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
14 file://separate-objdir.patch \ 14 file://separate-objdir.patch \
15" 15"
16 16
17SRC_URI[md5sum] = "68c282285c71c956069957e9ca10a6a7" 17SRC_URI[md5sum] = "5ca622a270687d6862c9024fab266871"
18SRC_URI[sha256sum] = "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9c8f33d" 18SRC_URI[sha256sum] = "2a853d95ffbd2b06c058b40ef4e6fa76a52c2709b05fb1976761fe13e9d9e39f"
19 19
20inherit pkgconfig 20inherit pkgconfig
21 21