From patchwork Fri Mar 9 18:56:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131238 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345252lja; Fri, 9 Mar 2018 11:06:39 -0800 (PST) X-Google-Smtp-Source: AG47ELv60Mf+jG5iWn/b6ogBNHsggEPV1Ise5CKJfSmIlNjw7IJSGc0rRThOhYDVjwKPu9wi5YQu X-Received: by 10.99.9.195 with SMTP id 186mr24913488pgj.152.1520622399008; Fri, 09 Mar 2018 11:06:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622399; cv=none; d=google.com; s=arc-20160816; b=BsOt0LCBse+Iq787GQ3q+DE4YDcqoGka3tRbOKyVRa3mPReaLz1nCSeE36UmWheKyk YMeyOcyInr7iVFaVzfnwtH3bGwUNJLiFc9bAsvEAkjKYOh/Cj7EdLez3h24xvCFm+IHx 570uWMOMB/bxPs/qesIfnvcSG8PIOkLAyEKBtC3G89TTt3ekmgjKHzWPaBb9uCZuD8Mn Lj/iNirgMwiLhE6knDY7Co8uHkrGFIjyeV9eGiXNPxf09QDZGGJN4WXn6jb98nvSw+Hc iBuaaQd6uR3zH4RjKoCPcqq3jo6zO5qc3PicPk6OiKuxYZmID7KdGLw/wHHGb2y8TP6F Wl3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=FJcbcc52XStJAAHv/RF++sY9TG+TL2ZvQWfdtQY+omc=; b=al+kSpDYyjW+TgqrCBF0Devo/eRUsSom99qtNYYIYhVpZpj7YYA4BdAinCXe7i2lG7 UVN4owGFHwUJ7GDPfhR7iN3vBobhqmqvUwp6xctlDOjoQp5nlAtgzBi1Jj9rTWCkVzX9 dhaJjxex1Zxaf/V+jjax/9JXXcoScDeBIUIl4TW6cID4uX//MfJwIoC/bHLaWBek3lG7 eeeXTRFFvViGrB1XMVW20lV4dERyDo0tbuaoeNbuzgob0ASKRNtH6IuGY0lP+BtTTk+u AbSRbTCQ1wqLMg78lkglCaUXExtn1LmEx/Hxj5na4hNHJYmKy/SFpaf5h+euek6egTDC CPNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d7si1084847pgf.766.2018.03.09.11.06.38; Fri, 09 Mar 2018 11:06:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4A4DC789FA; Fri, 9 Mar 2018 19:03:45 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id 212F2789A0 for ; Fri, 9 Mar 2018 19:03:34 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2018 11:03:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652055" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:34 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:08 +0200 Message-Id: <20180309185614.31113-30-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> References: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 30/36] xorg-xserver: refresh patches X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: 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 Signed-off-by: Alexander Kanavin --- .../xorg-xserver/xserver-xorg/macro_tweak.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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 ec0eea6ca2d..c36e4e73012 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 Signed-off-by: Yu Ke -diff --git a/xorg-server.m4 b/xorg-server.m4 -index bdecf62..040fdb8 100644 ---- a/xorg-server.m4 -+++ b/xorg-server.m4 +Index: xorg-server-1.19.6/xorg-server.m4 +=================================================================== +--- xorg-server-1.19.6.orig/xorg-server.m4 ++++ xorg-server-1.19.6/xorg-server.m4 @@ -28,10 +28,12 @@ dnl - # Checks for the $1 define in xorg-server.h (from the sdk). If it - # is defined, then add $1 to $REQUIRED_MODULES. + # Checks for the MACRO define in xorg-server.h (from the sdk). If it + # is defined, then add the given PROTO to $REQUIRED_MODULES. +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) +