From c73e26932dcbb8bbe1895ba969e0c41cd9bbf850 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Sun, 17 Aug 2014 23:21:12 -0400 Subject: iw: uprev to version 3.15 - change to use tar.gz since bz2 is no longer provided in upstream - adjust the patch for new version Signed-off-by: Jackie Huang Signed-off-by: Martin Jansa --- ....sh-don-t-use-git-describe-for-versioning.patch | 11 +++++------ meta-oe/recipes-connectivity/iw/iw_3.11.bb | 23 ---------------------- meta-oe/recipes-connectivity/iw/iw_3.15.bb | 23 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/iw/iw_3.11.bb create mode 100644 meta-oe/recipes-connectivity/iw/iw_3.15.bb 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 index 97c00cd2d2..e64dd0ad91 100644 --- 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 @@ -9,18 +9,18 @@ Upstream-Status: Unknown Signed-off-by: Koen Kooi --- - version.sh | 16 +--------------- - 1 files changed, 1 insertions(+), 15 deletions(-) + version.sh | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/version.sh b/version.sh -index 3fb9f6d..e4a56cb 100755 +index 11d124b..5d423c4 100755 --- a/version.sh +++ b/version.sh @@ -3,21 +3,7 @@ - VERSION="3.2" + VERSION="3.15" OUT="$1" --if head=`git rev-parse --verify HEAD 2>/dev/null`; then +-if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then - git update-index --refresh --unmerged > /dev/null - descr=$(git describe) - @@ -41,4 +41,3 @@ index 3fb9f6d..e4a56cb 100755 echo "const char iw_version[] = \"$v\";" >> "$OUT" -- 1.7.7.3 - diff --git a/meta-oe/recipes-connectivity/iw/iw_3.11.bb b/meta-oe/recipes-connectivity/iw/iw_3.11.bb deleted file mode 100644 index d72a1401c0..0000000000 --- a/meta-oe/recipes-connectivity/iw/iw_3.11.bb +++ /dev/null @@ -1,23 +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 pkgconfig" - -SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.bz2 \ - file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ -" - -SRC_URI[md5sum] = "e633cf7c875c7d8b547abafc0d95f6c4" -SRC_URI[sha256sum] = "09348d4f7371fad00c07cfb67b9e34f24403cbd9361f9634cfb4dff9cdd40139" - -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake DESTDIR=${D} install -} diff --git a/meta-oe/recipes-connectivity/iw/iw_3.15.bb b/meta-oe/recipes-connectivity/iw/iw_3.15.bb new file mode 100644 index 0000000000..7800e905ee --- /dev/null +++ b/meta-oe/recipes-connectivity/iw/iw_3.15.bb @@ -0,0 +1,23 @@ +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 pkgconfig" + +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 \ +" + +SRC_URI[md5sum] = "ebb16e6c29b075e3a58b99552583fd79" +SRC_URI[sha256sum] = "1223ebab68dc337f16ed80c45af37b78f112ea091e919eafe96a4cbd63942081" + +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake DESTDIR=${D} install +} -- cgit 1.2.3-korg