Skip to content

Commit

Permalink
crda: refresh patch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
yizhao1 authored and akuster committed Apr 9, 2018
1 parent 472b31e commit 302948f
Showing 1 changed file with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
From 890f5bf2654b695a866262d72bfa9750af921a3b Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 23 Aug 2014 12:26:37 -0700
Subject: Fix linking of libraries used by libreg
Subject: [PATCH] Fix linking of libraries used by libreg

The math and crypto libraries are called by and need to be linked to
libreg.so, not to the executables.
Expand All @@ -9,10 +10,15 @@ Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a3ead30..da2dcc3 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -peda
@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic
CFLAGS += -Wall -g
LDLIBREG += -lreg
LDLIBS += $(LDLIBREG)
Expand All @@ -21,16 +27,14 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
LIBREG += libreg.so
LDFLAGS += -L ./

@@ -40,7 +40,7 @@ all_noverify: $(LIBREG) crda intersect r
@@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize

ifeq ($(USE_OPENSSL),1)
CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
-LDLIBS += `pkg-config --libs openssl`
+LIBREGLDLIBS += `pkg-config --libs openssl`

ifeq ($(RUNTIME_PUBKEY_ONLY),1)
CFLAGS += -DRUNTIME_PUBKEY_ONLY
@@ -51,7 +51,7 @@ endif
$(LIBREG): keys-ssl.c

else
CFLAGS += -DUSE_GCRYPT
Expand All @@ -39,7 +43,7 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

$(LIBREG): keys-gcrypt.c

@@ -121,7 +121,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(
@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)

$(LIBREG): regdb.h reglib.h reglib.c
$(NQ) ' CC ' $@
Expand All @@ -48,3 +52,6 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

install-libreg-headers:
$(NQ) ' INSTALL libreg-headers'
--
2.7.4

0 comments on commit 302948f

Please sign in to comment.