From fc856d4539a13f1ea6bf7ce347e9ca85577ecfb8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 15 Nov 2017 16:45:42 +0000 Subject: lsb: 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. Signed-off-by: Ross Burton --- ...ons-avoid-exit-1-which-causes-init-scripts-to-.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'meta') diff --git a/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch index 17c90029c3..c0076453f2 100644 --- a/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch +++ b/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch @@ -7,18 +7,15 @@ Signed-off-by: Chen Qi rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions -index 6850046..11223f7 100644 ---- a/rc.d/init.d/functions -+++ b/rc.d/init.d/functions -@@ -597,6 +597,6 @@ if [ "$_use_systemctl" = "1" ]; then - fi +Index: initscripts-9.72/rc.d/init.d/functions +=================================================================== +--- initscripts-9.72.orig/rc.d/init.d/functions ++++ initscripts-9.72/rc.d/init.d/functions +@@ -686,6 +686,6 @@ if [ "$_use_systemctl" = "1" ]; then + fi fi -strstr "$(cat /proc/cmdline)" "rc.debug" && set -x +strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true return 0 - --- -2.1.0 - + -- cgit 1.2.3-korg