From 35945fd3c5b6ccd3be39ac972b94a4ef97e0212e Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Fri, 20 Nov 2015 17:27:32 +0200 Subject: iw: upgrade to version 4.3 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ....sh-don-t-use-git-describe-for-versioning.patch | 20 ++++-------- .../iw/iw/separate-objdir.patch | 36 +++++----------------- meta/recipes-connectivity/iw/iw_4.1.bb | 33 -------------------- meta/recipes-connectivity/iw/iw_4.3.bb | 33 ++++++++++++++++++++ 4 files changed, 46 insertions(+), 76 deletions(-) delete mode 100644 meta/recipes-connectivity/iw/iw_4.1.bb create mode 100644 meta/recipes-connectivity/iw/iw_4.3.bb (limited to 'meta/recipes-connectivity/iw') 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 @@ -From 5310abba864cfe3a8b65af130729447604190b29 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -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. @@ -8,21 +5,18 @@ It will detect top-level git repositories like the Angstrom setup-scripts and br Upstream-Status: Pending Signed-off-by: Koen Kooi +Signed-off-by: Maxin B. John --- - version.sh | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/version.sh b/version.sh -index 11d124b..5d423c4 100755 ---- a/version.sh -+++ b/version.sh +diff -Naur iw-4.3-origin/version.sh iw-4.3/version.sh +--- 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 @@ -3,21 +3,7 @@ - VERSION="3.15" + VERSION="4.3" OUT="$1" -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then - git update-index --refresh --unmerged > /dev/null -- descr=$(git describe) +- descr=$(git describe --match=v*) - - # on git builds check that the version number above - # is correct... @@ -39,5 +33,3 @@ index 11d124b..5d423c4 100755 echo '#include "iw.h"' > "$OUT" echo "const char iw_version[] = \"$v\";" >> "$OUT" --- -1.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 @@ -From 9e27fc2e1b3dc8c36ef6a502edffc3a3d84d9dd9 Mon Sep 17 00:00:00 2001 -From: Christopher Larson -Date: Wed, 26 Aug 2015 17:23:48 -0700 Subject: [PATCH] Support separation of SRCDIR and OBJDIR Typical use of VPATH to locate the sources. @@ -8,26 +5,21 @@ Typical use of VPATH to locate the sources. Upstream-Status: Pending Signed-off-by: Christopher Larson - +Signed-off-by: Maxin B. John --- - Makefile | 7 +++++-- - version.sh | 2 +- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 548591a..da8d33a 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,8 @@ +diff -Naur iw-4.3-origin/Makefile iw-4.3/Makefile +--- iw-4.3-origin/Makefile 2015-11-20 16:37:58.752077287 +0200 ++++ iw-4.3/Makefile 2015-11-20 16:57:15.510615815 +0200 +@@ -1,5 +1,7 @@ MAKEFLAGS += --no-print-directory - +- +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) +OBJDIR ?= $(PWD) +VPATH = $(SRCDIR) PREFIX ?= /usr SBINDIR ?= $(PREFIX)/sbin 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 \ $(wildcard .git/index .git/refs/tags) @$(NQ) ' GEN ' $@ @@ -41,17 +33,3 @@ index 548591a..da8d33a 100644 ifeq ($(IW_ANDROID_BUILD),) 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 ' > "$OUT" - echo "const char iw_version[] = \"$v\";" >> "$OUT" --- -2.2.1 - diff --git a/meta/recipes-connectivity/iw/iw_4.1.bb b/meta/recipes-connectivity/iw/iw_4.1.bb deleted file mode 100644 index fafb0e3c9e..0000000000 --- a/meta/recipes-connectivity/iw/iw_4.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -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://wireless.kernel.org/en/users/Documentation/iw" -SECTION = "base" -LICENSE = "BSD" -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 \ -" - -SRC_URI[md5sum] = "68c282285c71c956069957e9ca10a6a7" -SRC_URI[sha256sum] = "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9c8f33d" - -inherit pkgconfig - -EXTRA_OEMAKE = "\ - -f '${S}/Makefile' \ - \ - 'PREFIX=${prefix}' \ - 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' \ -" -B = "${WORKDIR}/build" - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} diff --git a/meta/recipes-connectivity/iw/iw_4.3.bb b/meta/recipes-connectivity/iw/iw_4.3.bb new file mode 100644 index 0000000000..6865e7ad63 --- /dev/null +++ b/meta/recipes-connectivity/iw/iw_4.3.bb @@ -0,0 +1,33 @@ +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://wireless.kernel.org/en/users/Documentation/iw" +SECTION = "base" +LICENSE = "BSD" +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 \ +" + +SRC_URI[md5sum] = "5ca622a270687d6862c9024fab266871" +SRC_URI[sha256sum] = "2a853d95ffbd2b06c058b40ef4e6fa76a52c2709b05fb1976761fe13e9d9e39f" + +inherit pkgconfig + +EXTRA_OEMAKE = "\ + -f '${S}/Makefile' \ + \ + 'PREFIX=${prefix}' \ + 'SBINDIR=${sbindir}' \ + 'MANDIR=${mandir}' \ +" +B = "${WORKDIR}/build" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} -- cgit v1.2.3-54-g00ecf