CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

crda: 3.18 -> 4.15

Browse Source 
Update crda from 3.18 to 4.15:

* use git repo in SRC_URI that no tar archive found for recent releases
* drop fix-gcc-6-unused-variables.patch and make.patch
* rebase patches

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Kai Kang 2023-01-17 12:22:23 +08:00 committed by Khem Raj
parent 175682f0df
commit 27ce15a047
7 changed files with 37 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch
View File

@ -7,20 +7,24 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Rebase for crda 4.15.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 2879896..1650db8 100644
index 528a14e..31f1b5e 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
$(LIBREG): regdb.h reglib.h reglib.c
$(LIBREG): reglib.c regdb.h reglib.h
$(NQ) ' CC ' $@
- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS)
+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS)
- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS)
+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LDFLAGS) $(LIBREGLDLIBS)
install-libreg-headers:
$(NQ) ' INSTALL libreg-headers'

11
meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch
View File

@ -3,6 +3,15 @@ https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c50acec16bc7c33d6dc122c007
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Rebase for crda 4.15.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
utils/key2pub.py | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/utils/key2pub.py b/utils/key2pub.py
index 22fda55..2a4980b 100755
--- a/utils/key2pub.py
+++ b/utils/key2pub.py
@@ -1,22 +1,22 @@
@ -77,7 +86,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
idx = 0
@@ -118,7 +118,7 @@ struct key_params {
static const struct key_params keys[] __attribute__((unused))= {
static const struct key_params __attribute__ ((unused)) keys[] = {
''')
- for n in xrange(n + 1):
+ for n in range(n + 1):

13
meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch
View File

@ -7,12 +7,21 @@ Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126028
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Rebase patch for crda 4.15.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Makefile b/Makefile
index 6ca26f3..528a14e 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,9 @@ install-libreg:
@@ -127,7 +127,9 @@ install-libreg:
$(NQ) ' INSTALL libreg'
$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
$(Q)$(INSTALL) -m 644 $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+ifndef DESTDIR
$(Q)ldconfig
+endif

11
meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch
View File

@ -1,11 +0,0 @@
--- crda-3.18/utils/key2pub.py.orig 2016-06-18 09:54:23.671326113 -0400
+++ crda-3.18/utils/key2pub.py 2016-06-18 09:54:34.387326300 -0400
@@ -115,7 +115,7 @@
.n = _n, .len_n = sizeof(_n), \
}
-static const struct key_params keys[] = {
+static const struct key_params keys[] __attribute__((unused))= {
''')
for n in xrange(n + 1):
output.write(' KEYS(e_%d, n_%d),\n' % (n, n))

8
meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index a3ead30..da2dcc3 100644
index 528a14e..acd818b 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic
@ -45,10 +45,10 @@ index a3ead30..da2dcc3 100644
@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
$(LIBREG): regdb.h reglib.h reglib.c
$(LIBREG): reglib.c regdb.h reglib.h
$(NQ) ' CC ' $@
- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS)
- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $<
+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS)
install-libreg-headers:
$(NQ) ' INSTALL libreg-headers'

25
meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/make.patch
View File

@ -1,25 +0,0 @@
These headers are not related to any Make rule but they do appear in
compiling of libreg.so, specifying .h files in compiler cmdline is flagged
as error by clang
| clang-4.0: error: cannot specify -o when generating multiple output files
| make: *** [libreg.so] Error 1
This is how we see headers in cmdline
-O2 -fpic -std=gnu
99 -Wall -Werror -pedantic -Wall -g -DUSE_GCRYPT -DCONFIG_LIBNL30 `pkg-config --cflags libnl-3.0` -o libreg.so -shared -Wl,-soname,libreg.so
regdb.h reglib.h reglib.c keys-gcrypt.c -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -L ./ -lm -lgcrypt
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/Makefile.kk 2016-11-15 04:54:53.338670000 +0000
+++ a/Makefile 2016-11-15 04:55:07.718670000 +0000
@@ -114,7 +114,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(
$(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
-$(LIBREG): regdb.h reglib.h reglib.c
+$(LIBREG): reglib.c
$(NQ) ' CC ' $@
$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS)

9
meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb → meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb
View File

@ -6,20 +6,19 @@ LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabe
DEPENDS = "python3-m2crypto-native libnl libgcrypt"
SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git;branch=master \
file://do-not-run-ldconfig-if-destdir-is-set.patch \
file://fix-linking-of-libraries-used-by-reglib.patch \
file://fix-gcc-6-unused-variables.patch \
file://0001-Makefile-respect-LDFLAGS-for-libreg.patch \
file://make.patch \
file://use-target-word-size-instead-of-host-s.patch \
file://fix-issues-when-USE_OPENSSL-1.patch \
file://crda-4.14-python-3.patch \
file://0001-Make-alpha2-to-be-3-characters-long.patch \
file://0001-reglib-Remove-unused-variables.patch \
"
SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a"
SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf"
SRCREV = "6aeea99ceeec85dd7a9202ee39c7f3b2a8f5195d"
S = "${WORKDIR}/git"
inherit pkgconfig python3-dir python3native siteinfo