Re: [OE-core] [PATCH] dbus-glib: refresh patches

[Burton, Ross]

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  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 
> ---
>  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 
>  Signed-off-by: Scott Garman 
>
>  dbus-glib-0.70/dbus/Makefile.am.orig   2006-07-23
> 16:04:43.0 +0200
> -+++ dbus-glib-0.70/dbus/Makefile.am2006-07-23 16:04:52.0
> +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
>
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] dbus-glib: refresh patches

[Ross Burton]

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 
---
 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 
 Signed-off-by: Scott Garman 
 
 dbus-glib-0.70/dbus/Makefile.am.orig   2006-07-23 16:04:43.0 
+0200
-+++ dbus-glib-0.70/dbus/Makefile.am2006-07-23 16:04:52.0 +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

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core