mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

iw: upgrade to version 4.3

Browse Source 
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

(From OE-Core rev: 11e6536bbed515a360870e3f0491c93dd8c9e098)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John
2015-11-20 17:27:32 +02:00
committed by Richard Purdie
parent 15969ae3aa
commit 35945fd3c5
3 changed files with 15 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
+6 -14
View File
@@ -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 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. 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 Upstream-Status: Pending
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
--- ---
version.sh | 16 +--------------- diff -Naur iw-4.3-origin/version.sh iw-4.3/version.sh
1 file changed, 1 insertion(+), 15 deletions(-) --- 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
diff --git a/version.sh b/version.sh
index 11d124b..5d423c4 100755
--- a/version.sh
+++ b/version.sh
@@ -3,21 +3,7 @@ @@ -3,21 +3,7 @@
VERSION="3.15" VERSION="4.3"
OUT="$1" OUT="$1"
-if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
- git update-index --refresh --unmerged > /dev/null - git update-index --refresh --unmerged > /dev/null
- descr=$(git describe) - descr=$(git describe --match=v*)
- -
- # on git builds check that the version number above - # on git builds check that the version number above
- # is correct... - # is correct...
@@ -39,5 +33,3 @@ index 11d124b..5d423c4 100755
echo '#include "iw.h"' > "$OUT" echo '#include "iw.h"' > "$OUT"
echo "const char iw_version[] = \"$v\";" >> "$OUT" echo "const char iw_version[] = \"$v\";" >> "$OUT"
--
1.7.7.3
meta/recipes-connectivity/iw/iw/separate-objdir.patch
+7 -29
View File
@@ -1,6 +1,3 @@
From 9e27fc2e1b3dc8c36ef6a502edffc3a3d84d9dd9 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Wed, 26 Aug 2015 17:23:48 -0700
Subject: [PATCH] Support separation of SRCDIR and OBJDIR Subject: [PATCH] Support separation of SRCDIR and OBJDIR
Typical use of VPATH to locate the sources. Typical use of VPATH to locate the sources.
@@ -8,26 +5,21 @@ Typical use of VPATH to locate the sources.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
--- ---
Makefile | 7 +++++-- diff -Naur iw-4.3-origin/Makefile iw-4.3/Makefile
version.sh | 2 +- --- iw-4.3-origin/Makefile 2015-11-20 16:37:58.752077287 +0200
2 files changed, 6 insertions(+), 3 deletions(-) +++ iw-4.3/Makefile 2015-11-20 16:57:15.510615815 +0200
@@ -1,5 +1,7 @@
diff --git a/Makefile b/Makefile
index 548591a..da8d33a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
MAKEFLAGS += --no-print-directory MAKEFLAGS += --no-print-directory
-
+SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
+OBJDIR ?= $(PWD) +OBJDIR ?= $(PWD)
+VPATH = $(SRCDIR) +VPATH = $(SRCDIR)
PREFIX ?= /usr PREFIX ?= /usr
SBINDIR ?= $(PREFIX)/sbin SBINDIR ?= $(PREFIX)/sbin
MANDIR ?= $(PREFIX)/share/man MANDIR ?= $(PREFIX)/share/man
@@ -95,11 +98,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) @@ -95,11 +97,11 @@
version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \
$(wildcard .git/index .git/refs/tags) $(wildcard .git/index .git/refs/tags)
@$(NQ) ' GEN ' $@ @$(NQ) ' GEN ' $@
@@ -41,17 +33,3 @@ index 548591a..da8d33a 100644
ifeq ($(IW_ANDROID_BUILD),) ifeq ($(IW_ANDROID_BUILD),)
iw: $(OBJS) iw: $(OBJS)
diff --git a/version.sh b/version.sh
index 5354383..fa954cf 100755
--- a/version.sh
+++ b/version.sh
@@ -5,5 +5,5 @@ OUT="$1"
v="$VERSION"
-echo '#include "iw.h"' > "$OUT"
+echo '#include <iw.h>' > "$OUT"
echo "const char iw_version[] = \"$v\";" >> "$OUT"
--
2.2.1
meta/recipes-connectivity/iw/iw_4.1.bb → meta/recipes-connectivity/iw/iw_4.3.bb
+2 -2
View File
@@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
file://separate-objdir.patch \ file://separate-objdir.patch \
" "
SRC_URI[md5sum] = "68c282285c71c956069957e9ca10a6a7" SRC_URI[md5sum] = "5ca622a270687d6862c9024fab266871"
SRC_URI[sha256sum] = "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9c8f33d" SRC_URI[sha256sum] = "2a853d95ffbd2b06c058b40ef4e6fa76a52c2709b05fb1976761fe13e9d9e39f"
inherit pkgconfig inherit pkgconfig