summaryrefslogtreecommitdiffstats
path: root/meta-networking/dynamic-layers/meta-python
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2023-02-06 15:55:46 +0800
committerKhem Raj <raj.khem@gmail.com>2023-02-06 07:59:29 -0800
commit927b9b8487662833362537fc15e56d55809ac756 (patch)
treee542f0443190b263be0ae9a1d6d4f8ffe493cd5d /meta-networking/dynamic-layers/meta-python
parent4b3e6289cd4c3615266e5d99476772096d88df42 (diff)
downloadmeta-openembedded-927b9b8487662833362537fc15e56d55809ac756.tar.gz
crda: remove recipe
CRDA is no longer needed as of kernel v4.15 since commit 007f6c5e6eb45 ("cfg80211: support loading regulatory database as firmware file") added support to use the kernel's firmware request API which looks for the firmware on /lib/firmware. Because of this CRDA is legacy software for older kernels, remove the recipe. It could change regulatory domains with iw and wpa_supplicant. Refs 1. https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/tree/README#n8 2. https://wireless.wiki.kernel.org/en/developers/Regulatory/CRDA Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/dynamic-layers/meta-python')
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch31
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch33
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch59
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch110
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch30
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch58
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch57
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch34
-rw-r--r--meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb39
9 files changed, 0 insertions, 451 deletions
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch
deleted file mode 100644
index f1d2cbc5a3..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 078e962d345fd0536fe7ba797485ee1a4159c032 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 4 Feb 2022 09:18:30 -0800
4Subject: [PATCH] Make alpha2 to be 3 characters long
5
6Fixes buffer overflow
7reglib.c:969:9: error: 'sscanf' may overflow; destination buffer in argument 3 has size 2, but the corresponding specifier may require size 3 [-Werror,-Wfortify-source]
8 alpha2,
9 ^
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 reglib.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/reglib.c b/reglib.c
17index e00e9b8..8565a0b 100644
18--- a/reglib.c
19+++ b/reglib.c
20@@ -958,7 +958,7 @@ reglib_parse_rules(FILE *fp, struct ieee80211_regdomain *trd)
21 static int reglib_parse_country_dfs(char *line, struct ieee80211_regdomain *rd)
22 {
23 char dfs_region_alpha[9];
24- char alpha2[2];
25+ char alpha2[3];
26 int hits;
27
28 memset(rd, 0, sizeof(*rd));
29--
302.35.1
31
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch
deleted file mode 100644
index d61ea8069e..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 1e1a78b7b4fa1662b4447aa19c15b1e839b7e9db Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
3Date: Wed, 24 Aug 2016 10:58:45 +0200
4Subject: [PATCH] Makefile: respect LDFLAGS for libreg
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
10
11Rebase for crda 4.15.
12
13Signed-off-by: Kai Kang <kai.kang@windriver.com>
14---
15 Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Makefile b/Makefile
19index 528a14e..31f1b5e 100644
20--- a/Makefile
21+++ b/Makefile
22@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
23
24 $(LIBREG): reglib.c regdb.h reglib.h
25 $(NQ) ' CC ' $@
26- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS)
27+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LDFLAGS) $(LIBREGLDLIBS)
28
29 install-libreg-headers:
30 $(NQ) ' INSTALL libreg-headers'
31--
321.9.1
33
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch
deleted file mode 100644
index c6c3c53f19..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From 1bd6ff9d10c83afbc9954fc38b953e9167e6d4a9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 28 Aug 2022 14:01:55 -0700
4Subject: [PATCH] reglib: Remove unused variables
5
6These counters are not used anywhere therefore delete them
7Fixes
8reglib.c:1015:15: error: variable 'i' set but not used [-Werror,-Wunused-but-set-variable]
9 unsigned int i = 0;
10 ^
11reglib.c:1062:15: error: variable 'lines' set but not used [-Werror,-Wunused-but-set-variable]
12 unsigned int lines = 0;
13 ^
14
15Upstream-Status: Pending
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 reglib.c | 4 ----
19 1 file changed, 4 deletions(-)
20
21diff --git a/reglib.c b/reglib.c
22index 8565a0b..6c62c2c 100644
23--- a/reglib.c
24+++ b/reglib.c
25@@ -1012,7 +1012,6 @@ static int reglib_find_next_country_stream(FILE *fp)
26 {
27 fpos_t prev_pos;
28 int r;
29- unsigned int i = 0;
30
31 while(1) {
32 char line[1024];
33@@ -1030,7 +1029,6 @@ static int reglib_find_next_country_stream(FILE *fp)
34 line_p = fgets(line, sizeof(line), fp);
35 if (line_p == line) {
36 if (strspn(line, "\n") == strlen(line)) {
37- i++;
38 continue;
39 }
40 if (strncmp(line, "country", 7) != 0)
41@@ -1059,7 +1057,6 @@ struct ieee80211_regdomain *reglib_parse_country(FILE *fp)
42
43 FILE *reglib_create_parse_stream(FILE *f)
44 {
45- unsigned int lines = 0;
46 FILE *fp;
47
48 fp = tmpfile();
49@@ -1076,7 +1073,6 @@ FILE *reglib_create_parse_stream(FILE *f)
50 if (line_p == line) {
51 if (strchr(line, '#') == NULL) {
52 fputs(line, fp);
53- lines++;
54 }
55 continue;
56 } else
57--
582.37.2
59
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch
deleted file mode 100644
index 6c209dc375..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch
+++ /dev/null
@@ -1,110 +0,0 @@
1Imported from Gentoo
2https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c50acec16bc7c33d6dc122c007d713e7fbecf9c
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Rebase for crda 4.15.
7
8Signed-off-by: Kai Kang <kai.kang@windriver.com>
9
10 utils/key2pub.py | 28 +++++++++++++++-------------
11 1 file changed, 15 insertions(+), 13 deletions(-)
12
13diff --git a/utils/key2pub.py b/utils/key2pub.py
14index 22fda55..2a4980b 100755
15--- a/utils/key2pub.py
16+++ b/utils/key2pub.py
17@@ -1,22 +1,22 @@
18-#!/usr/bin/env python
19+#!/usr/bin/env python3
20
21 import sys
22 try:
23 from M2Crypto import RSA
24-except ImportError, e:
25+except ImportError as e:
26 sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: %s\n' % e.message)
27 sys.stderr.write('Please install the "M2Crypto" Python module.\n')
28 sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n')
29 sys.exit(1)
30
31 def print_ssl_64(output, name, val):
32- while val[0] == '\0':
33+ while val[0:1] == b'\0':
34 val = val[1:]
35 while len(val) % 8:
36- val = '\0' + val
37+ val = b'\0' + val
38 vnew = []
39 while len(val):
40- vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7]))
41+ vnew.append((val[0:1], val[1:2], val[2:3], val[3:4], val[4:5], val[5:6], val[6:7], val[7:8]))
42 val = val[8:]
43 vnew.reverse()
44 output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
45@@ -34,13 +34,13 @@ def print_ssl_64(output, name, val):
46 output.write('};\n\n')
47
48 def print_ssl_32(output, name, val):
49- while val[0] == '\0':
50+ while val[0:1] == b'\0':
51 val = val[1:]
52 while len(val) % 4:
53- val = '\0' + val
54+ val = b'\0' + val
55 vnew = []
56 while len(val):
57- vnew.append((val[0], val[1], val[2], val[3], ))
58+ vnew.append((val[0:1], val[1:2], val[2:3], val[3:4]))
59 val = val[4:]
60 vnew.reverse()
61 output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
62@@ -81,21 +81,21 @@ struct pubkey {
63
64 static struct pubkey keys[] __attribute__((unused))= {
65 ''')
66- for n in xrange(n + 1):
67+ for n in range(n + 1):
68 output.write(' KEYS(e_%d, n_%d),\n' % (n, n))
69 output.write('};\n')
70 pass
71
72 def print_gcrypt(output, name, val):
73 output.write('#include <stdint.h>\n')
74- while val[0] == '\0':
75+ while val[0:1] == b'\0':
76 val = val[1:]
77 output.write('static const uint8_t %s[%d] = {\n' % (name, len(val)))
78 idx = 0
79 for v in val:
80 if not idx:
81 output.write('\t')
82- output.write('0x%.2x, ' % ord(v))
83+ output.write('0x%.2x, ' % (v if sys.version_info[0] >=3 else ord(v)))
84 idx += 1
85 if idx == 8:
86 idx = 0
87@@ -118,7 +118,7 @@ struct key_params {
88
89 static const struct key_params __attribute__ ((unused)) keys[] = {
90 ''')
91- for n in xrange(n + 1):
92+ for n in range(n + 1):
93 output.write(' KEYS(e_%d, n_%d),\n' % (n, n))
94 output.write('};\n')
95
96@@ -136,7 +136,7 @@ except IndexError:
97 mode = None
98
99 if not mode in modes:
100- print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))
101+ print('Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys())))
102 sys.exit(2)
103
104 output = open(outfile, 'w')
105@@ -154,3 +154,5 @@ for f in files:
106 idx += 1
107
108 modes[mode][1](output, idx - 1)
109+
110+output.close()
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch
deleted file mode 100644
index b5bce40a9c..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From: Ben Hutchings <ben@decadent.org.uk>
2Date: Sat, 23 Aug 2014 12:27:34 -0700
3Subject: crda: Do not run ldconfig if DESTDIR is set
4
5Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126028.html]
6
7Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
8Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
9
10Rebase patch for crda 4.15.
11
12Signed-off-by: Kai Kang <kai.kang@windriver.com>
13
14 Makefile | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/Makefile b/Makefile
18index 6ca26f3..528a14e 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -127,7 +127,9 @@ install-libreg:
22 $(NQ) ' INSTALL libreg'
23 $(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
24 $(Q)$(INSTALL) -m 644 $(LIBREG) $(DESTDIR)/$(LIBDIR)/
25+ifndef DESTDIR
26 $(Q)ldconfig
27+endif
28
29 %.o: %.c regdb.h $(LIBREG)
30 $(NQ) ' CC ' $@
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch
deleted file mode 100644
index 1bb5c638f0..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 8d2164a090f17286ea8291f30a123595cf447dc3 Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Wed, 30 Nov 2016 10:27:36 +0800
4Subject: [PATCH] crda: fix issues when 'USE_OPENSSL=1'.
5
6Fxed the below issues if configured with 'USE_OPENSSL=1':
7a. keys-ssl.c uses BN_ULONG but doesn't include the openssl headers leading
8 to build failures:
9 keys-ssl.c:2:8: error: unknown type name 'BN_ULONG'
10 static BN_ULONG e_0[1] = {
11
12b. The large unqualified constants also break building:
13 keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow]
14 0x63a2705416a0d8e1, 0xdc9fca11c8ba757b,
15
16c. keys-ssl.c: error: 'keys' defined but not used [-Werror=unused-variable]
17 static struct pubkey keys[] = {
18
19Signed-off-by: Mike Frysinger <vapier@gentoo.org>
20Upstream-Status: Pending
21Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
22---
23 utils/key2pub.py | 5 +++--
24 1 file changed, 3 insertions(+), 2 deletions(-)
25
26diff --git a/utils/key2pub.py b/utils/key2pub.py
27index 401d58a..3ae00b8 100755
28--- a/utils/key2pub.py
29+++ b/utils/key2pub.py
30@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val):
31 for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
32 if not idx:
33 output.write('\t')
34- output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
35+ output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
36 idx += 1
37 if idx == 2:
38 idx = 0
39@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val):
40 def print_ssl(output, name, val):
41 import os
42 output.write('#include <stdint.h>\n')
43+ output.write('#include <openssl/bn.h>\n')
44 if os.getenv('TARGET_BITS') == '64':
45 return print_ssl_64(output, name, val)
46 else:
47@@ -78,7 +79,7 @@ struct pubkey {
48
49 #define KEYS(e,n) { KEY(e), KEY(n), }
50
51-static struct pubkey keys[] = {
52+static struct pubkey keys[] __attribute__((unused))= {
53 ''')
54 for n in xrange(n + 1):
55 output.write(' KEYS(e_%d, n_%d),\n' % (n, n))
56--
571.9.1
58
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
deleted file mode 100644
index a7fb22a727..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 890f5bf2654b695a866262d72bfa9750af921a3b Mon Sep 17 00:00:00 2001
2From: Ben Hutchings <ben@decadent.org.uk>
3Date: Sat, 23 Aug 2014 12:26:37 -0700
4Subject: [PATCH] Fix linking of libraries used by libreg
5
6The math and crypto libraries are called by and need to be linked to
7libreg.so, not to the executables.
8
9Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027.html]
10
11Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
12Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
13---
14 Makefile | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
16
17diff --git a/Makefile b/Makefile
18index 528a14e..acd818b 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic
22 CFLAGS += -Wall -g
23 LDLIBREG += -lreg
24 LDLIBS += $(LDLIBREG)
25-LDLIBS += -lm
26+LIBREGLDLIBS += -lm
27 LIBREG += libreg.so
28 LDFLAGS += -L ./
29
30@@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize
31
32 ifeq ($(USE_OPENSSL),1)
33 CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
34-LDLIBS += `pkg-config --libs openssl`
35+LIBREGLDLIBS += `pkg-config --libs openssl`
36
37 $(LIBREG): keys-ssl.c
38
39 else
40 CFLAGS += -DUSE_GCRYPT
41-LDLIBS += -lgcrypt
42+LIBREGLDLIBS += -lgcrypt
43
44 $(LIBREG): keys-gcrypt.c
45
46@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
47
48 $(LIBREG): reglib.c regdb.h reglib.h
49 $(NQ) ' CC ' $@
50- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $<
51+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS)
52
53 install-libreg-headers:
54 $(NQ) ' INSTALL libreg-headers'
55--
562.7.4
57
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch
deleted file mode 100644
index 100b765f2d..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From c1c42513edd27c97341f2033af77c13a4724eb8f Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Fri, 25 Nov 2016 16:48:01 +0800
4Subject: [PATCH] crda: Use target word size instead of host's.
5
6In key2pub.py, the codes check the wordsize
7of the host machine but not the target's, this fix
8fetches the wordsize of target from the build system.
9
10Upstream-Status: Pending
11Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
12---
13 utils/key2pub.py | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/utils/key2pub.py b/utils/key2pub.py
17index 3e84cd2..401d58a 100755
18--- a/utils/key2pub.py
19+++ b/utils/key2pub.py
20@@ -58,9 +58,9 @@ def print_ssl_32(output, name, val):
21 output.write('};\n\n')
22
23 def print_ssl(output, name, val):
24- import struct
25+ import os
26 output.write('#include <stdint.h>\n')
27- if len(struct.pack('@L', 0)) == 8:
28+ if os.getenv('TARGET_BITS') == '64':
29 return print_ssl_64(output, name, val)
30 else:
31 return print_ssl_32(output, name, val)
32--
331.9.1
34
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb
deleted file mode 100644
index dd2df32225..0000000000
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb
+++ /dev/null
@@ -1,39 +0,0 @@
1SUMMARY = "Wireless Central Regulatory Domain Agent"
2HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA"
3SECTION = "net"
4LICENSE = "copyleft-next-0.3.0"
5LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe"
6
7DEPENDS = "python3-m2crypto-native libnl libgcrypt"
8
9SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git;branch=master \
10 file://do-not-run-ldconfig-if-destdir-is-set.patch \
11 file://fix-linking-of-libraries-used-by-reglib.patch \
12 file://0001-Makefile-respect-LDFLAGS-for-libreg.patch \
13 file://use-target-word-size-instead-of-host-s.patch \
14 file://fix-issues-when-USE_OPENSSL-1.patch \
15 file://crda-4.14-python-3.patch \
16 file://0001-Make-alpha2-to-be-3-characters-long.patch \
17 file://0001-reglib-Remove-unused-variables.patch \
18"
19SRCREV = "6aeea99ceeec85dd7a9202ee39c7f3b2a8f5195d"
20
21S = "${WORKDIR}/git"
22
23inherit pkgconfig python3-dir python3native siteinfo
24
25# Recursive make problem
26EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg' \
27 UDEV_RULE_DIR=${nonarch_base_libdir}/udev/rules.d/"
28TARGET_BITS = "${SITEINFO_BITS}"
29export TARGET_BITS
30
31do_compile() {
32 oe_runmake all_noverify
33}
34
35do_install() {
36 oe_runmake SBINDIR=${sbindir}/ install
37}
38
39RDEPENDS:${PN} = "udev wireless-regdb"