diff options
author | Li xin <lixin.fnst@cn.fujitsu.com> | 2015-07-21 17:19:04 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-08-06 11:01:39 -0400 |
commit | 6aa74f9fca42acab8096dd0259f1cc87eb625a7f (patch) | |
tree | cca72fb35696059fa74aa579508c9c9a3a70da46 /meta-networking/recipes-connectivity/crda | |
parent | d4dee20f342cda86cc2fd61310c41302f42f172a (diff) | |
download | meta-openembedded-6aa74f9fca42acab8096dd0259f1cc87eb625a7f.tar.gz |
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>
Diffstat (limited to 'meta-networking/recipes-connectivity/crda')
-rw-r--r-- | meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch | 35 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch | 51 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch (renamed from meta-networking/recipes-connectivity/crda/crda-3.13/do-not-run-ldconfig-if-destdir-is-set.patch) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch (renamed from meta-networking/recipes-connectivity/crda/crda-3.13/fix-linking-of-libraries-used-by-reglib.patch) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/crda/crda_3.18.bb (renamed from meta-networking/recipes-connectivity/crda/crda_3.13.bb) | 6 |
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 @@ | |||
1 | From: "John W. Linville" <linville@tuxdriver.com> | ||
2 | Date: Fri, 14 Feb 2014 13:58:44 -0500 | ||
3 | Subject: [PATCH] crda: Add DESTDIR support in install-libreg* rules in Makefile | ||
4 | Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=2cabb2588da56735369131b709f191453c080be0 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | ||
9 | Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> | ||
10 | --- | ||
11 | Makefile | 8 ++++---- | ||
12 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile b/Makefile | ||
15 | index 0b2f0d7..1f25509 100644 | ||
16 | --- a/Makefile | ||
17 | +++ b/Makefile | ||
18 | @@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c | ||
19 | |||
20 | install-libreg-headers: | ||
21 | $(NQ) ' INSTALL libreg-headers' | ||
22 | - $(Q)mkdir -p $(INCLUDE_DIR) | ||
23 | - $(Q)cp *.h $(INCLUDE_DIR)/ | ||
24 | + $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) | ||
25 | + $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ | ||
26 | |||
27 | install-libreg: | ||
28 | $(NQ) ' INSTALL libreg' | ||
29 | - $(Q)mkdir -p $(LIBDIR) | ||
30 | - $(Q)cp $(LIBREG) $(LIBDIR)/ | ||
31 | + $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) | ||
32 | + $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ | ||
33 | $(Q)ldconfig | ||
34 | |||
35 | %.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 @@ | |||
1 | From: Krishna Chaitanya <chaitanya.mgit@gmail.com> | ||
2 | Date: Mon, 16 Dec 2013 21:57:39 +0530 | ||
3 | Subject: [PATCH] crda: Fix the linking order to avoid compilation error | ||
4 | Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=fefefdb2c52c8fbedbb339b4badb8226cad7e7e0 | ||
5 | |||
6 | While linking the crda.o and libreg.so, first put crda.o | ||
7 | and then -lreg. This fixed the below error: | ||
8 | |||
9 | GEN keys-gcrypt.c | ||
10 | Trusted pubkeys: pubkeys/linville.key.pub.pem | ||
11 | CC libreg.so | ||
12 | CC crda.o | ||
13 | LD crda | ||
14 | crda.o: In function `main': | ||
15 | crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2' | ||
16 | collect2: ld returned 1 exit status | ||
17 | make: *** [crda] Error 1 | ||
18 | |||
19 | Note: This still doesn't fix the below error (will send another mail) | ||
20 | |||
21 | CHK /usr/lib/crda/regulatory.bin | ||
22 | Database signature verification failed. | ||
23 | Invalid or empty regulatory file, note: a binary regulatory file should be used. | ||
24 | make: *** [verify] Error 234 | ||
25 | |||
26 | Upstream-Status: Backport | ||
27 | |||
28 | Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> | ||
29 | Signed-off-by: Chaitanya T K <chaitanya.mgit@gmail.com> | ||
30 | --- | ||
31 | Makefile | 5 +++-- | ||
32 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
33 | |||
34 | diff --git a/Makefile b/Makefile | ||
35 | index 4a351c6..0b2f0d7 100644 | ||
36 | --- a/Makefile | ||
37 | +++ b/Makefile | ||
38 | @@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys | ||
39 | CFLAGS += -O2 -fpic | ||
40 | CFLAGS += -std=gnu99 -Wall -Werror -pedantic | ||
41 | CFLAGS += -Wall -g | ||
42 | -LDLIBS += -lm | ||
43 | LDLIBREG += -lreg | ||
44 | +LDLIBS += $(LDLIBREG) | ||
45 | +LDLIBS += -lm | ||
46 | LIBREG += libreg.so | ||
47 | -LDFLAGS += -L ./ $(LDLIBREG) | ||
48 | +LDFLAGS += -L ./ | ||
49 | |||
50 | all: all_noverify verify | ||
51 | |||
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" | |||
9 | 9 | ||
10 | SRC_URI = "https://www.kernel.org/pub/software/network/crda/${BP}.tar.xz;name=crda \ | 10 | SRC_URI = "https://www.kernel.org/pub/software/network/crda/${BP}.tar.xz;name=crda \ |
11 | https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2014.11.18.tar.xz;name=bin \ | 11 | https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2014.11.18.tar.xz;name=bin \ |
12 | file://crda-Fix-the-linking-order-to-avoid-compilation-erro.patch \ | ||
13 | file://crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch \ | ||
14 | file://do-not-run-ldconfig-if-destdir-is-set.patch \ | 12 | file://do-not-run-ldconfig-if-destdir-is-set.patch \ |
15 | file://fix-linking-of-libraries-used-by-reglib.patch \ | 13 | file://fix-linking-of-libraries-used-by-reglib.patch \ |
16 | " | 14 | " |
17 | SRC_URI[crda.md5sum] = "66b1b0417c1ad19f0009a5c0c0c1aebc" | 15 | SRC_URI[crda.md5sum] = "0431fef3067bf503dfb464069f06163a" |
18 | SRC_URI[crda.sha256sum] = "2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59" | 16 | SRC_URI[crda.sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" |
19 | 17 | ||
20 | SRC_URI[bin.md5sum] = "d750c402c5510add7380edcb1d9b75b2" | 18 | SRC_URI[bin.md5sum] = "d750c402c5510add7380edcb1d9b75b2" |
21 | SRC_URI[bin.sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd" | 19 | SRC_URI[bin.sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd" |