From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][PATCH 2/4] libqmi: refresh patch
Date: Wed, 21 Mar 2018 16:52:00 +0000 [thread overview]
Message-ID: <20180321165202.1777-2-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <20180321165202.1777-1-Martin.Jansa@gmail.com>
WARNING: libqmi-1.20.0-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 0001-Detect-clang.patch
patching file m4/compiler-warnings.m4
Hunk #2 succeeded at 37 with fuzz 2.
Now at patch 0001-Detect-clang.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch b/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch
index 4047ffbf23..7be1d3f1b0 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch
@@ -1,4 +1,4 @@
-From 4cfb728804157e8f3c69e11ba4df449d8f76388f Mon Sep 17 00:00:00 2001
+From 3a95d82ba11d054c8d8abd332f053c787d0f924d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 20 Oct 2016 04:42:26 +0000
Subject: [PATCH] Detect clang
@@ -12,12 +12,13 @@ compiler are accepted.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
+
---
m4/compiler-warnings.m4 | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4
-index de4a8b0..e4ba718 100644
+index 5ba490c..9202274 100644
--- a/m4/compiler-warnings.m4
+++ b/m4/compiler-warnings.m4
@@ -2,10 +2,30 @@ AC_DEFUN([LIBQMI_COMPILER_WARNINGS],
@@ -53,7 +54,7 @@ index de4a8b0..e4ba718 100644
-Wdeclaration-after-statement -Wstrict-prototypes \
@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-Wmissing-include-dirs -Waggregate-return \
- -Wformat-security; do
+ -Wformat-security -Wtype-limits; do
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
+ CFLAGS="$CFLAGS $option $WERROR"
@@ -79,6 +80,3 @@ index de4a8b0..e4ba718 100644
else
AC_MSG_RESULT(no)
fi
---
-1.9.1
-
--
2.15.1
next prev parent reply other threads:[~2018-03-21 16:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-21 16:51 [meta-oe][PATCH 1/4] krb5: refresh patches Martin Jansa
2018-03-21 16:52 ` Martin Jansa [this message]
2018-03-21 16:52 ` [meta-oe][PATCH 3/4] mozjs: " Martin Jansa
2018-03-21 17:03 ` [meta-oe][PATCHv2 " Martin Jansa
2018-03-26 20:57 ` Martin Jansa
2018-03-26 21:43 ` [meta-oe][PATCHv3] " Martin Jansa
2018-03-26 22:02 ` Andreas Müller
2018-03-26 22:11 ` Martin Jansa
2018-03-26 22:27 ` Andreas Müller
2018-03-26 23:02 ` Andreas Müller
2018-03-27 4:48 ` Martin Jansa
2018-03-21 16:52 ` [meta-oe][PATCH 4/4] pidgin: " Martin Jansa
2018-03-21 16:57 ` [meta-oe][PATCH 1/4] krb5: " Martin Jansa
2018-03-21 17:03 ` [meta-oe][PATCHv2 " Martin Jansa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180321165202.1777-2-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.