| Message ID | 20180306151006.26952-1-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | 9f15e5256eb79c8cfc4b3a4e11617eeb5f38edea |
| Headers | show |
| Series | dbus-glib: refresh patches | expand |
I don't want to spam the list again, so this is the new commit message on my patch rebase series. The rest are in poky-contrib:ross/mut2 and are identical. Any further comments? Ross On 6 March 2018 at 15:10, Ross Burton <ross.burton@intel.com> wrote: > 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 <ross.burton@intel.com> > --- > meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch > b/meta/recipes-core/dbus/dbus-glib/no-examples.patch > index fbb49678282..32e76117188 100644 > --- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch > +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch > @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature] > Signed-off-by: Kevin Tian <kevin.tian@intel.com> > Signed-off-by: Scott Garman <scott.a.garman@intel.com> > > ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 > 16:04:43.000000000 +0200 > -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 > +0200 > +Index: dbus-glib-0.108/dbus/Makefile.am > +=================================================================== > +--- dbus-glib-0.108.orig/dbus/Makefile.am > ++++ dbus-glib-0.108/dbus/Makefile.am > @@ -1,4 +1,4 @@ > -SUBDIRS = . examples > +SUBDIRS = . > > - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) > $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@ > DATADIRNAME@/locale\" > - > + AM_CPPFLAGS = \ > + -I$(top_srcdir) \ > -- > 2.11.0 > > <div dir="ltr">I don't want to spam the list again, so this is the new commit message on my patch rebase series. The rest are in poky-contrib:ross/mut2 and are identical. Any further comments?<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 6 March 2018 at 15:10, Ross Burton <span dir="ltr"><<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The patch tool will apply patches by default with "fuzz", which is where if the<br> hunk context isn't present but what is there is close enough, it will force the<br> patch in.<br> <br> Whilst this is useful when there's just whitespace changes, when applied to<br> source it is possible for a patch applied with fuzz to produce broken code which<br> still compiles (see #10450). This is obviously bad.<br> <br> We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For<br> that to be realistic the existing patches with fuzz need to be rebased and<br> reviewed.<br> <br> Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>><br> ---<br> meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch | 10 ++++++----<br> 1 file changed, 6 insertions(+), 4 deletions(-)<br> <br> diff --git a/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch b/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br> index fbb49678282..32e76117188 100644<br> --- a/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br> +++ b/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br> @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature]<br> Signed-off-by: Kevin Tian <<a href="mailto:kevin.tian@intel.com">kevin.tian@intel.com</a>><br> Signed-off-by: Scott Garman <<a href="mailto:scott.a.garman@intel.com">scott.a.garman@intel.com</a>><br> <br> ---- dbus-glib-0.70/dbus/Makefile.<wbr>am.orig 2006-07-23 16:04:43.000000000 +0200<br> -+++ dbus-glib-0.70/dbus/Makefile.<wbr>am 2006-07-23 16:04:52.000000000 +0200<br> +Index: dbus-glib-0.108/dbus/Makefile.<wbr>am<br> +=============================<wbr>==============================<wbr>========<br> +--- dbus-glib-0.108.orig/dbus/<wbr>Makefile.am<br> ++++ dbus-glib-0.108/dbus/Makefile.<wbr>am<br> @@ -1,4 +1,4 @@<br> -SUBDIRS = . examples<br> +SUBDIRS = .<br> <br> - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@<wbr>DATADIRNAME@/locale\"<br> -<br> + AM_CPPFLAGS = \<br> + -I$(top_srcdir) \<br> <span class="HOEnZb"><font color="#888888">--<br> 2.11.0<br> <br> </font></span></blockquote></div><br></div> -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch index fbb49678282..32e76117188 100644 --- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Kevin Tian <kevin.tian@intel.com> Signed-off-by: Scott Garman <scott.a.garman@intel.com> ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 +Index: dbus-glib-0.108/dbus/Makefile.am +=================================================================== +--- dbus-glib-0.108.orig/dbus/Makefile.am ++++ dbus-glib-0.108/dbus/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . examples +SUBDIRS = . - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" - + AM_CPPFLAGS = \ + -I$(top_srcdir) \
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 <ross.burton@intel.com> --- meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core