crda: upgrade 3.13 -> 3.18

Dropped backported patches(commit-id):
-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch(2cabb258)
-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch(fefefdb2)

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

5 files changed, 2 insertions, 90 deletions

diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch b/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
deleted file mode 100644
index 36464004d..000000000
--- a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: "John W. Linville" <linville@tuxdriver.com>
-Date: Fri, 14 Feb 2014 13:58:44 -0500
-Subject: [PATCH] crda: Add DESTDIR support in install-libreg* rules in Makefile
-Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=2cabb2588da56735369131b709f191453c080be0
-
-Upstream-Status: Backport
-
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
----
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0b2f0d7..1f25509 100644
---- a/Makefile
-+++ b/Makefile
-@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c
- 
- install-libreg-headers:
-        $(NQ) '  INSTALL  libreg-headers'
--       $(Q)mkdir -p $(INCLUDE_DIR)
--       $(Q)cp *.h $(INCLUDE_DIR)/
-+       $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR)
-+       $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/
- 
- install-libreg:
-        $(NQ) '  INSTALL  libreg'
--       $(Q)mkdir -p $(LIBDIR)
--       $(Q)cp $(LIBREG) $(LIBDIR)/
-+       $(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
-+       $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
-        $(Q)ldconfig
- 
- %.o: %.c regdb.h $(LIBREG)
diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch b/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
deleted file mode 100644
index 68b4b13e9..000000000
--- a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Krishna Chaitanya <chaitanya.mgit@gmail.com>
-Date: Mon, 16 Dec 2013 21:57:39 +0530
-Subject: [PATCH] crda: Fix the linking order to avoid compilation error
-Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=fefefdb2c52c8fbedbb339b4badb8226cad7e7e0
-
-While linking the crda.o and libreg.so, first put crda.o
-and then -lreg. This fixed the below error:
-
-  GEN  keys-gcrypt.c
-  Trusted pubkeys: pubkeys/linville.key.pub.pem
-  CC   libreg.so
-  CC   crda.o
-  LD   crda
-crda.o: In function `main':
-crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2'
-collect2: ld returned 1 exit status
-make: *** [crda] Error 1
-
-Note: This still doesn't fix the below error (will send another mail)
-
-  CHK  /usr/lib/crda/regulatory.bin
-Database signature verification failed.
-Invalid or empty regulatory file, note: a binary regulatory file should be used.
-make: *** [verify] Error 234
-
-Upstream-Status: Backport
-
-Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-Signed-off-by: Chaitanya T K <chaitanya.mgit@gmail.com>
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4a351c6..0b2f0d7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
- CFLAGS += -O2 -fpic
- CFLAGS += -std=gnu99 -Wall -Werror -pedantic
- CFLAGS += -Wall -g
--LDLIBS += -lm
- LDLIBREG += -lreg
-+LDLIBS += $(LDLIBREG)
-+LDLIBS += -lm
- LIBREG += libreg.so
--LDFLAGS += -L ./ $(LDLIBREG)
-+LDFLAGS += -L ./
- 
- all: all_noverify verify
- 
diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch
index 3ef35ee54..3ef35ee54 100644
--- a/meta-networking/recipes-connectivity/crda/crda-3.13/do-not-run-ldconfig-if-destdir-is-set.patch
+++ b/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch
diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
index aceb56df7..aceb56df7 100644
--- a/meta-networking/recipes-connectivity/crda/crda-3.13/fix-linking-of-libraries-used-by-reglib.patch
+++ b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
diff --git a/meta-networking/recipes-connectivity/crda/crda_3.13.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb
index 12eefe07a..931a05352 100644
--- a/meta-networking/recipes-connectivity/crda/crda_3.13.bb
+++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb
@@ -9,13 +9,11 @@ DEPENDS = "python-m2crypto-native python-native libgcrypt libnl"
 
 SRC_URI = "https://www.kernel.org/pub/software/network/crda/${BP}.tar.xz;name=crda \
            https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2014.11.18.tar.xz;name=bin \
-           file://crda-Fix-the-linking-order-to-avoid-compilation-erro.patch \
-           file://crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch \
            file://do-not-run-ldconfig-if-destdir-is-set.patch \
            file://fix-linking-of-libraries-used-by-reglib.patch \
 "
-SRC_URI[crda.md5sum] = "66b1b0417c1ad19f0009a5c0c0c1aebc"
-SRC_URI[crda.sha256sum] = "2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59"
+SRC_URI[crda.md5sum] = "0431fef3067bf503dfb464069f06163a"
+SRC_URI[crda.sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf"
 
 SRC_URI[bin.md5sum] = "d750c402c5510add7380edcb1d9b75b2"
 SRC_URI[bin.sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd"