diff options
author | Christopher Larson <chris_larson@mentor.com> | 2015-09-01 17:04:20 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-08 16:21:38 +0200 |
commit | 8a5df66704ce01f5d53c20d85d50d0a9c9dacc9e (patch) | |
tree | 63e3008e7138be785f0ed793196ef0b78cf7b962 | |
parent | 06104c03ad5a0fe35000b665a7be60697bb1da04 (diff) | |
download | meta-openembedded-8a5df66704ce01f5d53c20d85d50d0a9c9dacc9e.tar.gz |
iw: remove, this is now in oe-core
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch | 43 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/iw/iw_4.1.bb | 23 |
2 files changed, 0 insertions, 66 deletions
diff --git a/meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch deleted file mode 100644 index e64dd0ad9..000000000 --- a/meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 5310abba864cfe3a8b65af130729447604190b29 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 29 Nov 2011 17:03:27 +0100 | ||
4 | Subject: [PATCH] iw: version.sh: don't use git describe for versioning | ||
5 | |||
6 | It will detect top-level git repositories like the Angstrom setup-scripts and break. | ||
7 | |||
8 | Upstream-Status: Unknown | ||
9 | |||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | --- | ||
12 | version.sh | 16 +--------------- | ||
13 | 1 file changed, 1 insertion(+), 15 deletions(-) | ||
14 | |||
15 | diff --git a/version.sh b/version.sh | ||
16 | index 11d124b..5d423c4 100755 | ||
17 | --- a/version.sh | ||
18 | +++ b/version.sh | ||
19 | @@ -3,21 +3,7 @@ | ||
20 | VERSION="3.15" | ||
21 | OUT="$1" | ||
22 | |||
23 | -if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then | ||
24 | - git update-index --refresh --unmerged > /dev/null | ||
25 | - descr=$(git describe) | ||
26 | - | ||
27 | - # on git builds check that the version number above | ||
28 | - # is correct... | ||
29 | - [ "${descr%%-*}" = "v$VERSION" ] || exit 2 | ||
30 | - | ||
31 | - v="${descr#v}" | ||
32 | - if git diff-index --name-only HEAD | read dummy ; then | ||
33 | - v="$v"-dirty | ||
34 | - fi | ||
35 | -else | ||
36 | - v="$VERSION" | ||
37 | -fi | ||
38 | +v="$VERSION" | ||
39 | |||
40 | echo '#include "iw.h"' > "$OUT" | ||
41 | echo "const char iw_version[] = \"$v\";" >> "$OUT" | ||
42 | -- | ||
43 | 1.7.7.3 | ||
diff --git a/meta-oe/recipes-connectivity/iw/iw_4.1.bb b/meta-oe/recipes-connectivity/iw/iw_4.1.bb deleted file mode 100644 index e1e7c12e0..000000000 --- a/meta-oe/recipes-connectivity/iw/iw_4.1.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | SUMMARY = "nl80211 based CLI configuration utility for wireless devices" | ||
2 | DESCRIPTION = "iw is a new nl80211 based CLI configuration utility for \ | ||
3 | wireless devices. It supports almost all new drivers that have been added \ | ||
4 | to the kernel recently. " | ||
5 | HOMEPAGE = "http://wireless.kernel.org/en/users/Documentation/iw" | ||
6 | SECTION = "base" | ||
7 | LICENSE = "BSD" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774" | ||
9 | |||
10 | DEPENDS = "libnl pkgconfig" | ||
11 | |||
12 | SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ | ||
13 | file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ | ||
14 | " | ||
15 | |||
16 | SRC_URI[md5sum] = "68c282285c71c956069957e9ca10a6a7" | ||
17 | SRC_URI[sha256sum] = "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9c8f33d" | ||
18 | |||
19 | EXTRA_OEMAKE = "" | ||
20 | |||
21 | do_install() { | ||
22 | oe_runmake DESTDIR=${D} install | ||
23 | } | ||