Patchwork [meta-oe,1/3] iw: update to 3.2

login
register
mail settings
Submitter Andreas Müller
Date Nov. 20, 2011, 8:46 p.m.
Message ID <1321822001-3647-1-git-send-email-schnitzeltony@gmx.de>
Download mbox | patch
Permalink /patch/15169/
State Superseded
Headers show

Comments

Andreas Müller - Nov. 20, 2011, 8:46 p.m.
to prepare support for libnl-3 we need to update iw.

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
 .../iw/iw/kill-git-version-check.patch             |   26 --------------------
 .../iw/{iw_0.9.20.bb => iw_3.2.bb}                 |   15 +++--------
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch
 rename meta-oe/recipes-connectivity/iw/{iw_0.9.20.bb => iw_3.2.bb} (51%)

Patch

diff --git a/meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch b/meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch
deleted file mode 100644
index 93aad02..0000000
--- a/meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-Index: iw-0.9.18/version.sh
-===================================================================
---- iw-0.9.18.orig/version.sh	2010-09-14 13:50:27.000000000 +0400
-+++ iw-0.9.18/version.sh	2010-09-14 13:50:40.000000000 +0400
-@@ -5,20 +5,6 @@
- 
- echo '#include "iw.h"' > "$OUT"
- 
--if head=`git rev-parse --verify HEAD 2>/dev/null`; then
--	git update-index --refresh --unmerged > /dev/null
--	descr=$(git describe)
--
--	# on git builds check that the version number above
--	# is correct...
--	[ "${descr%%-*}" = "v$VERSION" ] || exit 2
--
--	v="${descr#v}"
--	if git diff-index --name-only HEAD | read dummy ; then
--		v="$v"-dirty
--	fi
--else
--	v="$VERSION"
--fi
-+v="$VERSION"
- 
- echo "const char iw_version[] = \"$v\";" >> "$OUT"
diff --git a/meta-oe/recipes-connectivity/iw/iw_0.9.20.bb b/meta-oe/recipes-connectivity/iw/iw_3.2.bb
similarity index 51%
rename from meta-oe/recipes-connectivity/iw/iw_0.9.20.bb
rename to meta-oe/recipes-connectivity/iw/iw_3.2.bb
index 0b66e8d..ba7afdd 100644
--- a/meta-oe/recipes-connectivity/iw/iw_0.9.20.bb
+++ b/meta-oe/recipes-connectivity/iw/iw_3.2.bb
@@ -6,19 +6,12 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
 
 DEPENDS = "libnl pkgconfig"
 
-SRC_URI = " \
-	http://wireless.kernel.org/download/iw/${P}.tar.bz2 \
-	file://kill-git-version-check.patch \
-	"
+SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2"
 
-SRC_URI[md5sum] = "1055799b544b3e08169d155bb6c21bb0"
-SRC_URI[sha256sum] = "2d665fbfbe4fd6a40159fb821518fc5337da37448416405b936a393a14cbc7d3"
+SRC_URI[md5sum] = "80615c972a287dcd50890735469b0d1c"
+SRC_URI[sha256sum] = "370edabe6f73cc55be77a7502a3a25d23ec2aea900ae4ca3cec19d55bf8bdb12"
 
-CFLAGS += "-DCONFIG_LIBNL20"
-
-do_compile() {
-	oe_runmake
-}
+CFLAGS += "-DCONFIG_LIBNL30"
 
 do_install() {
 	oe_runmake DESTDIR=${D} install