diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-03-28 02:41:58 -0400 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-08 17:00:06 -0700 |
commit | 364c9201cb51fcd9cf0c359e743a1962be539fde (patch) | |
tree | 2fcfd463df7834173f9ab18e36871c56a4fd90a0 /meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch | |
parent | 49390ebce5716963219a48ad97673fa50758348e (diff) | |
download | meta-openembedded-364c9201cb51fcd9cf0c359e743a1962be539fde.tar.gz |
efivar: refresh the patches
fixes
WARNING: efivar-0.31-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 allow-multi-definitions-for-native.patch
patching file Make.rules
Hunk #1 succeeded at 20 with fuzz 2.
Now at patch allow-multi-definitions-for-native.patch
Now at patch 0003-efivar-fix-for-cross-compile.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch')
-rw-r--r-- | meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch b/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch index 1b8815e9df..b4ce132a25 100644 --- a/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch @@ -1,4 +1,4 @@ -From 3d43c5efdb632da5d7387dcadce4e87b83929c64 Mon Sep 17 00:00:00 2001 +From d65c325dd8681edf2ee3332eeb0a547229c7ffb5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 24 Aug 2017 15:54:47 -0700 Subject: [PATCH] efivar-dp.h: Add -Wunknown-attributes when using clang @@ -7,15 +7,16 @@ change !dp check to a comparision against NULL to silent clang warning nonnull parameter 'dp' will evaluate to 'true' on first encounter Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - src/include/efivar/efivar-dp.h | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) + src/include/efivar/efivar-dp.h | 5 +++++ + 1 file changed, 5 insertions(+) -Index: git/src/include/efivar/efivar-dp.h -=================================================================== ---- git.orig/src/include/efivar/efivar-dp.h -+++ git/src/include/efivar/efivar-dp.h -@@ -783,9 +783,14 @@ extern int efidp_append_instance(const_e +diff --git a/src/include/efivar/efivar-dp.h b/src/include/efivar/efivar-dp.h +index 3a509b7..c140e8d 100644 +--- a/src/include/efivar/efivar-dp.h ++++ b/src/include/efivar/efivar-dp.h +@@ -783,9 +783,14 @@ extern int efidp_append_instance(const_efidp dp, const_efidp dpi, efidp *out); * though older or other compilers might just ignore that attribute if they * don't support it. Ugh. */ |