summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:56:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:01 -0700
commit631e06643bafd7151d5daaf362293c27c8f3fa97 (patch)
tree4d2bc9ba4c81fdc07ed3680819aa8a64529b19a8 /meta
parent5dfe5f9573ee58be796549599323ca68db706c8b (diff)
downloadpoky-631e06643bafd7151d5daaf362293c27c8f3fa97.tar.gz
xorg-xserver: 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: 77fb72c76c8a5b2229a32f36a913a3293e9d2b56) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
index ec0eea6ca2..c36e4e7301 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
@@ -5,13 +5,13 @@ Upstream-Status: Pending
5 5
6Signed-off-by: Yu Ke <ke.yu@intel.com> 6Signed-off-by: Yu Ke <ke.yu@intel.com>
7 7
8diff --git a/xorg-server.m4 b/xorg-server.m4 8Index: xorg-server-1.19.6/xorg-server.m4
9index bdecf62..040fdb8 100644 9===================================================================
10--- a/xorg-server.m4 10--- xorg-server-1.19.6.orig/xorg-server.m4
11+++ b/xorg-server.m4 11+++ xorg-server-1.19.6/xorg-server.m4
12@@ -28,10 +28,12 @@ dnl 12@@ -28,10 +28,12 @@ dnl
13 # Checks for the $1 define in xorg-server.h (from the sdk). If it 13 # Checks for the MACRO define in xorg-server.h (from the sdk). If it
14 # is defined, then add $1 to $REQUIRED_MODULES. 14 # is defined, then add the given PROTO to $REQUIRED_MODULES.
15 15
16+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) 16+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
17+ 17+