diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/iw')
-rw-r--r-- | meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch | 26 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/iw/iw_3.2.bb (renamed from meta-oe/recipes-connectivity/iw/iw_0.9.20.bb) | 15 |
2 files changed, 4 insertions, 37 deletions
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 93aad026e..000000000 --- a/meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Index: iw-0.9.18/version.sh | ||
2 | =================================================================== | ||
3 | --- iw-0.9.18.orig/version.sh 2010-09-14 13:50:27.000000000 +0400 | ||
4 | +++ iw-0.9.18/version.sh 2010-09-14 13:50:40.000000000 +0400 | ||
5 | @@ -5,20 +5,6 @@ | ||
6 | |||
7 | echo '#include "iw.h"' > "$OUT" | ||
8 | |||
9 | -if head=`git rev-parse --verify HEAD 2>/dev/null`; then | ||
10 | - git update-index --refresh --unmerged > /dev/null | ||
11 | - descr=$(git describe) | ||
12 | - | ||
13 | - # on git builds check that the version number above | ||
14 | - # is correct... | ||
15 | - [ "${descr%%-*}" = "v$VERSION" ] || exit 2 | ||
16 | - | ||
17 | - v="${descr#v}" | ||
18 | - if git diff-index --name-only HEAD | read dummy ; then | ||
19 | - v="$v"-dirty | ||
20 | - fi | ||
21 | -else | ||
22 | - v="$VERSION" | ||
23 | -fi | ||
24 | +v="$VERSION" | ||
25 | |||
26 | 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 index 0b66e8df8..ba7afdd37 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" | |||
6 | 6 | ||
7 | DEPENDS = "libnl pkgconfig" | 7 | DEPENDS = "libnl pkgconfig" |
8 | 8 | ||
9 | SRC_URI = " \ | 9 | SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2" |
10 | http://wireless.kernel.org/download/iw/${P}.tar.bz2 \ | ||
11 | file://kill-git-version-check.patch \ | ||
12 | " | ||
13 | 10 | ||
14 | SRC_URI[md5sum] = "1055799b544b3e08169d155bb6c21bb0" | 11 | SRC_URI[md5sum] = "80615c972a287dcd50890735469b0d1c" |
15 | SRC_URI[sha256sum] = "2d665fbfbe4fd6a40159fb821518fc5337da37448416405b936a393a14cbc7d3" | 12 | SRC_URI[sha256sum] = "370edabe6f73cc55be77a7502a3a25d23ec2aea900ae4ca3cec19d55bf8bdb12" |
16 | 13 | ||
17 | CFLAGS += "-DCONFIG_LIBNL20" | 14 | CFLAGS += "-DCONFIG_LIBNL30" |
18 | |||
19 | do_compile() { | ||
20 | oe_runmake | ||
21 | } | ||
22 | 15 | ||
23 | do_install() { | 16 | do_install() { |
24 | oe_runmake DESTDIR=${D} install | 17 | oe_runmake DESTDIR=${D} install |