summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-03-22 13:53:46 +0800
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:45:55 -0700
commit05a234c2dade8d2fa4738c29c76878721a7c32d9 (patch)
treeb97db4a580cd908c9abae91a7bfbf736ec16ea0d
parent0b67e4b4dd23468ad134b5eb9463ecfb22421461 (diff)
downloadmeta-openembedded-05a234c2dade8d2fa4738c29c76878721a7c32d9.tar.gz
crda: refresh patch
Fix QA warning: WARNING: crda-3.18-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch fix-linking-of-libraries-used-by-reglib.patch patching file Makefile Hunk #2 succeeded at 40 with fuzz 2. Hunk #3 succeeded at 46 (offset -5 lines). Hunk #4 succeeded at 116 (offset -5 lines). Now at patch fix-linking-of-libraries-used-by-reglib.patch Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch21
1 files changed, 14 insertions, 7 deletions
diff --git a/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
index aceb56df74..812e983798 100644
--- a/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
+++ b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
@@ -1,6 +1,7 @@
1From 890f5bf2654b695a866262d72bfa9750af921a3b Mon Sep 17 00:00:00 2001
1From: Ben Hutchings <ben@decadent.org.uk> 2From: Ben Hutchings <ben@decadent.org.uk>
2Date: Sat, 23 Aug 2014 12:26:37 -0700 3Date: Sat, 23 Aug 2014 12:26:37 -0700
3Subject: Fix linking of libraries used by libreg 4Subject: [PATCH] Fix linking of libraries used by libreg
4 5
5The math and crypto libraries are called by and need to be linked to 6The math and crypto libraries are called by and need to be linked to
6libreg.so, not to the executables. 7libreg.so, not to the executables.
@@ -9,10 +10,15 @@ Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027
9 10
10Signed-off-by: Ben Hutchings <ben@decadent.org.uk> 11Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
11Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> 12Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
13---
14 Makefile | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
12 16
17diff --git a/Makefile b/Makefile
18index a3ead30..da2dcc3 100644
13--- a/Makefile 19--- a/Makefile
14+++ b/Makefile 20+++ b/Makefile
15@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -peda 21@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic
16 CFLAGS += -Wall -g 22 CFLAGS += -Wall -g
17 LDLIBREG += -lreg 23 LDLIBREG += -lreg
18 LDLIBS += $(LDLIBREG) 24 LDLIBS += $(LDLIBREG)
@@ -21,16 +27,14 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
21 LIBREG += libreg.so 27 LIBREG += libreg.so
22 LDFLAGS += -L ./ 28 LDFLAGS += -L ./
23 29
24@@ -40,7 +40,7 @@ all_noverify: $(LIBREG) crda intersect r 30@@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize
25 31
26 ifeq ($(USE_OPENSSL),1) 32 ifeq ($(USE_OPENSSL),1)
27 CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` 33 CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
28-LDLIBS += `pkg-config --libs openssl` 34-LDLIBS += `pkg-config --libs openssl`
29+LIBREGLDLIBS += `pkg-config --libs openssl` 35+LIBREGLDLIBS += `pkg-config --libs openssl`
30 36
31 ifeq ($(RUNTIME_PUBKEY_ONLY),1) 37 $(LIBREG): keys-ssl.c
32 CFLAGS += -DRUNTIME_PUBKEY_ONLY
33@@ -51,7 +51,7 @@ endif
34 38
35 else 39 else
36 CFLAGS += -DUSE_GCRYPT 40 CFLAGS += -DUSE_GCRYPT
@@ -39,7 +43,7 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
39 43
40 $(LIBREG): keys-gcrypt.c 44 $(LIBREG): keys-gcrypt.c
41 45
42@@ -121,7 +121,7 @@ keys-%.c: utils/key2pub.py $(wildcard $( 46@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
43 47
44 $(LIBREG): regdb.h reglib.h reglib.c 48 $(LIBREG): regdb.h reglib.h reglib.c
45 $(NQ) ' CC ' $@ 49 $(NQ) ' CC ' $@
@@ -48,3 +52,6 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
48 52
49 install-libreg-headers: 53 install-libreg-headers:
50 $(NQ) ' INSTALL libreg-headers' 54 $(NQ) ' INSTALL libreg-headers'
55--
562.7.4
57