summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:02 -0800
commitf38a6e35e27b9da3ea24d737777336df474c0767 (patch)
treef1011dc1b594cb19877e695490987cb72d9445cb
parenta2a243b49bd146b75521bbdfd12b428bd3db750d (diff)
downloadpoky-f38a6e35e27b9da3ea24d737777336df474c0767.tar.gz
grub: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 856a70cf6ca9137d5c07c2aa9ef447032589504d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch17
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
index 935c472cf8..ffc2d40d89 100644
--- a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
+++ b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
@@ -43,19 +43,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
43 grub-core/genmod.sh.in | 2 +- 43 grub-core/genmod.sh.in | 2 +-
44 1 file changed, 1 insertion(+), 1 deletion(-) 44 1 file changed, 1 insertion(+), 1 deletion(-)
45 45
46diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in 46Index: grub-2.02/grub-core/genmod.sh.in
47index 76df0bb..39a9cfc 100644 47===================================================================
48--- a/grub-core/genmod.sh.in 48--- grub-2.02.orig/grub-core/genmod.sh.in
49+++ b/grub-core/genmod.sh.in 49+++ grub-2.02/grub-core/genmod.sh.in
50@@ -59,7 +59,7 @@ if test x@TARGET_APPLE_CC@ != x1; then 50@@ -56,7 +56,7 @@ if test x@TARGET_APPLE_LINKER@ != x1; th
51 if test x@platform@ != xemu; then 51 if test x@platform@ != xemu; then
52 @STRIP@ --strip-unneeded \ 52 @TARGET_STRIP@ --strip-unneeded \
53 -K grub_mod_init -K grub_mod_fini \ 53 -K grub_mod_init -K grub_mod_fini \
54- -K _grub_mod_init -K _grub_mod_fini \ 54- -K _grub_mod_init -K _grub_mod_fini \
55+ -K _grub_mod_init -K _grub_mod_fini -K .module_license \ 55+ -K _grub_mod_init -K _grub_mod_fini -K .module_license \
56 -R .note.gnu.gold-version -R .note.GNU-stack \ 56 -R .note.gnu.gold-version -R .note.GNU-stack \
57 -R .note -R .comment $tmpfile || exit 1 57 -R .note -R .comment -R .ARM.exidx $tmpfile || exit 1
58 fi 58 fi
59--
602.8.1
61