From 4b75c4a1c37fc9417c06c8ef64e11f9f18f68e01 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 31 Jan 2013 17:35:37 +0100
Subject: [PATCH] meta-digi-del: add 'iw' version 3.8

I had to increase the priority of 'meta-digi-del' layer, so our recipes
have precedence over the ones in 'meta-oe'. Otherwise it was always
using the 'iw' recipe of meta-oe, regardless of being a lower version
(iw-3.6).

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-del/conf/layer.conf                 |  2 +-
 ...on-t-use-git-describe-for-versioning.patch | 40 +++++++++++++++++++
 .../recipes-connectivity/iw/iw_3.8.bb         | 25 ++++++++++++
 .../packagegroup-del-wireless.bb              |  2 +-
 4 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 meta-digi-del/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
 create mode 100644 meta-digi-del/recipes-connectivity/iw/iw_3.8.bb

diff --git a/meta-digi-del/conf/layer.conf b/meta-digi-del/conf/layer.conf
index 6f1d9ab92..7e535586c 100644
--- a/meta-digi-del/conf/layer.conf
+++ b/meta-digi-del/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "del"
 BBFILE_PATTERN_del := "^${LAYERDIR}/"
-BBFILE_PRIORITY_del = "5"
+BBFILE_PRIORITY_del = "6"
 
 DIGI_MIRROR ?= "http://www.digi.com/yocto/"
 DIGI_LOG_MIRROR ?= "http://build-linux.digi.com/LxNETES-4/pooldir/"
diff --git a/meta-digi-del/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta-digi-del/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
new file mode 100644
index 000000000..eaf72c0b9
--- /dev/null
+++ b/meta-digi-del/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
@@ -0,0 +1,40 @@
+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
+
+It will detect top-level git repositories like the Angstrom setup-scripts and break.
+
+Upstream-status: Unknown
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ version.sh | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/version.sh b/version.sh
+index db02f0d..336ce2b 100755
+--- a/version.sh
++++ b/version.sh
+@@ -3,21 +3,7 @@
+ VERSION="3.8"
+ OUT="$1"
+ 
+-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 '#include "iw.h"' > "$OUT"
+ echo "const char iw_version[] = \"$v\";" >> "$OUT"
diff --git a/meta-digi-del/recipes-connectivity/iw/iw_3.8.bb b/meta-digi-del/recipes-connectivity/iw/iw_3.8.bb
new file mode 100644
index 000000000..5994fcd6c
--- /dev/null
+++ b/meta-digi-del/recipes-connectivity/iw/iw_3.8.bb
@@ -0,0 +1,25 @@
+SUMMARY = "nl80211 based CLI configuration utility for wireless devices"
+DESCRIPTION = "iw is a new nl80211 based CLI configuration utility for \
+wireless devices. It supports almost all new drivers that have been added \
+to the kernel recently. "
+HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw"
+SECTION = "base"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
+
+DEPENDS = "libnl pkgconfig"
+
+PR = "${DISTRO}.r0"
+
+SRC_URI = "http://wireless.kernel.org/download/iw/iw-${PV}.tar.bz2 \
+           file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
+          "
+
+SRC_URI[md5sum] = "618ad1106a196fb1c3d827de96da437c"
+SRC_URI[sha256sum] = "3dae92ca5989cbc21155941fa01907a5536da3c5f6898642440c61484fc7e0f9"
+
+EXTRA_OEMAKE = ""
+
+do_install() {
+	oe_runmake DESTDIR=${D} install
+}
diff --git a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb
index 11272a028..a9474bbce 100644
--- a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb
+++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb
@@ -19,7 +19,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 RDEPENDS_${PN} = "\
 	wpa-supplicant \
 	wireless-tools \
-        crda \
+	crda \
 	iw \
 	${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"