From patchwork Fri Mar 9 18:55:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131214 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1341617lja; Fri, 9 Mar 2018 11:03:01 -0800 (PST) X-Google-Smtp-Source: AG47ELtmxV51c4BhrkWN3QV3hXjDEoMHDL8EEFTvetBJskuwLizubtBJjbb4CUIOnoQecJjqzSHW X-Received: by 10.98.103.136 with SMTP id t8mr31209340pfj.177.1520622181070; Fri, 09 Mar 2018 11:03:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622181; cv=none; d=google.com; s=arc-20160816; b=c/l6AOzkenXgvPme9G6g7A+8OTUSvoCf9+/0v1qd5IojLgXpeznutUsslVYVEEW72L wuEPxfy8rwhmgKONWTcTZ8Nc+qk5YgRKv4AiRnD5raXEocKh/jyURkFP6TTk2/zveN87 N0thmyHiYwzARArejAiOcPoJHuF7phcDWxT3anZi94N/ULkkuRjvFCSPOU2eUU97JaXK 4SGAAMdFM+032BATmCZgeiGV1icJN2yfCP5oR//CjivBG03N6NIYfejwei3TEIWvhb/j Hi0WNw7yJATDIz3oyKHC+sQDByN6b331vBqVtUQkezijXU0pce7kGfCYlDyw91SOQXGs r/MQ== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=TcNNky7wMwdngj1u3i91aZvOheMFu5OEC5JApuonVwI=; b=N7eH6dyYFXq+AHgHO4XJIuguIbUaebv9sfgHfYnp58ZL6ve1BpLKDeSFtzowHSgadY S3dhHdkpL5gk4liWpADv+eMijCNAKG/v8kqkIE3iFY210B5oVcAci5VAp4+IREZO8DMm 9sZ+gjOMUYGsWp57M/hkSVtw8ctsbZRD3zGrYQ8ISIxc2kapnJUFvDS9Td4if1Om/3+9 iQDxnEH+k0nk0EdtpNtIIDOuD7wXgvI7HCgloo1nWwyCWvozClMg4M7UTxNMZP3rT8hw 1KaH/KQkDNxUDYsRDOM9sBg+7WML4CrOMjjzm6j3YI+0u6TGfVoeI7YhuHCx28r+c/Yw aqrA== 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 d4-v6si1266604plr.598.2018.03.09.11.03.00; Fri, 09 Mar 2018 11:03:01 -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 6FFF67891C; Fri, 9 Mar 2018 19:02:56 +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 AC77F7890D for ; Fri, 9 Mar 2018 19:02:53 +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:02:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651850" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:02:53 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:39 +0200 Message-Id: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 Subject: [OE-core] [PATCH 01/36] pciutils: 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 --- meta/recipes-bsp/pciutils/pciutils/configure.patch | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 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-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index 55edfea3f61..a7e445733a8 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -13,11 +13,11 @@ Ionut Radu Upstream-Status: Inappropriate [embedded specific] -Index: pciutils-3.5.4/Makefile +Index: pciutils-3.5.6/Makefile =================================================================== ---- pciutils-3.5.4.orig/Makefile -+++ pciutils-3.5.4/Makefile -@@ -96,7 +95,7 @@ example: example.o lib/$(PCILIB) +--- pciutils-3.5.6.orig/Makefile ++++ pciutils-3.5.6/Makefile +@@ -96,7 +96,7 @@ example: example.o lib/$(PCILIB) example.o: example.c $(PCIINC) %: %.o @@ -26,12 +26,12 @@ Index: pciutils-3.5.4/Makefile %.8 %.7: %.man M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#" -Index: pciutils-3.5.4/lib/configure +Index: pciutils-3.5.6/lib/configure =================================================================== ---- pciutils-3.5.4.orig/lib/configure -+++ pciutils-3.5.4/lib/configure -@@ -14,6 +14,10 @@ echo_n() { - fi +--- pciutils-3.5.6.orig/lib/configure ++++ pciutils-3.5.6/lib/configure +@@ -9,6 +9,10 @@ echo_n() { + printf '%s' "$*" } +VERSION=$1 @@ -41,7 +41,7 @@ Index: pciutils-3.5.4/lib/configure if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then echo >&2 "Please run the configure script from the top-level Makefile" exit 1 -@@ -21,8 +25,8 @@ fi +@@ -16,8 +20,8 @@ fi echo_n "Configuring libpci for your system..." if [ -z "$HOST" ] ; then @@ -52,7 +52,7 @@ Index: pciutils-3.5.4/lib/configure realsys="$sys" if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] then -@@ -30,7 +34,7 @@ if [ -z "$HOST" ] ; then +@@ -25,7 +29,7 @@ if [ -z "$HOST" ] ; then proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` else @@ -61,7 +61,7 @@ Index: pciutils-3.5.4/lib/configure fi if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] then -@@ -40,7 +44,7 @@ if [ -z "$HOST" ] ; then +@@ -35,7 +39,7 @@ if [ -z "$HOST" ] ; then then sys=cygwin fi @@ -70,7 +70,7 @@ Index: pciutils-3.5.4/lib/configure fi [ -n "$RELEASE" ] && rel="${RELEASE}" # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. -@@ -49,6 +53,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ +@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo " $host $rel $cpu $sys" From patchwork Fri Mar 9 18:55:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131215 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1341973lja; Fri, 9 Mar 2018 11:03:20 -0800 (PST) X-Google-Smtp-Source: AG47ELuDU/EbuGp2O88wHSHxbtgNz3yBAUlDo8Ila6SDFKUuflSdJLUzCIANR49md9FWzXfba0du X-Received: by 10.101.97.79 with SMTP id o15mr610601pgv.31.1520622200824; Fri, 09 Mar 2018 11:03:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622200; cv=none; d=google.com; s=arc-20160816; b=jsiX/pf2P2ac+AfE17VsrOvWvJTVxToVgH3niyLVzKYTAczyCJQA1+bVzSdzDqakEx J2e0tLIaIua6iHlTudUxGZa5M3eA69FjAH00FD3BqeeIIiD82AbMsC+M4vlU6T2Khba7 CW7WvgbxBxLi33k2GCyC/SqmTEuK6/nGg465Fo+gpmetZxwVexACRBXvStp4MKAAn4RY UBFHoeMgLEjsJnVYUaC+Xk2joGoOyNUyVjWpVNieyfDtlMMq+VIR1Fzm4LWuEMbgiuz6 kWYDOw/WwsgQV1UKLs6THVZBYuoOcqLvaGtkhmy0qHSRUb/j9yXj/nczqn+8hDUlIGsu jpkQ== 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=QoAF3Zh+N+j8Py0p49L3Qh0zBaXOsdTEmX3iSohQbgw=; b=FarcEy7GdFbVDDYXEFybr495UH2qgWAbmojfzZ0hRFZK06cznySJ+GiUDnjD2+PmC3 FNGD5MIiHbaFrtVPUkFYGcipyB0AVEq52HD+ABeImOMuXw5vr4wekzBqccXy6u6XMjmA NX2Zba2RZETBa+S72ltCW3nyBoUKnAewXVyCEPAwDLyjYxfcbkK3GLRQL/KELjba9moG 8eFB9W2+z7XIglwuNobNHH1LlWRG6bHSWeUIWPEfuwOOPp8WwSVwr9Zqk8UaBoYO7iL7 /yypP6R6iiwBo98MMeJhb0KSe3cP0UQQWVuFqTyBBNpT+rOKC7HI/QPKpX1rC3yUO/iv g7EA== 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 a189si1113452pgc.123.2018.03.09.11.03.20; Fri, 09 Mar 2018 11:03:20 -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 A08FB78953; Fri, 9 Mar 2018 19:03:13 +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 7168A78917 for ; Fri, 9 Mar 2018 19:02:55 +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:02:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651855" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:02:56 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:41 +0200 Message-Id: <20180309185614.31113-3-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 03/36] u-boot: 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 --- .../recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch index cea52b79e6a..ecaa1796a49 100644 --- a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch +++ b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch @@ -5,15 +5,15 @@ Upstream-Status: Pending Signed-off-by: Ed Bartosh -diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig -index 4e2b705..b02ab1f 100644 ---- a/configs/MPC8315ERDB_defconfig -+++ b/configs/MPC8315ERDB_defconfig -@@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y - CONFIG_CMD_I2C=y +Index: git/configs/MPC8315ERDB_defconfig +=================================================================== +--- git.orig/configs/MPC8315ERDB_defconfig ++++ git/configs/MPC8315ERDB_defconfig +@@ -12,6 +12,7 @@ CONFIG_CMD_PCI=y + CONFIG_CMD_SATA=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y - CONFIG_CMD_EXT2=y + CONFIG_CMD_DATE=y From patchwork Fri Mar 9 18:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131216 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1342100lja; Fri, 9 Mar 2018 11:03:27 -0800 (PST) X-Google-Smtp-Source: AG47ELvl1ZBLypUeAgfLEJGw0AhCDcuXkYbfDklNgYFAONu8tVuiGxeLz5Vmy9iJtfiNDhQDOfDu X-Received: by 10.101.101.4 with SMTP id x4mr25365004pgv.275.1520622207349; Fri, 09 Mar 2018 11:03:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622207; cv=none; d=google.com; s=arc-20160816; b=XReMTHocwFeej+c2/QRIfDcpejUUYZvS21ApP0GUWl4QBDJOi2N8+HkhWm+GQ6pNmb xU3qsSXslJU1XGFu+d8G/o1SV3m/99Y+wMPuuKw8DgBjjZ+jOR2deEx0vneOc/Xqr8sD QlIDmIgpTwTYi5VZhZ0HNkGbIZmOxD50BeIqfKMg04b6xObTqO558bXKbLOw3PqZf4Xy E0V5F/B6OSLaqOCqALaLcdzSbX3o4cnySaXawC+cHOqQZd+rj5tHqj1/6QDrKPy+2pv6 L0T6Sn0jOSKyDgum1lSRmOg6vICJ/G/B3EmUKgkyTDr6Mjuvzp+fVAuWUcgVb9JQeUus Cx7w== 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=+7tsttdA/Tlofrw1Crbb8XZCkCLPJ/FH+mxoG70jKXM=; b=la3rlSqdxe7wrOsdFHRl6el7Y33EALzXnXYE5gGo/Vu3XXUfi+N1jrr/GXkbJH31UO dAOrNZeofbB2ElqOqFMZNfG3zq6Tk3z1TSAddDXkVuFdIiM+YmdwqOKVipmfIob6w3Sp JR0UArpID8i+QMd70rw3qTHoM4kN1xzmkR4JQ0MjxWuef11h+WgKZLQEQiuAr+W8yAQ3 +NZIUKGwxtN6BNRKzPjG2Jmhk7QU+kq4CaQhN5fe3ZMbUP/k2VqdkL8ukmPJ7mmRHIb1 u5JGcxhHhdtIdeyCIF+unFGejrCWR2etBQyjHumPeJ1dYRqI/yXe/l3rklk0J36ibA5/ RKBA== 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 o1-v6si1290500plk.138.2018.03.09.11.03.26; Fri, 09 Mar 2018 11:03:27 -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 B416278948; Fri, 9 Mar 2018 19:03:14 +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 D2C0D78937 for ; Fri, 9 Mar 2018 19:02:56 +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:02:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651863" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:02:57 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:42 +0200 Message-Id: <20180309185614.31113-4-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 04/36] avahi: 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 --- .../avahi/files/initscript.patch | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 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-connectivity/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch index 193889eb5c2..c856c3df046 100644 --- a/meta/recipes-connectivity/avahi/files/initscript.patch +++ b/meta/recipes-connectivity/avahi/files/initscript.patch @@ -1,10 +1,10 @@ Upstream-Status: Pending -diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in -index 30a2c2f..b5848a8 100755 ---- a/initscript/debian/avahi-daemon.in -+++ b/initscript/debian/avahi-daemon.in -@@ -1,2 +1,14 @@ +Index: avahi-0.7/initscript/debian/avahi-daemon.in +=================================================================== +--- avahi-0.7.orig/initscript/debian/avahi-daemon.in ++++ avahi-0.7/initscript/debian/avahi-daemon.in +@@ -1,5 +1,17 @@ #!/bin/sh - +### BEGIN INIT INFO @@ -20,11 +20,14 @@ index 30a2c2f..b5848a8 100755 +# automatically +### END INIT INFO +# -diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in -index ac34804..f95c340 100755 ---- a/initscript/debian/avahi-dnsconfd.in -+++ b/initscript/debian/avahi-dnsconfd.in -@@ -1,1 +1,14 @@ + # This file is part of avahi. + # + # avahi is free software; you can redistribute it and/or modify it +Index: avahi-0.7/initscript/debian/avahi-dnsconfd.in +=================================================================== +--- avahi-0.7.orig/initscript/debian/avahi-dnsconfd.in ++++ avahi-0.7/initscript/debian/avahi-dnsconfd.in +@@ -1,4 +1,17 @@ #!/bin/sh +### BEGIN INIT INFO +# Provides: avahi-dnsconfd @@ -39,3 +42,6 @@ index ac34804..f95c340 100755 +# automatically +### END INIT INFO +# + + # This file is part of avahi. + # From patchwork Fri Mar 9 18:55:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131217 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1342219lja; Fri, 9 Mar 2018 11:03:34 -0800 (PST) X-Google-Smtp-Source: AG47ELuWueHYta/UcruHzIQscDsd6FGyCOpR5ulH3uCWfm6eZP7Vz0ccgRnq5YxEvUyox7PATJrh X-Received: by 10.99.169.10 with SMTP id u10mr25376736pge.163.1520622214371; Fri, 09 Mar 2018 11:03:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622214; cv=none; d=google.com; s=arc-20160816; b=y9hMa3akZWsYKiwD25WzHhvj05TXOzGkuJWaL4kT6sgw45LldIaYPpHG7ZCiCAbPBI SHrGASHSF+hIkuIzXQDxTWuyRcx2WUcaWz4gYA5BONVJD/HQqUYwdaAIIJxUCzSLnn0O TsW1Nk5/5LD73uYzdd+lPK3d0mbMJoEfCuspuIKu3lJvhHQDmVOs2ZxNqbLfE+RIPitU U57Qlsl0SF49pdtGdJEzTFA71fhqi/YVEkW64Uj71BjTlbLGCnsZQ3PnoInHHNP7/MqW gsRhoxdcFM3Z8ji/ol7Ur5H861lbp8mYrO5tAvwOUtq449uRi+nob9lEghxYDFBW3/Wq UQEQ== 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=1BzfnQA+9K2isV4cXoS/CotsFMMR8TQgY9Um3lDSMSw=; b=wiMyEdnXCllYno8HiyeD3wCtwqKmpegXBOosLZ2Gskz8aK7rWP/94mMUL+I6j+ZQYE YVIO9oedMDykwENiVtWquIkbRShYBXfq7yUM88kMp1AaDR3768ZI8V0uwmpWANPtd88u 8u+vPeNWZHix2dTX0gqKJHM4fc0BcWKrazp6xmwgTvveMb6ocFfoKVIZxmVpxYE5gRX2 iFu5ZuYjmZD5vu4FKrYN/H5XwjocTvDOKVGFTLCezN6RxUUUhmFaE7nwvMqjGXyukIte BymLipqNAAdsvJHAA8uzZOobDm7eO5ylmYungAt20v03iF5EaAcXCaHCZMndSlSwLIpO lD+g== 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 q11si1291724pfd.242.2018.03.09.11.03.33; Fri, 09 Mar 2018 11:03:34 -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 CEAC278960; Fri, 9 Mar 2018 19:03:15 +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 3315878917 for ; Fri, 9 Mar 2018 19:02:58 +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:02:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651870" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:02:58 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:43 +0200 Message-Id: <20180309185614.31113-5-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 05/36] iproute2: 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 --- .../iproute2/iproute2/configure-cross.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-connectivity/iproute2/iproute2/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch index 5536fb57656..8b75a2ada4e 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch @@ -9,19 +9,19 @@ Upstream-Status: Pending Signed-off-by: Koen Kooi Signed-off-by: Shane Wang -Index: iproute2-4.11.0/configure +Index: iproute2-4.14.1/configure =================================================================== ---- iproute2-4.11.0.orig/configure -+++ iproute2-4.11.0/configure +--- iproute2-4.14.1.orig/configure ++++ iproute2-4.14.1/configure @@ -2,6 +2,7 @@ # This is not an autoconf generated configure # INCLUDE=${1:-"$PWD/include"} +SYSROOT=$1 - # Make a temp directory in build tree. - TMPDIR=$(mktemp -d config.XXXXXX) -@@ -192,7 +193,7 @@ check_ipt_lib_dir() + # Output file which is input to Makefile + CONFIG=config.mk +@@ -195,7 +196,7 @@ check_ipt_lib_dir() return fi From patchwork Fri Mar 9 18:55:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131218 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1342363lja; Fri, 9 Mar 2018 11:03:42 -0800 (PST) X-Google-Smtp-Source: AG47ELsLIr7L8C+saoBH+khnimPlyazR6fvWuo+HJYZB8E3kF6N896I13R396dqthIJT5q7s1DYl X-Received: by 2002:a17:902:20e6:: with SMTP id v35-v6mr28619114plg.226.1520622221600; Fri, 09 Mar 2018 11:03:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622221; cv=none; d=google.com; s=arc-20160816; b=EN0YdEWNkM0r6pgGSNuU13Ff6AL8OWNVhGnXU9mal0oKM2Evfu+0kQgN/EnDY4B+Sm o1BkRJAGxZT2QVtCKZgzIRRnLscGb0BhzWpxacc6zvFqtLHlwPUycohL4etaVs2MH6Rl NxfTRvzXsNj7e8x7mZnlR21kBkWSAQcuaw+KV4kvy8nUpQJKCBy3gmrjALk8XEt+NIhl EB/EVgChX4j4rtgq3jWoKHBgK+vtBMNj/vu/37d51SzsFGUPrmmy4glUAbZRfA1wfFTD QVQVS6QMbn+6NR00MyVdNwZuAb0UZUMQ+N5u8lw4wVDhAdDEt6sr7SAhYc34WYBs8YEg GxPA== 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=L+xgCQ6eH6uboIQJwAFNFUc7zRyTtbHrVy9mTUI++W8=; b=N5vCijhjjZn6r1VrCg6onQgEz0gNzHQmwj4HXdUYl36oPSbnVtMIA7pzrg82R0p1JH uHxKSVjjc8OanUpk+hbJhuqIG1HH3/StrRUFg1tHxcvH9wY681+caRTCxbzodFvbJymk 2VpBp7JRLBBPTc/Ok2caVv7ijmAUb1K3HmpKQJ4+FIC23hZE/b30+mP0ETlsLQLt4tgL lTmxX377XOMCERApeRtdjO9Tc2TF766IzR4qkg/O1UObdfs8kUrnGdOCF0n5aPfrMrs2 +OJXZ2YX/S74FfS10C8IQ17yH8HJSJ5XEMBCoczZM9kOSF42qmNua6lUA0x7xhwXk/uC XTsg== 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 a2-v6si1261967plp.544.2018.03.09.11.03.41; Fri, 09 Mar 2018 11:03:41 -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 EE4207894F; Fri, 9 Mar 2018 19:03:16 +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 F416A7892F for ; Fri, 9 Mar 2018 19:02:59 +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:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651882" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:00 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:44 +0200 Message-Id: <20180309185614.31113-6-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 06/36] openssl: 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 --- .../openssl/openssl-1.0.2n/debian/c_rehash-compat.patch | 10 +++++----- .../openssl/openssl-1.0.2n/debian/debian-targets.patch | 14 +++++++------- 2 files changed, 12 insertions(+), 12 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-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch index 68e54d561e5..3820e3e306b 100644 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch @@ -5,10 +5,10 @@ Subject: [PATCH] also create old hash for compatibility Upstream-Status: Backport [debian] -diff --git a/tools/c_rehash.in b/tools/c_rehash.in -index b086ff9..b777d79 100644 ---- a/tools/c_rehash.in -+++ b/tools/c_rehash.in +Index: openssl-1.0.2n/tools/c_rehash.in +=================================================================== +--- openssl-1.0.2n.orig/tools/c_rehash.in ++++ openssl-1.0.2n/tools/c_rehash.in @@ -8,8 +8,6 @@ my $prefix; my $openssl = $ENV{OPENSSL} || "openssl"; @@ -48,7 +48,7 @@ index b086ff9..b777d79 100644 $fname =~ s/'/'\\''/g; my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`; chomp $hash; -@@ -176,11 +174,21 @@ sub link_hash_cert { +@@ -177,10 +175,20 @@ sub link_hash_cert { $hashlist{$hash} = $fprint; } diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch index 39d4328184b..35d92bedb74 100644 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch @@ -1,12 +1,12 @@ Upstream-Status: Backport [debian] -Index: openssl-1.0.2/Configure +Index: openssl-1.0.2n/Configure =================================================================== ---- openssl-1.0.2.orig/Configure -+++ openssl-1.0.2/Configure -@@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic - - my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum"; +--- openssl-1.0.2n.orig/Configure ++++ openssl-1.0.2n/Configure +@@ -133,6 +133,10 @@ my $clang_devteam_warn = "-Wno-unused-pa + # Warn that "make depend" should be run? + my $warn_make_depend = 0; +# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS +my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; @@ -15,7 +15,7 @@ Index: openssl-1.0.2/Configure my $strict_warnings = 0; my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; -@@ -343,6 +347,55 @@ my %table=( +@@ -369,6 +373,55 @@ my %table=( "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", From patchwork Fri Mar 9 18:55:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131219 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1342625lja; Fri, 9 Mar 2018 11:03:58 -0800 (PST) X-Google-Smtp-Source: AG47ELu0bBnzhYn8M4pBSGVEou97Ovr36bnuKxGjzRxCdRMGr+mluN22NmApF8yyXD12+Gyx/kSX X-Received: by 10.98.198.92 with SMTP id m89mr22517124pfg.73.1520622237806; Fri, 09 Mar 2018 11:03:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622237; cv=none; d=google.com; s=arc-20160816; b=u4ZGieDnmGsBa0eAarOzFEwc/XwcGw1sNohAjTyp26ABuzv1VvXho/RVopY6akoo7A 9FSljrC2n4d2ffBBqRFe4dS74Y+Cz8ybPcbVaSq6DFBXXrwz5XxyN9uRti1p3AWdgcKz 8+Eqq5Ubgnck7bdr4zpubFUwJ/oGhBipcFD1iZh+ki20fwj/2E3m5E01+8gWDmnrkoK0 x479Fd174LSt9PhNNUAHv3dqJctWw9UYbxtoRge2Jly8eY6FzOUYOpTyi3h5wEArv+py 1WAdbfjZ3BEaev2X869bSeYI81qSyC5gwAy+xILHVY66OyCwzvG00iuB20mBLUjr5NBo a6FQ== 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=/bqqUxtMP6F5Ql7KwYVhp837aVR06vLkJZ6hXQEK7qQ=; b=jzsDK8y2B2Lw/sqgkxwyPeeejlger1dDdDKY5/5WCbMcqnn0Qk4pspboLJBkHbja38 AZBAGSUyYUbPHf0p/P8lhrbZbbk84YEigLY8sLzDJa4vXQEdFn7KVLEmPN2zouG/liYH JJXYDoYNqLFOreEGQo4V7bIYxUz9k92klTNifHITrRYcO8Y/uj2029K0m5g6aeXBxePo 43hHARRptb1VVMukYApFgQiXwt2ZlTjo16ht6+esMbH4YlwxqCCNghexQfTgra18CstL GVSs6T3hQ9GAh4z9AwGQ3u8gTLlM87rD1/mlQBMJMiVSXZjZE3En+Q9HO6Dcyoe4mYhx 1rDg== 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 d6si1106590pgu.400.2018.03.09.11.03.56; Fri, 09 Mar 2018 11:03:57 -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 1C0A078972; Fri, 9 Mar 2018 19:03:19 +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 7BBDF78917 for ; Fri, 9 Mar 2018 19:03:02 +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:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651896" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:03 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:46 +0200 Message-Id: <20180309185614.31113-8-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 08/36] e2fsprogs: 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 --- ...fs-enable-the-metadata_csum-and-64bit-fea.patch | 12 ++++----- .../e2fsprogs/e2fsprogs/ptest.patch | 30 +++++++++++----------- 2 files changed, 21 insertions(+), 21 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-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch index 38fb07e6e6e..38e1bdb3d86 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch @@ -19,10 +19,10 @@ Signed-off-by: Hongxu Jia misc/mke2fs.conf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in -index 812f7c7..0280398 100644 ---- a/misc/mke2fs.conf.in -+++ b/misc/mke2fs.conf.in +Index: git/misc/mke2fs.conf.in +=================================================================== +--- git.orig/misc/mke2fs.conf.in ++++ git/misc/mke2fs.conf.in @@ -11,8 +11,9 @@ features = has_journal } @@ -32,5 +32,5 @@ index 812f7c7..0280398 100644 inode_size = 256 + auto_64-bit_support = 1 } - ext4dev = { - features = has_journal,extent,huge_file,flex_bg,uninit_bg,inline_data,64bit,dir_nlink,extra_isize + small = { + blocksize = 1024 diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch index 7df09676373..7c4bb39fd71 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch @@ -1,10 +1,10 @@ Upstream-Status: Inappropriate -diff --git a/tests/Makefile.in b/tests/Makefile.in -index c130f4a..d2ade03 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf +Index: git/tests/Makefile.in +=================================================================== +--- git.orig/tests/Makefile.in ++++ git/tests/Makefile.in +@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile @echo "#!/bin/sh" > test_one @echo "HTREE=y" >> test_one @echo "QUOTA=y" >> test_one @@ -12,8 +12,8 @@ index c130f4a..d2ade03 100644 + @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one - @cat $(srcdir)/test_one.in >> test_one -@@ -27,7 +27,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf + @echo "DD=@DD@" >>test_one +@@ -28,7 +28,7 @@ test_one: $(srcdir)/test_one.in Makefile test_script: test_one test_script.in Makefile mke2fs.conf @echo "Creating test_script..." @echo "#!/bin/sh" > test_script @@ -22,10 +22,10 @@ index c130f4a..d2ade03 100644 @cat $(srcdir)/test_script.in >> test_script @chmod +x test_script -diff --git a/tests/test_config b/tests/test_config -index 547ef4c..e11e6f4 100644 ---- a/tests/test_config -+++ b/tests/test_config +Index: git/tests/test_config +=================================================================== +--- git.orig/tests/test_config ++++ git/tests/test_config @@ -3,24 +3,24 @@ # @@ -67,10 +67,10 @@ index 547ef4c..e11e6f4 100644 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} -diff --git a/tests/test_script.in b/tests/test_script.in -index 9959e30..442999d 100644 ---- a/tests/test_script.in -+++ b/tests/test_script.in +Index: git/tests/test_script.in +=================================================================== +--- git.orig/tests/test_script.in ++++ git/tests/test_script.in @@ -39,7 +39,7 @@ for i; do done From patchwork Fri Mar 9 18:55:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131220 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1342902lja; Fri, 9 Mar 2018 11:04:13 -0800 (PST) X-Google-Smtp-Source: AG47ELtIbfzy6IT2pUTAIMOtlmv0KnYZ08nstkNCPyTA984zdd++8yROaJRzlH7iKMp+bTtefAiG X-Received: by 2002:a17:902:7509:: with SMTP id i9-v6mr29466279pll.220.1520622253531; Fri, 09 Mar 2018 11:04:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622253; cv=none; d=google.com; s=arc-20160816; b=UopOe5EpX7Zp0lm2bZKDjEPq1SArPt+Hu8bBFLhHwMKkHlvjjCRyiosziyMOaEpZuI 40Jowy0mz4JwDdT7nGonlHK6hFQPbJaxyMGMd7ZbFrzDguPas0B88iQ8Bo/XEzfXOgqL qHfOiqC1p7/pfq05VUJKntodZDiiXd++kRxOxnZHSNquVtoKflOmVzHt8DCYwVMK837a MlkTOpkducbbPxy2MW6ULh1Aq5BKBOYC7lIISEVUHg/iadF/7B9NMeUNtR2e5tTl3jNP 9w/9eiVERyH1kk4mk0mzJOScN9lLA8jJ1W7Jv/KehnHwy71rCM8r3WfhsAkeQ4ldZK4O CoPA== 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=kuliOdIX/x4ziuPPXvX5DBEKwYV4TqxrUyXUFaq1Usk=; b=SDqziXvn9OJ+q4PMINTSpnOoIDITEi/m4XR0FSl3zfww5HYcYsUFDsNB1Oxg0Sw0ze mKiYs3pIy2ytabSXLFI5RyQXgXHYRU5Kn2lowHq60beGMLrkebtHhWYAA6cWbSkqpuWY QNoylw9U4pDisZxL0D/4hQsGD5O4opZJScEFlrqMs+dQKyB6j53Z1AsklOYYkT0FeIGn AoRyWQHFP18l+5aqapPU6ki9MIV8F7w19da6RvwD51IF1qfqm5bcnKE7MjKpFrHBD6qC vzmbI/ZOhiIb+yrpkUKUeXeTvy/VJeq3BniZnJTPwduTAv1Etkf/qqPuQawSYthKOnc4 xV6w== 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 j186si1080741pge.747.2018.03.09.11.04.13; Fri, 09 Mar 2018 11:04:13 -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 1E74C7897A; Fri, 9 Mar 2018 19:03:23 +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 EE10278927 for ; Fri, 9 Mar 2018 19:03:04 +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:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651907" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:05 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:48 +0200 Message-Id: <20180309185614.31113-10-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 10/36] i2c-tools: 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 --- ...-tools-Module.mk-Add-missing-dependencies.patch | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 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-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch b/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch index e47c02ab7f5..33cf2d42a87 100644 --- a/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch +++ b/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch @@ -17,12 +17,12 @@ Signed-off-by: Maxin B. John tools/Module.mk | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) -diff --git a/lib/Module.mk b/lib/Module.mk -index 8a58f5b..67afe91 100644 ---- a/lib/Module.mk -+++ b/lib/Module.mk -@@ -37,6 +37,13 @@ ifeq ($(BUILD_STATIC_LIB),1) - LIB_TARGETS += $(LIB_STLIBNAME) +Index: i2c-tools-4.0/lib/Module.mk +=================================================================== +--- i2c-tools-4.0.orig/lib/Module.mk ++++ i2c-tools-4.0/lib/Module.mk +@@ -35,6 +35,13 @@ LIB_TARGETS += $(LIB_STLIBNAME) + LIB_OBJECTS += smbus.ao endif +# Library file to link against (static or dynamic) @@ -35,11 +35,11 @@ index 8a58f5b..67afe91 100644 # # Libraries # -diff --git a/tools/Module.mk b/tools/Module.mk -index 6421a23..609de7a 100644 ---- a/tools/Module.mk -+++ b/tools/Module.mk -@@ -24,19 +24,19 @@ TOOLS_TARGETS := i2cdetect i2cdump i2cset i2cget i2ctransfer +Index: i2c-tools-4.0/tools/Module.mk +=================================================================== +--- i2c-tools-4.0.orig/tools/Module.mk ++++ i2c-tools-4.0/tools/Module.mk +@@ -24,19 +24,19 @@ TOOLS_TARGETS := i2cdetect i2cdump i2cse # Programs # @@ -64,6 +64,3 @@ index 6421a23..609de7a 100644 $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS) # --- -2.4.0 - From patchwork Fri Mar 9 18:55:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131221 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343007lja; Fri, 9 Mar 2018 11:04:21 -0800 (PST) X-Google-Smtp-Source: AG47ELt9pZTVieyjEdPNBnBwzoK2nLIWQsrhrseDmF0Kwm4hCx60aWL79kLRYjqEdr55zQgrq/lG X-Received: by 10.101.86.198 with SMTP id w6mr24891349pgs.434.1520622261440; Fri, 09 Mar 2018 11:04:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622261; cv=none; d=google.com; s=arc-20160816; b=pdm1iZjhFGVuVbwwIbFfOZWtkOgN2Vu/kPjZZ1sF2iRzgXGDgT+g0kkOjz5eDFKvPi quxo/hlT8I0tNCP/yycgY5oidRc9HiPamMfSyuTAZpny5H2rQ7dIDLE1NDsk5NKyJnkF 9QziMSvY0boOuPcFkuCeAGzJdAuuIkVmjRbB4kTPSToE5E1NcOR6bIDs5/gZC4/KDiBh nowcsOpwkWz9+iCV+TKOsVS7kA9SDG4ymwJD8gFYiA7GyG0Ozjol6cCgGCAWEdi1VPew KrQXHUQaK7hmApJmWhcOw5fwcJQ81m5tRfFhvPaXqCNkrZ+Stsn/tkD3f2hWnSOi1pim MEvQ== 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=TnKJRdftYT3bcSsVjBdsZ1qxXkYFmXx5xvenw24GCNw=; b=Rbp46SURKkAZcUIOpS7x0jeg75VrdpnrhhxE+0TY47CPYCbsoNh9TQWN1VQemXE03O HMTADfinZW5FnKjTfeqBuuwSE9z9cbEp4mfZOD991If3N7tNYbBUGAn26KHl8v3ih2Hd VVf+mUJx4u1gbH8ZnYOkZcR3tGKK+WHStNiFNoTxITun42xSHq0tlA9z7U8XOcboI+7F LQUK4xQYFr8sheuogGu9NwTgM9Y5B+rmxsqTiF0WxG2/k1pnESvleoO+8K8/rfCJQfYL skypzXRttnCGNDtUqmFSeVpWt3MmI7DFJ5x8Ke/092nzQp433jrGDXVycRSSXu4ijViz N04w== 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 a8si1088057pgq.113.2018.03.09.11.04.20; Fri, 09 Mar 2018 11:04:21 -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 514EC78987; Fri, 9 Mar 2018 19:03:24 +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 488D77892F for ; Fri, 9 Mar 2018 19:03:06 +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:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651913" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:06 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:49 +0200 Message-Id: <20180309185614.31113-11-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 11/36] m4: 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 --- meta/recipes-devtools/m4/m4/ac_config_links.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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-devtools/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch index 275c0b2e7d8..71edf595122 100644 --- a/meta/recipes-devtools/m4/m4/ac_config_links.patch +++ b/meta/recipes-devtools/m4/m4/ac_config_links.patch @@ -14,10 +14,11 @@ Tested on x86_64_linux (Ubuntu 8.04 and 9.10). 2009-11-10 Esben Haabendal -diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure ---- m4-1.4.13.orig/configure 2009-11-10 10:54:00.301707097 +0100 -+++ m4-1.4.13/configure 2009-11-10 10:54:17.314206379 +0100 -@@ -14860,8 +14860,8 @@ +Index: m4-1.4.18/configure +=================================================================== +--- m4-1.4.18.orig/configure ++++ m4-1.4.18/configure +@@ -24415,8 +24415,8 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFD # only, it does not matter if we skip the link with older autoconf. # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH # builds, so use a shell variable to bypass this. @@ -27,4 +28,4 @@ diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure + # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" - + : From patchwork Fri Mar 9 18:55:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131222 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343155lja; Fri, 9 Mar 2018 11:04:30 -0800 (PST) X-Google-Smtp-Source: AG47ELv5S4jxtAD7VCghzcanKUxIAwpnLpjzg3QXoWwKLhs7kWxVDZrlZqciqwn6zdIRWZ/UBdoF X-Received: by 2002:a17:902:e65:: with SMTP id 92-v6mr28673297plw.268.1520622270010; Fri, 09 Mar 2018 11:04:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622270; cv=none; d=google.com; s=arc-20160816; b=YxQrhJ74CdHJpJyfXR4P7cAzD6mSdY2TSsCcUyn1qD1Da3S2hB63iM0SzNTk1YERHK Fx0uLot8rmYwboSHDdTOFk81wR6ezaTu6pZC/7+qILaLtCzNJ7DYqOSgfWyDCVcon9xU YTQLOtD3+taYeDF30zR1i5zuvD801NV6Y7ebgeCeEHLTmoMEzzgLzsJQ5T5KKPzBC3tO VN9A7NpAaZqBiWPc+LnfXsw5f0qG3Z4vv8LTU8sI8NFg/ifS5WptV950RW9/9B9UGtg8 pf16kGTzTv2mRv+rVMkxCjAjK1GJDEbBe0UlkNr4sdY/zwP2U6SH0ClBr3rEH4eamvLS jN5w== 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=hmWH/GqUiGsE6P0qTsgCmWt/SryUwc4rUu3I33pGY0g=; b=x0BBb3R/XvAPbtYK7MpAHSkKqNOIWU+MVnm234YL7Mgv9YLz+yGxLGF+CJqsoQWGFH lltceor3AYpr/zr+lKW1ITpDt0O7JOyO4JmOSCKC2bq9QF5TX8Cza8F120agsCrQKV5S ENC6tKGMr+W1xzTR3nEMrOxtZgfl1A6MppQ0kzyV/xsHZbloaK6mMzoOg624IqZUEVAC gI2uIDl8MRG4GFzFwuLEebcNbf5Lzd5ZLS+K9dnNz/JJaeKgwz+9fV8bajF2+JKhc/nO wXWttM4sOGvA87zEiXB3fSvpVsnSI6Kqle/izKOrF6DunBTsG5sgjyCAzdGXrioj2pvY rbaQ== 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 m1-v6si1390253pli.332.2018.03.09.11.04.29; Fri, 09 Mar 2018 11:04:29 -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 66FEE78988; Fri, 9 Mar 2018 19:03:25 +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 9DBDC7892F for ; Fri, 9 Mar 2018 19:03:07 +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:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651928" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:08 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:50 +0200 Message-Id: <20180309185614.31113-12-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 12/36] opkg-utils: 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 --- ...ly-use-sort-name-on-versions-of-tar-which-support-.patch | 13 +++++-------- ...kg-build-Use-local-time-for-build_date-since-opkg-.patch | 13 +++++-------- 2 files changed, 10 insertions(+), 16 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-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch index 7de4b7f723c..203c5850533 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch @@ -11,10 +11,10 @@ Signed-off-by: Alejandro del Castillo opkg-build | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -diff --git a/opkg-build b/opkg-build -index 265906f..094d69f 100755 ---- a/opkg-build -+++ b/opkg-build +Index: opkg-utils-0.3.6/opkg-build +=================================================================== +--- opkg-utils-0.3.6.orig/opkg-build ++++ opkg-utils-0.3.6/opkg-build @@ -232,6 +232,11 @@ if [ $compressor = "gzip" ] ; then compressorargs=$zipargs fi @@ -40,13 +40,10 @@ index 265906f..094d69f 100755 echo "2.0" > $tmp_dir/debian-binary @@ -296,7 +301,7 @@ rm -f $pkg_file if [ "$outer" = "ar" ] ; then - ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) + ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) else - ( cd $tmp_dir && tar -c --sort=name --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) + ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) fi rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz --- -2.16.1 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch index b42d7878c9b..0a7403d6747 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch @@ -12,10 +12,10 @@ Signed-off-by: Alejandro del Castillo opkg-build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/opkg-build b/opkg-build -index 094d69f..0050c2b 100755 ---- a/opkg-build -+++ b/opkg-build +Index: opkg-utils-0.3.6/opkg-build +=================================================================== +--- opkg-utils-0.3.6.orig/opkg-build ++++ opkg-utils-0.3.6/opkg-build @@ -282,11 +282,11 @@ fi tmp_dir=$dest_dir/IPKG_BUILD.$$ mkdir $tmp_dir @@ -33,13 +33,10 @@ index 094d69f..0050c2b 100755 echo "2.0" > $tmp_dir/debian-binary @@ -301,7 +301,7 @@ rm -f $pkg_file if [ "$outer" = "ar" ] ; then - ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) + ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) else - ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) + ( cd $tmp_dir && tar -c $tsortargs --mtime="$build_date" $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) fi rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz --- -2.16.1 - From patchwork Fri Mar 9 18:55:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131223 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343274lja; Fri, 9 Mar 2018 11:04:38 -0800 (PST) X-Google-Smtp-Source: AG47ELtKyOUaIKfJY4+ijbDFliVwEzv4m4t2x/KYLOtbSlqP5JfWAxeDOdS/KqQuIfyMwOuaus+2 X-Received: by 2002:a17:902:3303:: with SMTP id a3-v6mr28589683plc.399.1520622278810; Fri, 09 Mar 2018 11:04:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622278; cv=none; d=google.com; s=arc-20160816; b=uZQuhbyzFPlkXQRdphcs2qK/ETHQSINvDVstE9P4PkIk/uvBEDAk+Hmdeq4UIJRGfi kyCWySiPUk/5X67a2zF8h8ZVRvO03ZliQn0OIu9PVRQYrEqfiCoclnpRE5G+qvWZHCVj XatJjhAyFVIW4BZYPCV9E3NZ17IHTdyshSqOa3ZonWcTDKiR+bz609Q8t53q9uCQKz/C D88cJVvglAmYRecbp3WXSzyTXAdbNVJHOibLPrZ5GT9de35oLclmSxPgGRKZeVEa4SSZ 0TlFZ09cHmNR37ZXa9efVOe5hKDLiahcpF18rQsyionKR3/ox9wxNWXqYnGVYgIwbKOq Vldw== 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=gzE4jaqDUAfkxwh7G07wv5Q1V2wt/B1I1JDAxsK5lfk=; b=XJBLIxw7BXxPFtdfp3hfTa4/Brxv/1NaMgRX03zpIGc5QdudkbXFZii7A+mnOXFBIm IDRncK78KO4GmXzSlX57BEpdf/jq0cGHvfQSg2ISpcIJoRe4hSOTkF+oHvGOVi8s2TSZ jX0D8XT8lbXvJV+8hkK3q66cko80Sr36w6gkCMo4NZemwH9v2FZITM9TSfPBlEBZ1jEd S0SE2l9RqpdKd2Tzl3L8YCEFo03C0UFoEyIPrThpexguMGfJpQltZ9UGkclCYbsDCSps XcIdxWXPSoM4FG9F8zaKWiIVosuyXUueJRNV97AMzw59cD+S23y8AriDCdSnKjOlqDjn iFsg== 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 65si1086509pgj.705.2018.03.09.11.04.38; Fri, 09 Mar 2018 11:04: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 8019D78946; Fri, 9 Mar 2018 19:03:26 +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 2E56B7890D for ; Fri, 9 Mar 2018 19:03:11 +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:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651936" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:09 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:51 +0200 Message-Id: <20180309185614.31113-13-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 13/36] python: 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 --- .../python/python-native/multilib.patch | 78 ++++++------- .../add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 12 +- .../python/python/fix-makefile-for-ptest.patch | 13 ++- meta/recipes-devtools/python/python/multilib.patch | 98 ++++++++--------- .../python/python3/python-3.3-multilib.patch | 121 ++++++++++----------- ...-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 12 +- 6 files changed, 166 insertions(+), 168 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-devtools/python/python-native/multilib.patch b/meta/recipes-devtools/python/python-native/multilib.patch index ad460850945..af0f173c6d1 100644 --- a/meta/recipes-devtools/python/python-native/multilib.patch +++ b/meta/recipes-devtools/python/python-native/multilib.patch @@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Nitin A Kamble -Index: Python-2.7.13/Include/pythonrun.h +Index: Python-2.7.14/Include/pythonrun.h =================================================================== ---- Python-2.7.13.orig/Include/pythonrun.h -+++ Python-2.7.13/Include/pythonrun.h +--- Python-2.7.14.orig/Include/pythonrun.h ++++ Python-2.7.14/Include/pythonrun.h @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -24,10 +24,10 @@ Index: Python-2.7.13/Include/pythonrun.h PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.7.13/Lib/distutils/command/install.py +Index: Python-2.7.14/Lib/distutils/command/install.py =================================================================== ---- Python-2.7.13.orig/Lib/distutils/command/install.py -+++ Python-2.7.13/Lib/distutils/command/install.py +--- Python-2.7.14.orig/Lib/distutils/command/install.py ++++ Python-2.7.14/Lib/distutils/command/install.py @@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE @@ -46,10 +46,10 @@ Index: Python-2.7.13/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.13/Lib/pydoc.py +Index: Python-2.7.14/Lib/pydoc.py =================================================================== ---- Python-2.7.13.orig/Lib/pydoc.py -+++ Python-2.7.13/Lib/pydoc.py +--- Python-2.7.14.orig/Lib/pydoc.py ++++ Python-2.7.14/Lib/pydoc.py @@ -375,7 +375,7 @@ class Doc: docmodule = docclass = docroutine = docother = docproperty = docdata = fail @@ -59,10 +59,10 @@ Index: Python-2.7.13/Lib/pydoc.py "python"+sys.version[0:3])): """Return the location of module docs or None""" -Index: Python-2.7.13/Lib/site.py +Index: Python-2.7.14/Lib/site.py =================================================================== ---- Python-2.7.13.orig/Lib/site.py -+++ Python-2.7.13/Lib/site.py +--- Python-2.7.14.orig/Lib/site.py ++++ Python-2.7.14/Lib/site.py @@ -288,13 +288,19 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) @@ -86,10 +86,10 @@ Index: Python-2.7.13/Lib/site.py return sitepackages def addsitepackages(known_paths): -Index: Python-2.7.13/Lib/test/test_dl.py +Index: Python-2.7.14/Lib/test/test_dl.py =================================================================== ---- Python-2.7.13.orig/Lib/test/test_dl.py -+++ Python-2.7.13/Lib/test/test_dl.py +--- Python-2.7.14.orig/Lib/test/test_dl.py ++++ Python-2.7.14/Lib/test/test_dl.py @@ -4,10 +4,11 @@ import unittest from test.test_support import verbose, import_module @@ -104,10 +104,10 @@ Index: Python-2.7.13/Lib/test/test_dl.py ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.7.13/Lib/trace.py +Index: Python-2.7.14/Lib/trace.py =================================================================== ---- Python-2.7.13.orig/Lib/trace.py -+++ Python-2.7.13/Lib/trace.py +--- Python-2.7.14.orig/Lib/trace.py ++++ Python-2.7.14/Lib/trace.py @@ -754,10 +754,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) @@ -121,11 +121,11 @@ Index: Python-2.7.13/Lib/trace.py "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.7.13/Makefile.pre.in +Index: Python-2.7.14/Makefile.pre.in =================================================================== ---- Python-2.7.13.orig/Makefile.pre.in -+++ Python-2.7.13/Makefile.pre.in -@@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG +--- Python-2.7.14.orig/Makefile.pre.in ++++ Python-2.7.14/Makefile.pre.in +@@ -91,6 +91,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -133,7 +133,7 @@ Index: Python-2.7.13/Makefile.pre.in # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -111,7 +112,7 @@ LIBDIR= @libdir@ +@@ -110,7 +111,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -142,7 +142,7 @@ Index: Python-2.7.13/Makefile.pre.in # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) -@@ -668,6 +669,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -644,6 +645,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -150,8 +150,8 @@ Index: Python-2.7.13/Makefile.pre.in -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -708,7 +710,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) - Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) +@@ -692,7 +694,7 @@ regen-ast: + Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h Python/getplatform.o: $(srcdir)/Python/getplatform.c - $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c @@ -159,10 +159,10 @@ Index: Python-2.7.13/Makefile.pre.in Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.13/Modules/getpath.c +Index: Python-2.7.14/Modules/getpath.c =================================================================== ---- Python-2.7.13.orig/Modules/getpath.c -+++ Python-2.7.13/Modules/getpath.c +--- Python-2.7.14.orig/Modules/getpath.c ++++ Python-2.7.14/Modules/getpath.c @@ -100,6 +100,13 @@ #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" #endif @@ -186,10 +186,10 @@ Index: Python-2.7.13/Modules/getpath.c static void reduce(char *dir) -Index: Python-2.7.13/Python/getplatform.c +Index: Python-2.7.14/Python/getplatform.c =================================================================== ---- Python-2.7.13.orig/Python/getplatform.c -+++ Python-2.7.13/Python/getplatform.c +--- Python-2.7.14.orig/Python/getplatform.c ++++ Python-2.7.14/Python/getplatform.c @@ -10,3 +10,13 @@ Py_GetPlatform(void) { return PLATFORM; @@ -204,10 +204,10 @@ Index: Python-2.7.13/Python/getplatform.c +{ + return LIB; +} -Index: Python-2.7.13/Python/sysmodule.c +Index: Python-2.7.14/Python/sysmodule.c =================================================================== ---- Python-2.7.13.orig/Python/sysmodule.c -+++ Python-2.7.13/Python/sysmodule.c +--- Python-2.7.14.orig/Python/sysmodule.c ++++ Python-2.7.14/Python/sysmodule.c @@ -1437,6 +1437,8 @@ _PySys_Init(void) PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", @@ -217,11 +217,11 @@ Index: Python-2.7.13/Python/sysmodule.c SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", -Index: Python-2.7.13/configure.ac +Index: Python-2.7.14/configure.ac =================================================================== ---- Python-2.7.13.orig/configure.ac -+++ Python-2.7.13/configure.ac -@@ -759,6 +759,11 @@ SunOS*) +--- Python-2.7.14.orig/configure.ac ++++ Python-2.7.14/configure.ac +@@ -758,6 +758,11 @@ SunOS*) ;; esac diff --git a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch index 506debaf761..329734064bd 100644 --- a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch +++ b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch @@ -13,16 +13,16 @@ Signed-off-by: Jackie Huang configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: Python-2.7.13/configure.ac +Index: Python-2.7.14/configure.ac =================================================================== ---- Python-2.7.13.orig/configure.ac -+++ Python-2.7.13/configure.ac -@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then +--- Python-2.7.14.orig/configure.ac ++++ Python-2.7.14/configure.ac +@@ -36,7 +36,7 @@ if test "$cross_compiling" = yes; then AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) fi AC_MSG_RESULT($interp) - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp fi - # Used to comment out stuff for rebuilding generated files - GENERATED_COMMENT='#' + elif test "$cross_compiling" = maybe; then + AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) diff --git a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch b/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch index 90dcd57c048..60d782cd26b 100644 --- a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch +++ b/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch @@ -4,12 +4,13 @@ cross-compiled. Signed-off-by: Tudor Florea Upstream-Status: Pending --- -diff -ruN a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2013-06-27 10:44:11.033840532 +0200 -+++ b/Makefile.pre.in 2013-06-27 10:44:39.572635273 +0200 -@@ -709,14 +709,19 @@ - # generated bytecode. This is sometimes a very shy bug needing a lot of - # sample data. +Index: Python-2.7.14/Makefile.pre.in +=================================================================== +--- Python-2.7.14.orig/Makefile.pre.in ++++ Python-2.7.14/Makefile.pre.in +@@ -846,14 +846,19 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho + + .PHONY: test testall testuniversal buildbottest pythoninfo -TESTOPTS= -l $(EXTRATESTOPTS) +TESTOPTS= -l -v $(EXTRATESTOPTS) diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch index 94fdfeb6302..1116dd518e4 100644 --- a/meta/recipes-devtools/python/python/multilib.patch +++ b/meta/recipes-devtools/python/python/multilib.patch @@ -1,11 +1,11 @@ Rebased for python-2.7.9 Signed-off-by: Alejandro Hernandez Upstream-Status: Pending -Index: Python-2.7.13/configure.ac +Index: Python-2.7.14/configure.ac =================================================================== ---- Python-2.7.13.orig/configure.ac -+++ Python-2.7.13/configure.ac -@@ -759,6 +759,10 @@ SunOS*) +--- Python-2.7.14.orig/configure.ac ++++ Python-2.7.14/configure.ac +@@ -758,6 +758,10 @@ SunOS*) ;; esac @@ -16,10 +16,10 @@ Index: Python-2.7.13/configure.ac AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) -Index: Python-2.7.13/Include/pythonrun.h +Index: Python-2.7.14/Include/pythonrun.h =================================================================== ---- Python-2.7.13.orig/Include/pythonrun.h -+++ Python-2.7.13/Include/pythonrun.h +--- Python-2.7.14.orig/Include/pythonrun.h ++++ Python-2.7.14/Include/pythonrun.h @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -28,10 +28,10 @@ Index: Python-2.7.13/Include/pythonrun.h PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.7.13/Lib/distutils/command/install.py +Index: Python-2.7.14/Lib/distutils/command/install.py =================================================================== ---- Python-2.7.13.orig/Lib/distutils/command/install.py -+++ Python-2.7.13/Lib/distutils/command/install.py +--- Python-2.7.14.orig/Lib/distutils/command/install.py ++++ Python-2.7.14/Lib/distutils/command/install.py @@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE @@ -52,10 +52,10 @@ Index: Python-2.7.13/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.13/Lib/distutils/sysconfig.py +Index: Python-2.7.14/Lib/distutils/sysconfig.py =================================================================== ---- Python-2.7.13.orig/Lib/distutils/sysconfig.py -+++ Python-2.7.13/Lib/distutils/sysconfig.py +--- Python-2.7.14.orig/Lib/distutils/sysconfig.py ++++ Python-2.7.14/Lib/distutils/sysconfig.py @@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX @@ -70,10 +70,10 @@ Index: Python-2.7.13/Lib/distutils/sysconfig.py if standard_lib: return libpython else: -Index: Python-2.7.13/Lib/pydoc.py +Index: Python-2.7.14/Lib/pydoc.py =================================================================== ---- Python-2.7.13.orig/Lib/pydoc.py -+++ Python-2.7.13/Lib/pydoc.py +--- Python-2.7.14.orig/Lib/pydoc.py ++++ Python-2.7.14/Lib/pydoc.py @@ -375,7 +375,7 @@ class Doc: docmodule = docclass = docroutine = docother = docproperty = docdata = fail @@ -83,10 +83,10 @@ Index: Python-2.7.13/Lib/pydoc.py "python"+sys.version[0:3])): """Return the location of module docs or None""" -Index: Python-2.7.13/Lib/site.py +Index: Python-2.7.14/Lib/site.py =================================================================== ---- Python-2.7.13.orig/Lib/site.py -+++ Python-2.7.13/Lib/site.py +--- Python-2.7.14.orig/Lib/site.py ++++ Python-2.7.14/Lib/site.py @@ -288,13 +288,18 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) @@ -109,10 +109,10 @@ Index: Python-2.7.13/Lib/site.py return sitepackages def addsitepackages(known_paths): -Index: Python-2.7.13/Lib/sysconfig.py +Index: Python-2.7.14/Lib/sysconfig.py =================================================================== ---- Python-2.7.13.orig/Lib/sysconfig.py -+++ Python-2.7.13/Lib/sysconfig.py +--- Python-2.7.14.orig/Lib/sysconfig.py ++++ Python-2.7.14/Lib/sysconfig.py @@ -7,10 +7,10 @@ from os.path import pardir, realpath _INSTALL_SCHEMES = { @@ -141,10 +141,10 @@ Index: Python-2.7.13/Lib/sysconfig.py 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', -Index: Python-2.7.13/Lib/test/test_dl.py +Index: Python-2.7.14/Lib/test/test_dl.py =================================================================== ---- Python-2.7.13.orig/Lib/test/test_dl.py -+++ Python-2.7.13/Lib/test/test_dl.py +--- Python-2.7.14.orig/Lib/test/test_dl.py ++++ Python-2.7.14/Lib/test/test_dl.py @@ -4,10 +4,11 @@ import unittest from test.test_support import verbose, import_module @@ -159,11 +159,11 @@ Index: Python-2.7.13/Lib/test/test_dl.py ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.7.13/Lib/test/test_site.py +Index: Python-2.7.14/Lib/test/test_site.py =================================================================== ---- Python-2.7.13.orig/Lib/test/test_site.py -+++ Python-2.7.13/Lib/test/test_site.py -@@ -235,12 +235,16 @@ class HelperFunctionsTests(unittest.Test +--- Python-2.7.14.orig/Lib/test/test_site.py ++++ Python-2.7.14/Lib/test/test_site.py +@@ -252,12 +252,16 @@ class HelperFunctionsTests(unittest.Test self.assertEqual(dirs[0], wanted) elif os.sep == '/': # OS X, Linux, FreeBSD, etc @@ -183,10 +183,10 @@ Index: Python-2.7.13/Lib/test/test_site.py else: # other platforms self.assertEqual(len(dirs), 2) -Index: Python-2.7.13/Lib/trace.py +Index: Python-2.7.14/Lib/trace.py =================================================================== ---- Python-2.7.13.orig/Lib/trace.py -+++ Python-2.7.13/Lib/trace.py +--- Python-2.7.14.orig/Lib/trace.py ++++ Python-2.7.14/Lib/trace.py @@ -754,10 +754,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) @@ -200,11 +200,11 @@ Index: Python-2.7.13/Lib/trace.py "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.7.13/Makefile.pre.in +Index: Python-2.7.14/Makefile.pre.in =================================================================== ---- Python-2.7.13.orig/Makefile.pre.in -+++ Python-2.7.13/Makefile.pre.in -@@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG +--- Python-2.7.14.orig/Makefile.pre.in ++++ Python-2.7.14/Makefile.pre.in +@@ -91,6 +91,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -212,7 +212,7 @@ Index: Python-2.7.13/Makefile.pre.in # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -111,7 +112,7 @@ LIBDIR= @libdir@ +@@ -110,7 +111,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -221,7 +221,7 @@ Index: Python-2.7.13/Makefile.pre.in # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) -@@ -669,6 +670,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -645,6 +646,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -229,8 +229,8 @@ Index: Python-2.7.13/Makefile.pre.in -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -709,7 +711,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) - Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) +@@ -693,7 +695,7 @@ regen-ast: + Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h Python/getplatform.o: $(srcdir)/Python/getplatform.c - $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c @@ -238,10 +238,10 @@ Index: Python-2.7.13/Makefile.pre.in Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.13/Modules/getpath.c +Index: Python-2.7.14/Modules/getpath.c =================================================================== ---- Python-2.7.13.orig/Modules/getpath.c -+++ Python-2.7.13/Modules/getpath.c +--- Python-2.7.14.orig/Modules/getpath.c ++++ Python-2.7.14/Modules/getpath.c @@ -100,6 +100,13 @@ #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" #endif @@ -265,10 +265,10 @@ Index: Python-2.7.13/Modules/getpath.c static void reduce(char *dir) -Index: Python-2.7.13/Python/getplatform.c +Index: Python-2.7.14/Python/getplatform.c =================================================================== ---- Python-2.7.13.orig/Python/getplatform.c -+++ Python-2.7.13/Python/getplatform.c +--- Python-2.7.14.orig/Python/getplatform.c ++++ Python-2.7.14/Python/getplatform.c @@ -10,3 +10,13 @@ Py_GetPlatform(void) { return PLATFORM; @@ -283,10 +283,10 @@ Index: Python-2.7.13/Python/getplatform.c +{ + return LIB; +} -Index: Python-2.7.13/Python/sysmodule.c +Index: Python-2.7.14/Python/sysmodule.c =================================================================== ---- Python-2.7.13.orig/Python/sysmodule.c -+++ Python-2.7.13/Python/sysmodule.c +--- Python-2.7.14.orig/Python/sysmodule.c ++++ Python-2.7.14/Python/sysmodule.c @@ -1437,6 +1437,8 @@ _PySys_Init(void) PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", diff --git a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch index 08c4403cbfa..77da6159c90 100644 --- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch +++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch @@ -25,10 +25,10 @@ Signed-off-by: Alejandro Hernandez setup.py | 9 ++++----- 12 files changed, 97 insertions(+), 23 deletions(-) -diff --git a/Include/pythonrun.h b/Include/pythonrun.h -index 9c2e813..2f79cb6 100644 ---- a/Include/pythonrun.h -+++ b/Include/pythonrun.h +Index: Python-3.5.4/Include/pythonrun.h +=================================================================== +--- Python-3.5.4.orig/Include/pythonrun.h ++++ Python-3.5.4/Include/pythonrun.h @@ -23,6 +23,9 @@ typedef struct { } PyCompilerFlags; #endif @@ -39,10 +39,10 @@ index 9c2e813..2f79cb6 100644 #ifndef Py_LIMITED_API PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); -diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py -index 67db007..b46b45b 100644 ---- a/Lib/distutils/command/install.py -+++ b/Lib/distutils/command/install.py +Index: Python-3.5.4/Lib/distutils/command/install.py +=================================================================== +--- Python-3.5.4.orig/Lib/distutils/command/install.py ++++ Python-3.5.4/Lib/distutils/command/install.py @@ -19,6 +19,8 @@ from site import USER_BASE from site import USER_SITE HAS_USER_SITE = True @@ -61,11 +61,11 @@ index 67db007..b46b45b 100644 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -diff --git a/Lib/pydoc.py b/Lib/pydoc.py -index 3ca08c9..6528730 100755 ---- a/Lib/pydoc.py -+++ b/Lib/pydoc.py -@@ -384,7 +384,7 @@ class Doc: +Index: Python-3.5.4/Lib/pydoc.py +=================================================================== +--- Python-3.5.4.orig/Lib/pydoc.py ++++ Python-3.5.4/Lib/pydoc.py +@@ -389,7 +389,7 @@ class Doc: docmodule = docclass = docroutine = docother = docproperty = docdata = fail def getdocloc(self, object, @@ -74,10 +74,10 @@ index 3ca08c9..6528730 100755 "python%d.%d" % sys.version_info[:2])): """Return the location of module docs or None""" -diff --git a/Lib/site.py b/Lib/site.py -index 3f78ef5..511931e 100644 ---- a/Lib/site.py -+++ b/Lib/site.py +Index: Python-3.5.4/Lib/site.py +=================================================================== +--- Python-3.5.4.orig/Lib/site.py ++++ Python-3.5.4/Lib/site.py @@ -303,12 +303,12 @@ def getsitepackages(prefixes=None): seen.add(prefix) @@ -93,10 +93,10 @@ index 3f78ef5..511931e 100644 if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 9c34be0..3d1181a 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py +Index: Python-3.5.4/Lib/sysconfig.py +=================================================================== +--- Python-3.5.4.orig/Lib/sysconfig.py ++++ Python-3.5.4/Lib/sysconfig.py @@ -20,10 +20,10 @@ __all__ = [ _INSTALL_SCHEMES = { @@ -139,10 +139,10 @@ index 9c34be0..3d1181a 100644 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', -diff --git a/Lib/trace.py b/Lib/trace.py -index f108266..7fd83f2 100755 ---- a/Lib/trace.py -+++ b/Lib/trace.py +Index: Python-3.5.4/Lib/trace.py +=================================================================== +--- Python-3.5.4.orig/Lib/trace.py ++++ Python-3.5.4/Lib/trace.py @@ -749,10 +749,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) @@ -156,11 +156,11 @@ index f108266..7fd83f2 100755 "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 109f402..61a41e2 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -106,6 +106,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARE +Index: Python-3.5.4/Makefile.pre.in +=================================================================== +--- Python-3.5.4.orig/Makefile.pre.in ++++ Python-3.5.4/Makefile.pre.in +@@ -109,6 +109,8 @@ CFLAGS_ALIASING=@CFLAGS_ALIASING@ # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -169,7 +169,7 @@ index 109f402..61a41e2 100644 # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -125,7 +127,7 @@ LIBDIR= @libdir@ +@@ -128,7 +130,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -178,7 +178,7 @@ index 109f402..61a41e2 100644 ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -755,6 +757,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile +@@ -731,6 +733,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -186,8 +186,8 @@ index 109f402..61a41e2 100644 -o $@ $(srcdir)/Modules/getpath.c Programs/python.o: $(srcdir)/Programs/python.c -@@ -835,7 +838,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(OPCODE_H_SCRIPT) - Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) +@@ -813,7 +816,7 @@ regen-opcode: + Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h Python/getplatform.o: $(srcdir)/Python/getplatform.c - $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c @@ -195,10 +195,10 @@ index 109f402..61a41e2 100644 Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -diff --git a/Modules/getpath.c b/Modules/getpath.c -index 18deb60..a01c3f8 100644 ---- a/Modules/getpath.c -+++ b/Modules/getpath.c +Index: Python-3.5.4/Modules/getpath.c +=================================================================== +--- Python-3.5.4.orig/Modules/getpath.c ++++ Python-3.5.4/Modules/getpath.c @@ -105,6 +105,13 @@ #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" #endif @@ -230,10 +230,10 @@ index 18deb60..a01c3f8 100644 if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { Py_FatalError( -diff --git a/Python/getplatform.c b/Python/getplatform.c -index 6899140..66a49c6 100644 ---- a/Python/getplatform.c -+++ b/Python/getplatform.c +Index: Python-3.5.4/Python/getplatform.c +=================================================================== +--- Python-3.5.4.orig/Python/getplatform.c ++++ Python-3.5.4/Python/getplatform.c @@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; @@ -258,11 +258,11 @@ index 6899140..66a49c6 100644 +{ + return LIB; +} -diff --git a/Python/sysmodule.c b/Python/sysmodule.c -index 8d7e05a..d9dee0f 100644 ---- a/Python/sysmodule.c -+++ b/Python/sysmodule.c -@@ -1790,6 +1790,10 @@ _PySys_Init(void) +Index: Python-3.5.4/Python/sysmodule.c +=================================================================== +--- Python-3.5.4.orig/Python/sysmodule.c ++++ Python-3.5.4/Python/sysmodule.c +@@ -1827,6 +1827,10 @@ _PySys_Init(void) PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform())); @@ -273,11 +273,11 @@ index 8d7e05a..d9dee0f 100644 SET_SYS_FROM_STRING("executable", PyUnicode_FromWideChar( Py_GetProgramFullPath(), -1)); -diff --git a/configure.ac b/configure.ac -index 707324d..e8d59a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -883,6 +883,41 @@ PLATDIR=plat-$MACHDEP +Index: Python-3.5.4/configure.ac +=================================================================== +--- Python-3.5.4.orig/configure.ac ++++ Python-3.5.4/configure.ac +@@ -885,6 +885,41 @@ PLATDIR=plat-$MACHDEP AC_SUBST(PLATDIR) AC_SUBST(PLATFORM_TRIPLET) @@ -319,11 +319,11 @@ index 707324d..e8d59a3 100644 AC_MSG_CHECKING([for -Wl,--no-as-needed]) save_LDFLAGS="$LDFLAGS" -diff --git a/setup.py b/setup.py -index 6d26deb..7b14215 100644 ---- a/setup.py -+++ b/setup.py -@@ -495,7 +495,7 @@ class PyBuildExt(build_ext): +Index: Python-3.5.4/setup.py +=================================================================== +--- Python-3.5.4.orig/setup.py ++++ Python-3.5.4/setup.py +@@ -494,7 +494,7 @@ class PyBuildExt(build_ext): # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: @@ -332,7 +332,7 @@ index 6d26deb..7b14215 100644 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: -@@ -553,8 +553,7 @@ class PyBuildExt(build_ext): +@@ -552,8 +552,7 @@ class PyBuildExt(build_ext): # be assumed that no additional -I,-L directives are needed. if not cross_compiling: lib_dirs = self.compiler.library_dirs + [ @@ -342,7 +342,7 @@ index 6d26deb..7b14215 100644 ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] else: -@@ -746,11 +745,11 @@ class PyBuildExt(build_ext): +@@ -745,11 +744,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -356,6 +356,3 @@ index 6d26deb..7b14215 100644 extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: --- -2.11.0 - diff --git a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch index 211f9e78890..a4f8bd47107 100644 --- a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch +++ b/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch @@ -10,16 +10,16 @@ Signed-off-by: Jackie Huang configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: Python-3.5.3/configure.ac +Index: Python-3.5.4/configure.ac =================================================================== ---- Python-3.5.3.orig/configure.ac -+++ Python-3.5.3/configure.ac -@@ -78,7 +78,7 @@ if test "$cross_compiling" = yes; then +--- Python-3.5.4.orig/configure.ac ++++ Python-3.5.4/configure.ac +@@ -73,7 +73,7 @@ if test "$cross_compiling" = yes; then AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) fi AC_MSG_RESULT($interp) - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH) '$interp fi - # Used to comment out stuff for rebuilding generated files - GENERATED_COMMENT='#' + elif test "$cross_compiling" = maybe; then + AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) From patchwork Fri Mar 9 18:55:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131224 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343443lja; Fri, 9 Mar 2018 11:04:48 -0800 (PST) X-Google-Smtp-Source: AG47ELvBA4WsviwLWmR+NVhRpOWnA7svlK8891TZ52DOX1QKS8h6twpYo4/cclpJprMeLu7yA5vT X-Received: by 10.99.103.196 with SMTP id b187mr25365525pgc.1.1520622288516; Fri, 09 Mar 2018 11:04:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622288; cv=none; d=google.com; s=arc-20160816; b=XYUGkHqMkHsnrPOjmue6nPMNvN8sjiv8McWNv+DyvWXNBsRPLPhu8EECez+ZTPSvL1 tv91XkbyEs+rUOemz2fy9vSdxdz2MREjRiNzztEbz+gXoE2EaFqm93Zf1pNOZRSNrSZ/ MdCBYOocowjjOxppgbd2Ff7tnSTfQm8waHGRPYS3HR927OstP8ROKixaly0BA5fKU3fI Ou65OJvnb6H91lGu5gOBoNgH3oHbs8mhZY6Qypcv6Ha6A3GLtTYQj6eezRnFjqlURoig z0hh2MxoI/VoGGr+EORbfPfqPa6xoQprZ0EKCXThYiU915X3sJwTcIDI0rX7iDfDT3+V KmDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to:arc-authentication-results; bh=t1UvcRK38FzUNWQ44y7modf3kiJUm4ZyGYCGwwKKWj0=; b=md7dnfHcyvKiM0tF+MYRTGuqYf9qtBmktVHpQXCynbbX735ND2nOavkb2opFlwNGep GeQbnQ1f4rJ6CLNCleMH4Pq+m2tflxISDVkYLNnLXKk61bpHIZYlAJ+Idd/lbQEOOXDc Ug6bBIy2lbZ18sikvxDzp5mKjiR3qLotFnnF/GhgyWPceFMLtHdysfHTAQNuS7HdJF4M YZX2pdXS0GeqEiGBKI8sKqoXZ/364btar0GmncDWOJVbpmBOe9J6WihPY1cUJ0CgpHwA hyRwWde2kz++Tep1mNNTZeIl5PX0BI4JEIDLU3jAYz/DtHkYRq+VmrP3r4aIrihxAMpK iRiw== 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 o129si1294317pfo.209.2018.03.09.11.04.48; Fri, 09 Mar 2018 11:04:48 -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 96CF378965; Fri, 9 Mar 2018 19:03:27 +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 892067890D for ; Fri, 9 Mar 2018 19:03:11 +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:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651953" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:12 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:52 +0200 Message-Id: <20180309185614.31113-14-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> MIME-Version: 1.0 Subject: [OE-core] [PATCH 14/36] qemu: 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: , 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 --- .../qemu/qemu/apic-fixup-fallthrough-to-PIC.patch | 15 ++++++-------- .../recipes-devtools/qemu/qemu/disable-grabs.patch | 23 ++++++++++------------ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch index 9bbbc6f76da..d6a3522edaa 100644 --- a/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch @@ -28,12 +28,12 @@ Signed-off-by: He Zhe hw/intc/apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index 45887d99..c5ae4087 100644 ---- a/hw/intc/apic.c -+++ b/hw/intc/apic.c -@@ -587,7 +587,7 @@ int apic_accept_pic_intr(DeviceState *dev) - APICCommonState *s = APIC_COMMON(dev); +Index: qemu-2.11.1/hw/intc/apic.c +=================================================================== +--- qemu-2.11.1.orig/hw/intc/apic.c ++++ qemu-2.11.1/hw/intc/apic.c +@@ -591,7 +591,7 @@ int apic_accept_pic_intr(DeviceState *de + APICCommonState *s = APIC(dev); uint32_t lvt0; - if (!s) @@ -41,6 +41,3 @@ index 45887d99..c5ae4087 100644 return -1; lvt0 = s->lvt[APIC_LVT_LINT0]; --- -2.11.0 - diff --git a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch b/meta/recipes-devtools/qemu/qemu/disable-grabs.patch index 123833f8248..77117890f48 100644 --- a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch +++ b/meta/recipes-devtools/qemu/qemu/disable-grabs.patch @@ -24,11 +24,11 @@ Signed-off-by: Eric Bénard ui/sdl.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -diff --git a/ui/sdl.c b/ui/sdl.c -index 39a42d6..9b8abe5 100644 ---- a/ui/sdl.c -+++ b/ui/sdl.c -@@ -59,6 +59,10 @@ static SDL_Cursor *guest_sprite = NULL; +Index: qemu-2.11.1/ui/sdl.c +=================================================================== +--- qemu-2.11.1.orig/ui/sdl.c ++++ qemu-2.11.1/ui/sdl.c +@@ -63,6 +63,10 @@ static SDL_PixelFormat host_format; static int scaling_active = 0; static Notifier mouse_mode_notifier; static int idle_counter; @@ -37,10 +37,10 @@ index 39a42d6..9b8abe5 100644 +#endif +static doing_grabs = True; - static void sdl_update(DisplayChangeListener *dcl, - int x, int y, int w, int h) -@@ -384,14 +388,16 @@ static void sdl_grab_start(void) - } + #define SDL_REFRESH_INTERVAL_BUSY 10 + #define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \ +@@ -431,14 +435,16 @@ static void sdl_grab_start(void) + } } else sdl_hide_cursor(); - SDL_WM_GrabInput(SDL_GRAB_ON); @@ -58,7 +58,7 @@ index 39a42d6..9b8abe5 100644 gui_grab = 0; sdl_show_cursor(); sdl_update_caption(); -@@ -909,6 +915,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) +@@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds, * This requires SDL >= 1.2.14. */ setenv("SDL_DISABLE_LOCK_KEYS", "1", 1); @@ -67,6 +67,3 @@ index 39a42d6..9b8abe5 100644 flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE; if (SDL_Init (flags)) { fprintf(stderr, "Could not initialize SDL(%s) - exiting\n", --- -1.8.3.1 - From patchwork Fri Mar 9 18:55:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131225 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343697lja; Fri, 9 Mar 2018 11:05:05 -0800 (PST) X-Google-Smtp-Source: AG47ELthxQH0DjsM+0b+nKOsPczVdCJnM/s9FsD4pzmIIGj1ifcScucgyjjlaGZ35nmlK6617xE1 X-Received: by 10.99.139.199 with SMTP id j190mr25428181pge.334.1520622305758; Fri, 09 Mar 2018 11:05:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622305; cv=none; d=google.com; s=arc-20160816; b=FP/9eR579TK/J9A2h5Vm+QOwGnk1+sFB8YKfZyqUvElGGGqhpWEZQK7PPizbgh9V5e o1GO0n9N/XZNqSJREMg/l+PKjXQuCxdk2RFX6g/1jRQklxPYggqrnJuJFAuFh5HrMwmS uvePapa0kAE9zrG6On3QBq5cZL3frg2ZGcrIgaMCkbeHpygDIe/61dtapipNqmCL+oHg uiYLxuDiaQGaoNU4xK4CYicmgpG3hgQoFVFk06QBuu/8wzgO1JHLP9tbHKP3DORsj5gx ulpmcg+ZLpxP1yDjrDtL3crPvisgITSWUaT/hGiE1itzZXZRHJWChtdaNaF8HkWetzSm ZwTw== 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=wS49Q6toWL9ilVZgcyEWMa/ubG8zaoYvsN4aNTMo1jc=; b=m+WYX6m7Ufw1+p55ybWbEc+yYDA8ujxfp8lYh4aWy8Y1mgg+vyDkPftKdeWcEgEYfJ W6isUoJENihL77UVEbYLIplSkM8R/MyVz9fLWC/M+miEy38vzn650Ef+Zk46CL+W20Hh lJgR01gbwGQz0gy5q3QWUdx5+nn3aUOUs70CYccTUTQV/7e2kH2eEkN2dSLS73dIsidB LcA72TRQBxSyU8luD1oAkI9E1XOlKPS7qGdTCbuIYq10ZIe858d25KpzSaa1J9MgKZIB 016esMRZRACan7dPIgkbZXfL785pgwXjWVnPSBmIp0RUoXoTn1/wVuyHrReTIc8//8s1 RadA== 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 x23si1283222pfh.355.2018.03.09.11.05.05; Fri, 09 Mar 2018 11:05:05 -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 0987C789A5; Fri, 9 Mar 2018 19:03:30 +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 0767978956 for ; Fri, 9 Mar 2018 19:03:14 +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:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651965" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:14 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:54 +0200 Message-Id: <20180309185614.31113-16-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 16/36] ruby: 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 --- .../0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 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-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index b0114ba28b2..4cf579f4270 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -10,19 +10,16 @@ Signed-off-by: Christopher Larson Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in -index 7da2488..5b4aea1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -75,7 +75,7 @@ EXTLIBS = - LIBS = @LIBS@ $(EXTLIBS) +Index: ruby-2.5.0/Makefile.in +=================================================================== +--- ruby-2.5.0.orig/Makefile.in ++++ ruby-2.5.0/Makefile.in +@@ -77,7 +77,7 @@ LIBS = @LIBS@ $(EXTLIBS) MISSING = @LIBOBJS@ @ALLOCA@ + ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ -DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) +DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) SOLIBS = @SOLIBS@ + ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ MAINLIBS = @MAINLIBS@ - ARCHMINIOBJS = @MINIOBJS@ --- -2.8.0 - From patchwork Fri Mar 9 18:55:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131226 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343827lja; Fri, 9 Mar 2018 11:05:13 -0800 (PST) X-Google-Smtp-Source: AG47ELs5iedEM9nF+dzdFTFJLdupyJ7rb8MK2yCTAV/IFy/+M6UIpi6DLaTl855TmjWivFpPVEmR X-Received: by 10.101.97.72 with SMTP id o8mr25539282pgv.119.1520622313364; Fri, 09 Mar 2018 11:05:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622313; cv=none; d=google.com; s=arc-20160816; b=IoRyQKAlulhT1d8IQUwilGQfLmjvhZkvQxCO83jAF5q6wvD9tozVaGbjDaC2EtcSA1 6pkmeMK2xIE7pwqC1+jm/7Eg8fIwVif95iDmSKpXFIjFhmIUPdwNxVF5lxp1i42sZ16b VCXxJjpVseCun0ENkdnleX2ssUyPS0XMYJMyY+yCAYBYfy1AAEtucrxgjEc0RgyKcmG5 6SJS+sMuQlIpYU7kM33vHyKGCpQT+oaqsEinX8MJ90kKBZYz9IXA8iCa/kZoox6M7Kd6 ieucrr2CoeCICRfTPN1bVGoNLMlAlQRZwfLEuXP9yRcqr3Xd0P05d4Wa09Hm+cQuif5k Bsxw== 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=/vi4uoXqZ5eSBf3rBzA6qQNyAWmQ/+ktCw2Fpf4J8Cg=; b=iZSw5NniZlKAWQTxoKzhFIL3zMqWZZA2l1z4rpwOFrJHnkA6EPXHeVghiRn4j0SXD1 D3bte+kDGYZxod7nOHRwlR1RoWZf5ZXvwFdVG+tZwM0RjbzuEaivPmNjLO2oHjsinvsN BdqbIcEocIvJRnREKWimW5QRzoFWefMzLGXkXGt1JXnz8fNtJwSLhGd7O/tlR3qb6kpT 9mjvq9Jy3kZBG9pqKS+BqZLYwN6I8fqZCVso8mYbNe84Se6IaAf+zcc6WC4cdXf+6M06 ELzlNgaeQm1mFAAEFi1NGLR2FXM31/hwRRbn2/YP+xJzxlD5MFlIvwtncYLtbjAlVJXi A3mg== 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 j5si1295975pfe.334.2018.03.09.11.05.12; Fri, 09 Mar 2018 11:05:13 -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 177097899F; Fri, 9 Mar 2018 19:03:31 +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 6FBB978919 for ; Fri, 9 Mar 2018 19:03:15 +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:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651970" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:15 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:55 +0200 Message-Id: <20180309185614.31113-17-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 17/36] tcf-agent: 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 --- meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch | 14 ++++++++------ 1 file changed, 8 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-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch index 5d704567c8f..b66f41ad280 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch @@ -1,14 +1,16 @@ Upstream-Status: Inappropriate [poky-specific fix] ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -57,6 +57,9 @@ - ifeq ($(NO_UUID),) - LIBS += -luuid +Index: agent/Makefile.inc +=================================================================== +--- agent.orig/Makefile.inc ++++ agent/Makefile.inc +@@ -88,6 +88,9 @@ ifneq ($(OPSYS),Windows) + ifneq ($(CC),g++) + OPTS += -Wmissing-prototypes endif + ifneq ($(RANLIB),) + RANLIB += $@ + endif endif - ifneq ($(OPSYS),Windows) + # Compiler flags definition From patchwork Fri Mar 9 18:55:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131227 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343957lja; Fri, 9 Mar 2018 11:05:20 -0800 (PST) X-Google-Smtp-Source: AG47ELsSH+er3oZPlxqklrfrshRvFFRPbgBgGjjGNUjXrZFpiT7VkCdM/uSFyN+7OI/CByyEW0Am X-Received: by 2002:a17:902:8b85:: with SMTP id ay5-v6mr29314712plb.329.1520622320727; Fri, 09 Mar 2018 11:05:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622320; cv=none; d=google.com; s=arc-20160816; b=UeXVeAFkSHMn99kvCHjjX+D1tHTuCVi9QkrJv2CKVSaGWM7RcAHY+RadTz8Bc2JO8H ffaZNDT/TWYdMURK9nyAB26iiTDGJEx4ffXQyjyZk2DW9s9FxvrtNeAx8ErUyC83VW2m eqUhyZ0yTwLyGVESalcISj2cTcPzvTXILnK+adA4XpmfCMfq5w2EJ0Nrx/lXHdcal+dv q0R1uXfZSLYiIzTLmqhV1EOx2gP6LiB+gkIbWPRh5Gdzmpzr5GHeWe8Ll1crNYnC6wfu 7hVmhYLTrmpR2Cb4WGCnvzBu80Srjs1R/FsqD7hZwQBeQ76Zp4ne60K5PeGiuvZvGQhO Iv8A== 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=9KwIME4rhnugPfrK6WYnf3uX5xILYz4C1gtAtWEPNCA=; b=yWX/aAlzSnUVM5HZaynmDP5yGyhF6tw+VvfYsUGwCt+O23OMEZZORXl6SsIakm13DK 0epMXMfyXr0qkgkdhknOIONRY2cgsPwsD619yTHcGoEOjK0J4oM2Mz5NgPUu78ORR6Hf z2oqcAzKSGtNw1Fao1UTM7VUoMgjCwdwm3/1k89ttQ9ncOP+CngRBTjXn+IF4zLz5AfW eANp4ur5Goglif25+blkqFsl8Bld9YKQ5FXRp+zjJDVY0fJZRPqWo/eTeUFX9x8hNLJo /0hjwHXjruaWRiW8APQPQH8LD6LhwOPOFIKgM5YMliYmD5k/BDMeQdet5VMqqK1UXy7K 3QYw== 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 g61-v6si1296751plb.291.2018.03.09.11.05.20; Fri, 09 Mar 2018 11:05:20 -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 2C034789B2; Fri, 9 Mar 2018 19:03:32 +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 BA9A678958 for ; Fri, 9 Mar 2018 19:03:16 +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:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651977" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:17 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:56 +0200 Message-Id: <20180309185614.31113-18-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 18/36] cups: 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 --- .../0001-don-t-try-to-run-generated-binaries.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch index 5379eb6aa2b..db013cf08c4 100644 --- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch @@ -10,12 +10,12 @@ Signed-off-by: Koen Kooi ppdc/Makefile | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) -Index: cups-2.0.0/ppdc/Makefile +Index: cups-2.2.6/ppdc/Makefile =================================================================== ---- cups-2.0.0.orig/ppdc/Makefile -+++ cups-2.0.0/ppdc/Makefile -@@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ +--- cups-2.2.6.orig/ppdc/Makefile ++++ cups-2.2.6/ppdc/Makefile +@@ -228,8 +228,8 @@ genstrings: genstrings.o libcupsppdc.a + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - echo Generating localization strings... @@ -25,8 +25,8 @@ Index: cups-2.0.0/ppdc/Makefile # -@@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ +@@ -246,9 +246,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD compiler... @@ -38,8 +38,8 @@ Index: cups-2.0.0/ppdc/Makefile # -@@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ +@@ -274,17 +274,17 @@ ppdi-static: ppdc-static ppdi.o libcups + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD importer... From patchwork Fri Mar 9 18:55:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131228 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344083lja; Fri, 9 Mar 2018 11:05:27 -0800 (PST) X-Google-Smtp-Source: AG47ELuneWlYsW6Xbck7BA9+Cviidh/W08Ph2jYQNgzcuofQFd1zWeZI/LPVqqdFDnFOwOs4EM+S X-Received: by 10.101.75.70 with SMTP id k6mr25915814pgt.335.1520622327466; Fri, 09 Mar 2018 11:05:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622327; cv=none; d=google.com; s=arc-20160816; b=LYLWkdPgsQHING+NRVBsymt63W+QCgSi8iSOE1/b2hFhRbh4se0qlH6C6nbmCjpeHQ 7z15qkfSwz6YMmO7S2AYgB9bFkzqZbUJZe1N1YIQ6YGd8m/k8L4y5omqxV+q/DxSBHXb HoB1qHbreAroX2ClO1t72rIQ15RnVw5olSLrhLs7IT860QGY2kkYZP31fAHCFN4J3vR9 PjMpgP18rWMLN6YMShlGA46SbyjzhFb2dcDpggUA3G1vGyyI9LzLyLqEo6s9RnY+Of3G 2SS6GuS7ly41zYYB744nLs1ZINKFJgcGxq/YpnEdHLmqFrZI328mzrBOpKUrQAE6/9it 36dA== 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=Fky4FX4K4Di8llOnupzbCHtM+V0bTksVilbgIfpOqgk=; b=VSqy0d1A6oAqyLufzSZokM/cq+XpbfYSPKHlbN2xFg58VOcxare9a1P1iwLeI6gsna rpKxUTJIPVBhqjcU6Yl9iiz9VpANuqCpUCgiu4dRFlxCf186s98WT+WNvIy/gD6rwCRT hESL+yppaOaWIm34kAxRRqXPe7Bp/23GGhgoyLiLG7znC0h9DSvBClr4vEw9rrLD/8L3 DGcU7RmymSINdd8uK+G5baRyjewpx1dMvfvAaP4vsClu5oHWLCk71sRhVgw1hmtO0fX9 sfxVaYtQfw5EtyagjIZ0+TUivREOY+jj4bw1fY6nIz8bPzFg/TEOIwG9Ex9D3Uh/XJYh 9oOA== 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 k13si1078567pgo.578.2018.03.09.11.05.27; Fri, 09 Mar 2018 11:05:27 -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 51D9E7898E; Fri, 9 Mar 2018 19:03:33 +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 1FF6A78969 for ; Fri, 9 Mar 2018 19:03:18 +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:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651989" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:18 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:57 +0200 Message-Id: <20180309185614.31113-19-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 19/36] ethtool: 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 --- meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 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-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index dbf7142f18a..de38104044c 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -5,12 +5,12 @@ Signed-off-by: Tudor Florea Upstream-Status: Inappropriate (default automake behavior incompatible with ptest) -Index: ethtool-4.11/configure.ac +Index: ethtool-4.13/configure.ac =================================================================== ---- ethtool-4.11.orig/configure.ac -+++ ethtool-4.11/configure.ac +--- ethtool-4.13.orig/configure.ac ++++ ethtool-4.13/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to p - AC_INIT(ethtool, 4.11, netdev@vger.kernel.org) + AC_INIT(ethtool, 4.13, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu]) From patchwork Fri Mar 9 18:55:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131229 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344209lja; Fri, 9 Mar 2018 11:05:34 -0800 (PST) X-Google-Smtp-Source: AG47ELvWaaUYV1GNTg+/kkUL0SHgFcpYkj+ZMbCYw84/2EvlwWXi32J9hcKEpv1MOblmLtFCSNIo X-Received: by 2002:a17:902:f81:: with SMTP id 1-v6mr27979249plz.265.1520622334126; Fri, 09 Mar 2018 11:05:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622334; cv=none; d=google.com; s=arc-20160816; b=YNqwjtjmMFp6wV5eSU86kSTus37fOoCik3voktFU3rC4y+MheoC7SswmK3Kr3/HAEy K03PB1RJhb7bTtRa54uBRgKJmfFsMRM7m072C+gsoR3D773pE5q7eyiu1joUNO/RgJqj KgaxL7KkHnIvXqVttvjsRgAAb8Uf4BwAlSzXnZH45vVzisavDsCFn+rVvR9Z1j8M06PO KItVMceSBbL5fEwL7kV2W0vhEZhAjbSG3fwIMpryrGG6WjuKAl0vPBAySgCrt1NDNn9M l11A4LzplRQYnnsr9/0CWE9jqO6ePYtreZuIay81zdk8Kc5AjGLpk3nNnx6vlu/BZeJg CumQ== 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=EEJbNVvrbERD2GJ4slBePdey9M9DsCTgdphsniOAWxM=; b=XxsV5JWZ3rOAcx/T5Iny4vkGWWC3g05tFkS/YpbDlioTZrAscib/6zBRNNMDjHyR6b XydVqa06Yk1s2mLdaNLCbfEm4Jqg3ZnOoEr23TUHaFg+u5PRbQZddVONjOE9yl8QLpXg RuM9RDbeDxx4LaBK9BcY7o0zWn+C1juVE0YiDGZf3kP8s4UlF/21o7nCs7YrGa3qGTbw wx4VoJ58SIJG+xmPlCdKDi1GtYIcQBrGvIm5uHf2tJF0/1J6qgVoX9mfCjcKHMWJCM76 aX4PG+Lcj71RA2qebo1F1wjkp9qNhjTa1EZsoQu9lz55PJ2I0KjoENL4HmPt98Rc2ncW hdxA== 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 i187si1312399pfe.175.2018.03.09.11.05.33; Fri, 09 Mar 2018 11:05:34 -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 726E8789A9; Fri, 9 Mar 2018 19:03:34 +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 85AC478977 for ; Fri, 9 Mar 2018 19:03:19 +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:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652000" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:20 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:58 +0200 Message-Id: <20180309185614.31113-20-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 20/36] ltp: 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 --- ...-Add-option-to-select-libc-implementation.patch | 78 +++++++++++----------- ..._GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch | 29 ++++---- 2 files changed, 51 insertions(+), 56 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-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch index cf744639c21..84ab37ea395 100644 --- a/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch @@ -22,10 +22,10 @@ Upstream-Status: Pending testcases/realtime/stress/pi-tests/Makefile | 5 +++++ 8 files changed, 35 insertions(+), 2 deletions(-) -diff --git a/Makefile b/Makefile -index 297f8e7..906b280 100644 ---- a/Makefile -+++ b/Makefile +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile @@ -49,6 +49,11 @@ SKIP_IDCHECK ?= 0 UCLINUX ?= 0 export UCLINUX @@ -38,11 +38,11 @@ index 297f8e7..906b280 100644 # CLEAN_TARGETS: Targets which exist solely in clean. # COMMON_TARGETS: Targets which exist in all, clean, and install. # INSTALL_TARGETS: Targets which exist in clean and install (contains -diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile -index 50a12fa..4f1987f 100644 ---- a/testcases/kernel/Makefile -+++ b/testcases/kernel/Makefile -@@ -47,13 +47,16 @@ SUBDIRS += connectors \ +Index: git/testcases/kernel/Makefile +=================================================================== +--- git.orig/testcases/kernel/Makefile ++++ git/testcases/kernel/Makefile +@@ -48,13 +48,16 @@ SUBDIRS += connectors \ logging \ mem \ numa \ @@ -60,10 +60,10 @@ index 50a12fa..4f1987f 100644 ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) SUBDIRS += power_management endif -diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile -index 6245ed0..aa4eb7f 100644 ---- a/testcases/kernel/sched/Makefile -+++ b/testcases/kernel/sched/Makefile +Index: git/testcases/kernel/sched/Makefile +=================================================================== +--- git.orig/testcases/kernel/sched/Makefile ++++ git/testcases/kernel/sched/Makefile @@ -23,5 +23,7 @@ top_srcdir ?= ../../.. @@ -73,11 +73,11 @@ index 6245ed0..aa4eb7f 100644 + FILTER_OUT_DIRS += process_stress +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 8acb395..b749126 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -28,5 +28,10 @@ ifeq ($(UCLINUX),1) +Index: git/testcases/kernel/syscalls/Makefile +=================================================================== +--- git.orig/testcases/kernel/syscalls/Makefile ++++ git/testcases/kernel/syscalls/Makefile +@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif @@ -87,12 +87,13 @@ index 8acb395..b749126 100644 + ustat +endif - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8bc78c2..c36cf50 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil +Index: git/testcases/network/nfsv4/acl/Makefile +=================================================================== +--- git.orig/testcases/network/nfsv4/acl/Makefile ++++ git/testcases/network/nfsv4/acl/Makefile +@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre LDLIBS += $(ACL_LIBS) @@ -101,10 +102,10 @@ index 8bc78c2..c36cf50 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 3160813..9bdf5d0 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile +Index: git/testcases/network/rpc/basic_tests/Makefile +=================================================================== +--- git.orig/testcases/network/rpc/basic_tests/Makefile ++++ git/testcases/network/rpc/basic_tests/Makefile @@ -23,4 +23,9 @@ top_srcdir ?= ../../../.. @@ -115,11 +116,11 @@ index 3160813..9bdf5d0 100644 +endif + include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 7a7a57a..5808866 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk +Index: git/testcases/realtime/func/pi-tests/Makefile +=================================================================== +--- git.orig/testcases/realtime/func/pi-tests/Makefile ++++ git/testcases/realtime/func/pi-tests/Makefile +@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre include $(abs_srcdir)/../../config.mk MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex @@ -129,10 +130,10 @@ index 7a7a57a..5808866 100644 + include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 5edc3b4..aa5987a 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile +Index: git/testcases/realtime/stress/pi-tests/Makefile +=================================================================== +--- git.orig/testcases/realtime/stress/pi-tests/Makefile ++++ git/testcases/realtime/stress/pi-tests/Makefile @@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/env_pre.mk @@ -143,6 +144,3 @@ index 5edc3b4..aa5987a 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk --- -2.7.0 - diff --git a/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch b/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch index 3e79c9f295d..462976da42c 100644 --- a/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch +++ b/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch @@ -18,10 +18,10 @@ Upstream-Status: Pending testcases/kernel/syscalls/mremap/mremap03.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) -diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c -index d63d1e4..24ca174 100644 ---- a/testcases/kernel/syscalls/mremap/mremap01.c -+++ b/testcases/kernel/syscalls/mremap/mremap01.c +Index: git/testcases/kernel/syscalls/mremap/mremap01.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/mremap/mremap01.c ++++ git/testcases/kernel/syscalls/mremap/mremap01.c @@ -76,10 +76,12 @@ */ #include @@ -35,11 +35,11 @@ index d63d1e4..24ca174 100644 +#undef _GNU_SOURCE #include "test.h" - -diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c -index 5a51b9a..a530a6b 100644 ---- a/testcases/kernel/syscalls/mremap/mremap02.c -+++ b/testcases/kernel/syscalls/mremap/mremap02.c + #include "safe_macros.h" +Index: git/testcases/kernel/syscalls/mremap/mremap02.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/mremap/mremap02.c ++++ git/testcases/kernel/syscalls/mremap/mremap02.c @@ -75,9 +75,11 @@ #include #include @@ -52,10 +52,10 @@ index 5a51b9a..a530a6b 100644 #include "test.h" -diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c -index 12e3829..9b39f8b 100644 ---- a/testcases/kernel/syscalls/mremap/mremap03.c -+++ b/testcases/kernel/syscalls/mremap/mremap03.c +Index: git/testcases/kernel/syscalls/mremap/mremap03.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/mremap/mremap03.c ++++ git/testcases/kernel/syscalls/mremap/mremap03.c @@ -76,9 +76,11 @@ #include #include @@ -68,6 +68,3 @@ index 12e3829..9b39f8b 100644 #include "test.h" --- -2.7.0 - From patchwork Fri Mar 9 18:55:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131230 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344317lja; Fri, 9 Mar 2018 11:05:40 -0800 (PST) X-Google-Smtp-Source: AG47ELsxWo0z0IhPooRDBvGfWg5XSS+VZNvChV3gVGudJy99b7o+beMs3lggBoKi7vg2Fqj7NWp+ X-Received: by 2002:a17:902:bd05:: with SMTP id p5-v6mr28598979pls.137.1520622340063; Fri, 09 Mar 2018 11:05:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622340; cv=none; d=google.com; s=arc-20160816; b=AG7HxhYaT8La3Ts7x4tZjIV2/DvfHD7+PK10/TrTCPn3dd/zkzRfwyRfBdwLyMrye0 APMwQCbzEFjFTDeJ6Am/CyvCy60hz6oG2gz+InnmFEmjUp8VOZG4HBHTZen3suWe8xY1 ozLdAf2F/W+oLXHvFCkYKu8CXZ5+dkUQ1yHUZZukVQxMBnZs4Ib8+SgNT2fvuYOJZ89d 1FT9u8qZhM0qlon57ivLmlCytMalF2DFH+kWUvJB4BcFcNohDT6h496NIeDZMwWgCZdz mcCJkXJ1mys8TSMvAKv5hDMbZ+YJyuT6W9qJznn0Rtj4xUAXq6dlVi8pPGaqUc6VUOO5 Nrrw== 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=W3hUsYB3apZUZkQf2+/aggZxr4PZJBHH2iwuFw3LRgY=; b=RTuTfKUeffnSBCMWY7f2Q+mo1TGrGn+YfLTAkjQfvzU4+fiRzVWUWN6YAD+bLlgY8s YCEwa3+onDpAIDidQ6w1HvsMpow3mMHJR48D400o1RMXdnrcUY7vL8ZHcG1tEd5Zw4AC ktrsIrHfQfuwDP3K0SL0p18Io9/TOE65UIAbahzDY00A29xevyt0jpMnmvpLfiVhRvUP 9rAl9STFi7qjLFlW7zKZq6VGmtX13CK6WbCN7ysJNeszcO2ocy+vsVALJbLF1Q4T7mvJ yhUdxsyqqzaJ23q3Sqc6OUemTu1VzV1VDCEaXOhvcJXFPVypx9WX0FLu+Jy8NBe3AgNQ 4ULg== 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 v196si1109802pgb.217.2018.03.09.11.05.39; Fri, 09 Mar 2018 11:05:40 -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 81FAE789C1; Fri, 9 Mar 2018 19:03:35 +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 A469178962 for ; Fri, 9 Mar 2018 19:03:21 +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:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652005" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:21 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:59 +0200 Message-Id: <20180309185614.31113-21-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 21/36] net-tools: 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 --- .../net-tools/net-tools/net-tools-1.60-sctp1.patch | 47 ++++++++++------------ 1 file changed, 22 insertions(+), 25 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-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch b/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch index 12eed17af4f..78daf6c3edf 100644 --- a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch +++ b/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch @@ -11,10 +11,10 @@ Signed-off-by: Li Zhou statistics.c | 68 +++++++++- 2 files changed, 465 insertions(+), 14 deletions(-) -diff --git a/netstat.c b/netstat.c -index 1fb9e0c..5d1a4a1 100644 ---- a/netstat.c -+++ b/netstat.c +Index: net-tools-1.60/netstat.c +=================================================================== +--- net-tools-1.60.orig/netstat.c ++++ net-tools-1.60/netstat.c @@ -58,6 +58,7 @@ * *990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one() @@ -23,7 +23,7 @@ index 1fb9e0c..5d1a4a1 100644 * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General -@@ -105,7 +106,7 @@ +@@ -106,7 +107,7 @@ #endif /* prototypes for statistics.c */ @@ -32,7 +32,7 @@ index 1fb9e0c..5d1a4a1 100644 void inittab(void); void parsesnmp6(int, int, int); void inittab6(void); -@@ -118,6 +119,28 @@ typedef enum { +@@ -119,6 +120,28 @@ typedef enum { SS_DISCONNECTING /* in process of disconnecting */ } socket_state; @@ -61,7 +61,7 @@ index 1fb9e0c..5d1a4a1 100644 #define SO_ACCEPTCON (1<<16) /* performed a listen */ #define SO_WAITDATA (1<<17) /* wait data to read */ #define SO_NOSPACE (1<<18) /* no space to write */ -@@ -148,6 +171,7 @@ int flag_opt = 0; +@@ -149,6 +172,7 @@ int flag_opt = 0; int flag_raw = 0; int flag_tcp = 0; int flag_udp = 0; @@ -69,7 +69,7 @@ index 1fb9e0c..5d1a4a1 100644 int flag_igmp= 0; int flag_rom = 0; int flag_exp = 1; -@@ -990,6 +1014,365 @@ static int udp_info(void) +@@ -995,6 +1019,365 @@ static int udp_info(void) udp_do_one); } @@ -435,7 +435,7 @@ index 1fb9e0c..5d1a4a1 100644 static void raw_do_one(int lnr, const char *line) { char buffer[8192], local_addr[64], rem_addr[64]; -@@ -1549,7 +1932,7 @@ static void usage(void) +@@ -1558,7 +1941,7 @@ static void usage(void) fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); @@ -444,7 +444,7 @@ index 1fb9e0c..5d1a4a1 100644 fprintf(stderr, _(" =Use '-6|-4' or '-A ' or '--'; default: %s\n"), DFLT_AF); fprintf(stderr, _(" List of possible address families (which support routing):\n")); print_aflist(1); /* 1 = routeable */ -@@ -1574,6 +1957,7 @@ int main +@@ -1583,6 +1966,7 @@ int main {"protocol", 1, 0, 'A'}, {"tcp", 0, 0, 't'}, {"udp", 0, 0, 'u'}, @@ -452,7 +452,7 @@ index 1fb9e0c..5d1a4a1 100644 {"raw", 0, 0, 'w'}, {"unix", 0, 0, 'x'}, {"listening", 0, 0, 'l'}, -@@ -1604,7 +1988,7 @@ int main +@@ -1613,7 +1997,7 @@ int main getroute_init(); /* Set up AF routing support */ afname[0] = '\0'; @@ -461,7 +461,7 @@ index 1fb9e0c..5d1a4a1 100644 switch (i) { case -1: break; -@@ -1696,10 +2080,12 @@ int main +@@ -1705,10 +2089,12 @@ int main case 't': flag_tcp++; break; @@ -475,7 +475,7 @@ index 1fb9e0c..5d1a4a1 100644 case 'w': flag_raw++; break; -@@ -1717,13 +2103,13 @@ int main +@@ -1726,13 +2112,13 @@ int main if (flag_int + flag_rou + flag_mas + flag_sta > 1) usage(); @@ -493,7 +493,7 @@ index 1fb9e0c..5d1a4a1 100644 + flag_ax25 + flag_netrom + flag_igmp + flag_x25; if (flag_mas) { -@@ -1751,7 +2137,7 @@ int main +@@ -1760,7 +2146,7 @@ int main char buf[256]; if (!afname[0]) { inittab(); @@ -502,7 +502,7 @@ index 1fb9e0c..5d1a4a1 100644 } else { safe_strncpy(buf, afname, sizeof(buf)); tmp1 = buf; -@@ -1804,7 +2190,7 @@ int main +@@ -1815,7 +2201,7 @@ int main return (i); } for (;;) { @@ -511,7 +511,7 @@ index 1fb9e0c..5d1a4a1 100644 #if HAVE_AFINET prg_cache_load(); printf(_("Active Internet connections ")); /* xxx */ -@@ -1843,6 +2229,11 @@ int main +@@ -1854,6 +2240,11 @@ int main if (i) return (i); } @@ -523,10 +523,10 @@ index 1fb9e0c..5d1a4a1 100644 if (!flag_arg || flag_raw) { i = raw_info(); if (i) -diff --git a/statistics.c b/statistics.c -index 03600d7..eb8d7dc 100644 ---- a/statistics.c -+++ b/statistics.c +Index: net-tools-1.60/statistics.c +=================================================================== +--- net-tools-1.60.orig/statistics.c ++++ net-tools-1.60/statistics.c @@ -21,7 +21,7 @@ #define UFWARN(x) #endif @@ -537,7 +537,7 @@ index 03600d7..eb8d7dc 100644 enum State { number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg, @@ -297,6 +297,27 @@ struct entry Tcpexttab[] = - { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number }, + { "TCPRenoRecoveryFail", N_("%llu classic Reno fast retransmits failed"), opt_number }, }; +struct entry Sctptab[] = @@ -616,7 +616,7 @@ index 03600d7..eb8d7dc 100644 f = proc_fopen("/proc/net/snmp"); if (!f) { perror(_("cannot open /proc/net/snmp")); -@@ -530,6 +580,16 @@ void parsesnmp(int flag_raw, int flag_tcp, int flag_udp) +@@ -530,6 +580,16 @@ void parsesnmp(int flag_raw, int flag_tc fclose(f); } @@ -633,6 +633,3 @@ index 03600d7..eb8d7dc 100644 return; } --- -1.8.5.2.233.g932f7e4 - From patchwork Fri Mar 9 18:56:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131231 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344411lja; Fri, 9 Mar 2018 11:05:46 -0800 (PST) X-Google-Smtp-Source: AG47ELs2ecJAERx+IHFr1p3qAyEZxT8+wtKOgpK3PNdu62cTQYnTZyqZ7/6s9VGAbiIwNmeuV03D X-Received: by 10.101.85.204 with SMTP id k12mr25761302pgs.40.1520622346774; Fri, 09 Mar 2018 11:05:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622346; cv=none; d=google.com; s=arc-20160816; b=bPcnDMckEQnhrIxeyXC3GlxI4a5SDtNG9H4R9fz9XdxEBv1xQpXga1awIhKmYWscb8 Cfwh5yl9UGQA3EnSNlL0lf+6VF1a5QJqLMPqKiXZz6OhlwnbTjunAq5aEI9bmKX10qEs nkBn6iTp32Uijj5sn8WMrGE+127V7rzr5y+GLExDfO14pCTnPX45Lg/w2pD85ZHtGiFX ln0FSHf29/C6eUr4G03ocgdcKoKHRHHeHTzsmc3OKc3EktpV6NJp3bgv74tRJBgBWT5K gWvccun0cH/XcISGiDcWayv+f0i8qJEbkSrHKjriH7DM1DtLKoZNx6wgUYXA9FjTBsGY x0+A== 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=2GwySrbt9RYnB0c367RHy/m5o1YYtomtEG8bAY2iV4w=; b=w0xeVaSOfwuotA2nWAat2uMz3o+OYMB7/FHvDV1/Lwd3sXCyzWxV5dKSer/Ai+WgE/ V8FDiNrIiGDfkcwzRAFxuLKZzCtAugBistMI5YPT07EcQtNcUKYaOmQUtyHNhJFbKP5x mt/O8qFrEFLdHtkRqydkydU8i4O0mEjDajr6nbSdZmUyUqTsAyBWXWHnHYrz+9lWNDws Hqxlfx3sZX9noGFZCF9Z0/BpWeqMshFngDB/1pqu5lOPgCcDmmYtIKK0VgtpRQU6vH6n R4p+Z7JCJST75He7XsM6XqcWy/IrST9AThWI1Y3YPuOzAl4RvIvOrlT+49YvoR5qYg5S dn9w== 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 b6-v6si355495plz.462.2018.03.09.11.05.46; Fri, 09 Mar 2018 11:05:46 -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 95E1578954; Fri, 9 Mar 2018 19:03:36 +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 4BC2978980 for ; Fri, 9 Mar 2018 19:03:23 +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:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652013" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:23 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:00 +0200 Message-Id: <20180309185614.31113-22-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 22/36] newt: 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 --- meta/recipes-extended/newt/files/cross_ar.patch | 26 ++++++++++++------------- 1 file changed, 12 insertions(+), 14 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-extended/newt/files/cross_ar.patch b/meta/recipes-extended/newt/files/cross_ar.patch index 03007aa4f4e..86cc0be1d38 100644 --- a/meta/recipes-extended/newt/files/cross_ar.patch +++ b/meta/recipes-extended/newt/files/cross_ar.patch @@ -18,18 +18,19 @@ Signed-off-by: Hongxu Jia configure.ac | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in ---- a/Makefile.in -+++ b/Makefile.in +Index: newt-0.52.20/Makefile.in +=================================================================== +--- newt-0.52.20.orig/Makefile.in ++++ newt-0.52.20/Makefile.in @@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ - CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ + CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ GNU_LD = @GNU_LD@ +AR = @AR@ VERSION = @VERSION@ TAG = r$(subst .,-,$(VERSION)) -@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH) +@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) $(LIBNEWT): $(LIBOBJS) @@ -38,10 +39,10 @@ diff --git a/Makefile.in b/Makefile.in newt.o $(SHAREDDIR)/newt.o: newt.c Makefile -diff --git a/configure.ac b/configure.ac -index 92e6da8..cd83d57 100644 ---- a/configure.ac -+++ b/configure.ac +Index: newt-0.52.20/configure.ac +=================================================================== +--- newt-0.52.20.orig/configure.ac ++++ newt-0.52.20/configure.ac @@ -15,6 +15,10 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_GREP @@ -51,8 +52,5 @@ index 92e6da8..cd83d57 100644 +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) +AC_PROG_AR - # Are we using GNU ld? - AC_MSG_CHECKING([for GNU ld]) --- -1.8.1.2 - + AC_CHECK_SIZEOF([long]) + AC_CHECK_SIZEOF([long long]) From patchwork Fri Mar 9 18:56:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131232 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344493lja; Fri, 9 Mar 2018 11:05:52 -0800 (PST) X-Google-Smtp-Source: AG47ELvHj6ccehJy4d2sj1GRunHt2c85w+wUpKXgZS8aEJ9MPl5zM+0oniARUvWXXDznboJhfbSh X-Received: by 2002:a17:902:3103:: with SMTP id w3-v6mr27515021plb.99.1520622352493; Fri, 09 Mar 2018 11:05:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622352; cv=none; d=google.com; s=arc-20160816; b=a2gisGDiaPdgjjDKMKIsTlI0ioeHFWlKQDMK41srSsx0mkbCcHvGHrkb01ghRalkq9 WftStiN/99HbYEqZ5GmSrCFAe2C5BoRag9aIzecmc/uhDLhrxmdgSeMzC5pqJnTmCKaV BDiQ0aaPjfb1hhxgJztG0I8FHBqecJ7LoJhxfnEcuK9Wnqmdg5x+9sm1WVAIWbnwZu9H VrD6y7ZBKiMvS1SslUNMOr02MkX3KN3oS9AycPdR50TnO8dcu/BsTL5EpaR4s0wHIDrn MAUCZWsTACyLfoFW+bK5n96hZF1Zt8CZdE8cirVO+G0sZeNq1h42PdqWvscDNqv4lxvI UXkg== 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=WVtWwXDaCO/6mcuTEwiLsdw1QEMvzdcxXjfrEcjo1Ok=; b=Mg2rxEQAJ0HtBPUHx/5ps1FtuAEqGfCD8KjMoUy/S6RRyuNQyMayrbxwD8IUWzEWPf GSCcwdBi1aEOgeNvEFEdK/hzo1xKuDwtM2mGvZna+9eHqABqc/0qFMmu5QW0FmlaxLZ8 eR8ZSTwMQUSWWQf8cUtg1STQXUpQAqdb4Fo3he8pfmv3QFdAyxbkbw0B5UeM+B9Pkg6c nEqrz12B9ZLU0aCm3zXvfj+JLhsG1kwvlY78AClo7/3iSwm3PUDjzg+p4bwf7LG4XlzP tVfbn9JB6ltwwnnKu2zC+W4dlT5F1trYzfZpUY610eV7AE1TMJL2hhPpMRXIWo5S8jjn gv2A== 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 q5si1276442pff.398.2018.03.09.11.05.52; Fri, 09 Mar 2018 11:05:52 -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 C1CD3789A8; Fri, 9 Mar 2018 19:03:37 +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 0337078942 for ; Fri, 9 Mar 2018 19:03:24 +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:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652018" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:25 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:01 +0200 Message-Id: <20180309185614.31113-23-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 23/36] rpcbind: 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 --- .../pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch b/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch index 859e67bbe05..4c23ee01ca2 100644 --- a/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch +++ b/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch @@ -15,19 +15,16 @@ Signed-off-by: Jackie Huang src/pmap_svc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/pmap_svc.c b/src/pmap_svc.c -index e926cdc..26c31d0 100644 ---- a/src/pmap_svc.c -+++ b/src/pmap_svc.c -@@ -384,7 +384,7 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) +Index: rpcbind-0.2.4/src/pmap_svc.c +=================================================================== +--- rpcbind-0.2.4.orig/src/pmap_svc.c ++++ rpcbind-0.2.4/src/pmap_svc.c +@@ -384,7 +384,7 @@ pmapproc_dump(struct svc_req *rqstp /*__ } done: - if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) { + if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) { if (debugging) { - (void) xlog(LOG_DEBUG, "unable to free arguments\n"); + /*(void) xlog(LOG_DEBUG, "unable to free arguments\n");*/ if (doabort) { --- -2.7.4 - From patchwork Fri Mar 9 18:56:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131233 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344589lja; Fri, 9 Mar 2018 11:05:58 -0800 (PST) X-Google-Smtp-Source: AG47ELtCr408MXpF4ki/o8Viy54a42Bltm/i3S8rDl7wMxdVG5LDCInQQT1xQ3T2KoBzhGi9yJVh X-Received: by 2002:a17:902:5a0d:: with SMTP id q13-v6mr28657532pli.152.1520622358721; Fri, 09 Mar 2018 11:05:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622358; cv=none; d=google.com; s=arc-20160816; b=mSxhPavUVOp8OnEcSNdpkDVEs8cRjleTf7qDfZmVG1ZF6ZZBHxIsEaKsd4VdbcugNd BpC3glvknl+PJes+w3u33P0kZIy4m6a2oGal6dH/3HCOA0ORJ7rPt2SpDc1xeIyuUpu/ W5qCUZOQVQL59WvruSGA3ZjYkaT9tXrz9362hB9/44qpaV8t6BtUhdbvN3x6L6ItB+Cc JQuwZLATnbvaIhcmo4rlQFU/K3313mm06+X8Fst99vaW8aofSMRL1KEU7/i5t2+XEuCy lw3NgVL2KauqIdVcuJMQBjepmet1HygFKb7i24g7VyENeKkR/fjLGz7oTwFMykULpKa8 idEQ== 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=xZiG+cw4/WKc22Z0HoV2LnGJm//7MtZsfOM2vmrfcr8=; b=YpxdwS5Vq6wGzoZ8jDXUjRJDUvI8eJnPOC7YInzBOrtcHvSOaF4fZbC6h6RY7Fg7BP Yh4jvERNZD7vhtIAtk+D4MIuZN5iUgkklM4wvH7uxadi4Gurw+WEvOWd8eflAabTZ6pS 6m04+dcFWsVSbxkR97Epmn22c0ZPZCZaUJlnP/IIHnGNYjVZdUeGIB0OrhrEtH66npRo KZ1icsyLpvPYvj0EI1eqSfFDyqiRWJ9k4Iq/mSGgEwR7qlQcnpegIjaERP7kX+Mzdue8 gjwnzA7RhnqHCdSdHrDmTxyaoUqAkj6q4NBwkgMD6E5fZN5w5TGUssxpL+m7S/VUF+Ki VMBg== 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 a61-v6si1301829pla.271.2018.03.09.11.05.58; Fri, 09 Mar 2018 11:05:58 -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 C7546789D3; Fri, 9 Mar 2018 19:03:38 +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 542127898E for ; Fri, 9 Mar 2018 19:03:26 +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:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652022" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:26 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:02 +0200 Message-Id: <20180309185614.31113-24-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 24/36] sysstat: 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 --- .../0001-Include-needed-headers-explicitly.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch b/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch index 5fc26fbc270..1b63299aaea 100644 --- a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch +++ b/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch @@ -21,10 +21,10 @@ Upstream-Status: Pending sa_common.c | 1 + 3 files changed, 3 insertions(+) -Index: sysstat-11.5.7/common.c +Index: sysstat-11.7.1/common.c =================================================================== ---- sysstat-11.5.7.orig/common.c -+++ sysstat-11.5.7/common.c +--- sysstat-11.7.1.orig/common.c ++++ sysstat-11.7.1/common.c @@ -20,6 +20,7 @@ */ @@ -33,10 +33,10 @@ Index: sysstat-11.5.7/common.c #include #include #include -Index: sysstat-11.5.7/ioconf.c +Index: sysstat-11.7.1/ioconf.c =================================================================== ---- sysstat-11.5.7.orig/ioconf.c -+++ sysstat-11.5.7/ioconf.c +--- sysstat-11.7.1.orig/ioconf.c ++++ sysstat-11.7.1/ioconf.c @@ -27,6 +27,7 @@ #include #include @@ -45,10 +45,10 @@ Index: sysstat-11.5.7/ioconf.c #include "ioconf.h" #include "common.h" -Index: sysstat-11.5.7/sa_common.c +Index: sysstat-11.7.1/sa_common.c =================================================================== ---- sysstat-11.5.7.orig/sa_common.c -+++ sysstat-11.5.7/sa_common.c +--- sysstat-11.7.1.orig/sa_common.c ++++ sysstat-11.7.1/sa_common.c @@ -20,6 +20,7 @@ */ @@ -56,4 +56,4 @@ Index: sysstat-11.5.7/sa_common.c +#include #include #include - #include + #include From patchwork Fri Mar 9 18:56:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131234 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344746lja; Fri, 9 Mar 2018 11:06:06 -0800 (PST) X-Google-Smtp-Source: AG47ELvHCLxVNDOebYDimXdW1RQIMCNfwRIiajTfREk99tVEZ/bS9smE2P0KRRJVLfkJnfgHqkla X-Received: by 10.99.102.5 with SMTP id a5mr25178969pgc.452.1520622366294; Fri, 09 Mar 2018 11:06:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622366; cv=none; d=google.com; s=arc-20160816; b=LbSGf7R+S9NbplDS0cYx8pZkX6aBUXGhg+AAxfQd5/fVZ+CJle7g/dXKI2atXlHlxc CpA6TGJ83mA1L8PAumkOX/m/NDsPnwc+UEv960myY5tkSpR4QBG7eStct+f+EoFJIGTa EEiRV5RNH8tbUOvfmKDa5ITwlBr31Os+o7A0m4i17mxJnrzXydeFr0EW/YGblE96oJ5G tjjOcV4LCXMHB/me9jCTpinuIp4EOrznpmSoua4jXP4Y+xbfV8XP8IuADF2MtLQE1Hlo XNsAM2O6z3+IhQOO8nXQ7aQyXKnnEt6DNpnukqTXrYQDxWM7/Vs/r6My7iPXCXJfRkTH X6+Q== 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=jXMELURYL7jsnVB+aepK62La97wfm6lZeG8d/iRAIec=; b=MaijkfKE3YGAjvBks0uL5zSuEQAcbt80V3mliCPeTDmlB624qDA5QO3e/GGhkVf9wB 2UwSL4tAwog/9aEtRxkVQgixnhRpXBHx2vlg1ECfJc2hzdj2zcN4At4a73LQkUe7y8aQ FXslX8FHnZuRiGw3qvQ51F/ewaLrmur8n46yvY07qNZP8v6mlbcRwB7kZlsjiyvOWBqp Ub2o4MUDoBbWWIwnNQEjNlTB0sm9edvMDajQ5qdqZsKCyC6BYGmR/B2Top0ZWhGeG4ZS vvM/fwdObfb+KmuppSycFAq5jTg741EamJrAyPHQpO9SoXbcdFYgj4rMhGDNwZFAStFb kWTA== 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 r12-v6si1363074plj.290.2018.03.09.11.06.06; Fri, 09 Mar 2018 11:06:06 -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 0D81878980; Fri, 9 Mar 2018 19:03:40 +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 A568778989 for ; Fri, 9 Mar 2018 19:03:27 +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:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652025" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:28 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:03 +0200 Message-Id: <20180309185614.31113-25-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 25/36] gnome: 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 --- .../0001-Don-t-use-AC_CANONICAL_HOST.patch | 13 +++++-------- 1 file changed, 5 insertions(+), 8 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-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index c0f2758da03..96ec96bdb2b 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -13,18 +13,15 @@ Signed-off-by: Jussi Kukkonen configure.ac | 1 - 1 file changed, 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index b20eb1a..50c5fd6 100644 ---- a/configure.ac -+++ b/configure.ac +Index: adwaita-icon-theme-3.26.1/configure.ac +=================================================================== +--- adwaita-icon-theme-3.26.1.orig/configure.ac ++++ adwaita-icon-theme-3.26.1/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [3.26.0], + AC_INIT([adwaita-icon-theme], [3.26.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([index.theme.in]) --- -2.14.1 - From patchwork Fri Mar 9 18:56:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131235 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344860lja; Fri, 9 Mar 2018 11:06:13 -0800 (PST) X-Google-Smtp-Source: AG47ELv8h1Y2T1LAR7a6Lptrc9SMEmfKv5F1MtyD6xrPXdd5lu89lTX4f4K36HUeDJoc6eAJslpJ X-Received: by 2002:a17:902:4545:: with SMTP id m63-v6mr28192250pld.15.1520622373030; Fri, 09 Mar 2018 11:06:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622373; cv=none; d=google.com; s=arc-20160816; b=m8pXa1HaK9Xe46k4kFr8Lt7Na02P0ejolNHug4vuSGoXUmvlCUr+CMzK382Ix0SGPD Ai/2WdLBGy6UOLKUHYiTHkx+DZO+O5AgwLfL+ZK32k5YFQjY3B1szjIo35PhuTzv0Zuz cpyaAjL76CiNvDT0SF+7GTICZbg9OpThFPyqbb6fmTxZerSrNZvcnnRO2HAL5EAsbxyo MYd+B+ciTwrtH27NZib2NKHqJoABHlO4/F00NNyCiGsx5xhcjqfcrU35LDIFVzSse7bs 09w4GjvgL1Fxo5j4YYN6xoClxr0Laro7W+p+6fwgj79hDs+fyMdYdhxCpjsIBf+3Ta7v TKyA== 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=lZ87aJHiDX8Hktt/cNIujCiJWhSNVYwWe0MiqMMGryA=; b=kGxYi10TgdlAYi4mkZZv0mLCCWSTYoFYQnHOYYyOyAv9U/N5Z+0CPKJ8jIbirxH5iW Wb5RPpbUBg7LNVGHibIVoh6FuePq47rxuMsG6SNatVxkTCl1y9+o1LVzaN8cm/dl3Iss TJZGXcrOqx/+Vo5WuP6X+ZsM7BgrrkScX2jEPvwsQvSQTbo+eNzyJMDvlF5aa2eIW49d TSB3j5gcBBWAOBV0GgkC68tadJltL8dSp2NyAneNEShW4wqV6o7FZIpnO92LFENLqr+e eImyAFy/iO8fuQ7gkKfPkFV7VL8eLTPC4WSuutOEaUEw7oal8HjPh7+Hqd8dPTx3V+5k F/9g== 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 q126si1318935pfc.43.2018.03.09.11.06.12; Fri, 09 Mar 2018 11:06:13 -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 202C7789E2; Fri, 9 Mar 2018 19:03:41 +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 04A577892C for ; Fri, 9 Mar 2018 19:03:28 +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:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652031" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:29 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:04 +0200 Message-Id: <20180309185614.31113-26-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 26/36] gtk-doc: 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 --- .../gtk-doc/files/pkg-config-native.patch | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch index bf03c8f6134..bfbc777ff87 100644 --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch @@ -10,19 +10,20 @@ Signed-off-by: Ross Burton gtk-doc.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/gtk-doc.m4 b/gtk-doc.m4 -index 3675543..2590e2a 100644 ---- a/gtk-doc.m4 -+++ b/gtk-doc.m4 -@@ -1,6 +1,6 @@ - dnl -*- mode: autoconf -*- +Index: gtk-doc-1.27/gtk-doc.m4 +=================================================================== +--- gtk-doc-1.27.orig/gtk-doc.m4 ++++ gtk-doc-1.27/gtk-doc.m4 +@@ -25,7 +25,7 @@ + # Macro appear in them. The GNU General Public License (GPL) does govern + # all other use of the material that constitutes the Autoconf Macro. -# serial 2 +# serial 2.1 dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -@@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], +@@ -35,11 +35,16 @@ AC_DEFUN([GTK_DOC_CHECK], AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first @@ -39,6 +40,3 @@ index 3675543..2590e2a 100644 if test "$have_gtk_doc" = "no"; then AC_MSG_WARN([ You will not be able to create source packages with 'make dist' --- -2.15.1 - From patchwork Fri Mar 9 18:56:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131236 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344939lja; Fri, 9 Mar 2018 11:06:19 -0800 (PST) X-Google-Smtp-Source: AG47ELuQWwwgEEUFJ7m3vwfZ9Dsd8+J+xM1dWso/e8UEFrPdyaeae3UPzdQxagUCRmtr5szhxzV/ X-Received: by 2002:a17:902:538f:: with SMTP id c15-v6mr27891623pli.90.1520622379162; Fri, 09 Mar 2018 11:06:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622379; cv=none; d=google.com; s=arc-20160816; b=nJNp4KZEp5m/+DcVGcXdoMarDMYh5hobezD29n1T7hPWkYKKsXtoRIcvquSJdpAIDU z+2r3NvM8SxBhYqdAmYlE2bbWIlOI28QttIG7Msr2B3wCYw+rU7jKGnZa4JSAWWXcyRA fSAuikix1ZoS6jUw9JcPGA28qAVSa4tG7h7Q2FRhsh3+XZ7NCbyBwxRl26qienKSRaNf gsx4aRsPWqFWB1ooy6UcHF5gHFJ0MLnl9SAN33CX/wSWIQN+kclJ+C4An4pZ0VVpBnp5 9hIWCf4zSeM3TFcXwvWt/KNP8t5C91XjrElDkyOzm9eWM4utj91Ag8gHztv4zKlKeeGx BtLQ== 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=o9JeNJ9KtVy96L2117MkwUNxWL0JcWB4IBnvZU2juoQ=; b=vJtVnsdBylIxXQi438IVAyhHukr+08dhIbVxOBEtMq8eM/gt0ERpsyrPw+szKisH8H AbLtLQ/5XRojI8kdRjtNGLRA+FhGZKtL4Afr6ckwP6e2kxHNWu+XReXXoIbQfiupqT2u rvQytaTZgZYXIqrmnZu/68DZIMWLproxCYxde/vu8KsXTqaUDAEXG0t5s/0RUuZaKltg aY6L+NZUTh2rvYqIVzKvRkBwV087ml1ZQpl1nHlUm/suwtgykSJsxki9SgmznNZFTpRk 053ExWmF0kV20bs8+4NrnibVTcuUdA6E5ulDkHcW7ECYHWb5bSUfJ85kf5Tqe3e8/S9u Cmdg== 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 w9si1088080pgq.815.2018.03.09.11.06.18; Fri, 09 Mar 2018 11:06:19 -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 314B6789ED; Fri, 9 Mar 2018 19:03:42 +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 5316A78993 for ; Fri, 9 Mar 2018 19:03:30 +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:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652038" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:30 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:05 +0200 Message-Id: <20180309185614.31113-27-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 27/36] drm: 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 --- ...ac-Allow-explicit-enabling-of-cunit-tests.patch | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 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/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch index bf526370b0c..40bebc0f50c 100644 --- a/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch +++ b/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch @@ -12,11 +12,11 @@ Upstream-Status: Submitted [mailing list] configure.ac | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index e3048c7..918d21d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,6 +137,12 @@ AC_ARG_ENABLE(install-test-programs, +Index: libdrm-2.4.91/configure.ac +=================================================================== +--- libdrm-2.4.91.orig/configure.ac ++++ libdrm-2.4.91/configure.ac +@@ -163,6 +163,12 @@ AC_ARG_ENABLE(install-test-programs, [Install test programs (default: no)]), [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no]) @@ -29,8 +29,8 @@ index e3048c7..918d21d 100644 dnl =========================================================================== dnl check compiler flags AC_DEFUN([LIBDRM_CC_TRY_FLAG], [ -@@ -372,7 +378,7 @@ if test "x$RADEON" = xyes; then - AC_DEFINE(HAVE_RADEON, 1, [Have radeon support]) +@@ -411,7 +417,7 @@ else + AC_DEFINE(HAVE_RADEON, 0) fi -if test "x$AMDGPU" != xno; then @@ -38,8 +38,8 @@ index e3048c7..918d21d 100644 # Detect cunit library PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We -@@ -399,7 +406,11 @@ if test "x$AMDGPU" = xyes; then - AC_DEFINE(HAVE_CUNIT, [test "x$have_cunit" != "xno"], [Enable CUNIT Have amdgpu support]) +@@ -436,7 +442,11 @@ if test "x$AMDGPU" = xyes; then + AC_DEFINE(HAVE_AMDGPU, 1, [Have amdgpu support]) if test "x$have_cunit" = "xno"; then - AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) @@ -49,8 +49,5 @@ index e3048c7..918d21d 100644 + AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) + fi fi - fi - --- -2.1.4 - + else + AC_DEFINE(HAVE_AMDGPU, 0) From patchwork Fri Mar 9 18:56:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131237 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345030lja; Fri, 9 Mar 2018 11:06:26 -0800 (PST) X-Google-Smtp-Source: AG47ELuU1Fo3IRzPTCGe8U4KPfuL+pt1II8+5W2graDIzZYG7M2MrXdOVx6JndgExT+gL3y3zvK+ X-Received: by 2002:a17:902:4222:: with SMTP id g31-v6mr28158471pld.335.1520622385938; Fri, 09 Mar 2018 11:06:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622385; cv=none; d=google.com; s=arc-20160816; b=KlHbfDetUocxt4KuwKNm0pOgrRis8i+ZdIFZCABLP8xjk7LFqOXmSEZyXzXJdj+mUi hFv3+d5zW/plD7mWNzH8qiTTZZevNfgKz2QOqUUmw4T9bYOwSDqV/HBJnftCZuPxOe/q cfJPj+Wk/+k3LpgM8mf1kPg2bvKQ/7bc248tlMFypQO/hHISRSbTxYdVt1KaBKC4W/Gn Pv8SGMZutwNwxZ+2Dedfdpjb/pxuiF8q7wlXdBh5cORCpLpg0gcdLttLhuG03TUCxHqo b4Z4PbD4mdz/ivRXt5fl+F9voXW2G+jge7lQKuk+5BsFAk3yS9haYIi+dVUCijhLbGEO eUtw== 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=BkoYL/gLo88mO1uIDFRs3HWSKxqY8nhEpytSe5DwZe0=; b=nM9w0kafq3plqhzBUIYO8Vg62d0/NLRbkIfXls2w+7dxx+4/QbpWQhvxBU/zH+qItd rOQpKwmB0bCaZSff6KcSdsgMfklKj1P1YCwRh5nL6PG2BhVrJkpQkpjSlRA9+C0VpANu +Mx7Rx/5K2bNLonTkxXIcjgrl9rYDBZ/AyYqD9kOjvLvmces9ZIWZuqbZC26rdIQ1MEI 9oARRMvQyms94YsXL4o6pWd0veSuTiRifwApSO5rgdc3DyxOvlwuiboogMH3sFYgkDlF QV+Gkja91PNkjRPsAriwlawHGDhmM7nGO+tHqod8o4AiLn00YNS4o3BTApAkM2qg1B0T 8TfA== 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 r59-v6si1325324plb.69.2018.03.09.11.06.25; Fri, 09 Mar 2018 11:06:25 -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 3D3CE789CC; Fri, 9 Mar 2018 19:03:43 +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 A47B2789AE for ; Fri, 9 Mar 2018 19:03:31 +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:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652044" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:32 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:06 +0200 Message-Id: <20180309185614.31113-28-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 28/36] mesa: 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 --- ....vulkan.am-explictly-add-lib-expat-to-intel-.patch | 13 +++++-------- .../files/0001-Use-wayland-scanner-in-the-path.patch | 19 ++++++++----------- 2 files changed, 13 insertions(+), 19 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/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch index ff8eda458c2..f908d46550e 100644 --- a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch +++ b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch @@ -28,10 +28,10 @@ Signed-off-by: Hongxu Jia src/intel/Makefile.vulkan.am | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am -index 271b0a5..8fbe2c8 100644 ---- a/src/intel/Makefile.vulkan.am -+++ b/src/intel/Makefile.vulkan.am +Index: mesa-17.3.6/src/intel/Makefile.vulkan.am +=================================================================== +--- mesa-17.3.6.orig/src/intel/Makefile.vulkan.am ++++ mesa-17.3.6/src/intel/Makefile.vulkan.am @@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \ $(LIBDRM_LIBS) \ $(PTHREAD_LIBS) \ @@ -39,7 +39,4 @@ index 271b0a5..8fbe2c8 100644 + $(EXPAT_LIBS) \ -lm - if HAVE_PLATFORM_X11 --- -2.7.4 - + if HAVE_PLATFORM_ANDROID diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch index eb6ff4ff044..2444b2846b0 100644 --- a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 2c7e636fac..d2b2350739 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2174,12 +2174,7 @@ if test "x$with_platforms" != xauto; then - with_egl_platforms=$with_platforms +Index: mesa-17.3.6/configure.ac +=================================================================== +--- mesa-17.3.6.orig/configure.ac ++++ mesa-17.3.6/configure.ac +@@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then + with_platforms=$with_egl_platforms fi -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], @@ -30,8 +30,5 @@ index 2c7e636fac..d2b2350739 100644 -fi +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - # Do per-EGL platform setups and checks - egl_platforms=`IFS=', '; echo $with_egl_platforms` --- -2.13.0 - + PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) + if test "x$have_wayland_protocols" = xyes; then 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) + From patchwork Fri Mar 9 18:56:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131239 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345357lja; Fri, 9 Mar 2018 11:06:45 -0800 (PST) X-Google-Smtp-Source: AG47ELsdFvleHtgS2usygTQB8RnA4pcHmyT1irNwYe9hKCqC5ciH6oX2H7VDhBGoktm3qpOn2HfY X-Received: by 10.99.55.11 with SMTP id e11mr25178756pga.237.1520622405284; Fri, 09 Mar 2018 11:06:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622405; cv=none; d=google.com; s=arc-20160816; b=LTwNsROUZHL1qSeo/J6XWE5VcBDxPD/e3HI8d8NDJUA8eQ+mzLNYyb0JueYw0e/njt gFCGig4ayx/57THtasKHtrcPUC1JpJO9UWo4qLrsopEgton8cfmCpuY6PvxUsPITbk52 GKgDa6RieqbEulNRxCUlOtyLw6ySWgqdc4WQXYwDqi/ozlqtnyE2X37Kkfz0ShFX3Vde VNaUcbd9ShWPRDt+N+AckQZ/hEqh5g/mi5g9fhux0RMbVFBtuD7wMpjvO+bz3rPw+A0R wsLIN7NaunVZ+1OM7taZpoCigVTJjuVIp1QebQWHwyKiRx+NvYBMXw2IBxA832nEJJNj r9rQ== 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=JZ0TQ6HNpMmmTbu0EeZ8uDmTpbRItM7jr+r9egwGj3Q=; b=BE4zcycFTEBF0pBVbliPRGRmzEvXDotUcH8TeHNKG1Ggjmtg0rKjMd2QnM9Sb4Ln4r DRaz3HXT3BMXWOETdw76ZesbJC1ATKb4Y+KeikK8U7/oocqQ3XnCJqX1U2D0ytOfFc7O v8IaFQ/IpxLcGyWaO1LvwkNDHvxah0ikN4oBBozzahq7J9wfuRNQtHDtpNeK9B6fUU+h qDybzgT/0dd9nXb/8hCmSr9nVmFaMk5lpMXiz4/VQY+jCz/n7Jo2w3a1bZr1Qs2W53qA PKUEpcdLfXMrK7Z9+ihuJB0RHb7XKuqlvM8Ke3LImRDt554JbU0eP2ZLrlXevunvxIjr dcCQ== 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 q7si1123525pgc.69.2018.03.09.11.06.45; Fri, 09 Mar 2018 11:06:45 -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 5B7B7789FF; Fri, 9 Mar 2018 19:03:46 +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 7464A789A0 for ; Fri, 9 Mar 2018 19:03:35 +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:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652058" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:36 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:09 +0200 Message-Id: <20180309185614.31113-31-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 31/36] blktrace: 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 --- meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 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-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch index 29eb0f2728a..ab905cf0da3 100644 --- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch @@ -10,6 +10,8 @@ aed463414e2e2bf8ca44ba54ee5973e7ed599e57 Signed-off-by: Fahad Usman +Index: git/Makefile +=================================================================== --- git.orig/Makefile +++ git/Makefile @@ -1,5 +1,6 @@ @@ -19,7 +21,7 @@ Signed-off-by: Fahad Usman ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon LIBS = -lpthread -@@ -23,19 +24,19 @@ btreplay/btreplay: +@@ -26,19 +27,19 @@ btreplay/btreplay: $(CC) -o $*.o -c $(ALL_CFLAGS) $< blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o @@ -44,6 +46,8 @@ Signed-off-by: Fahad Usman $(PROGS): | depend +Index: git/btreplay/Makefile +=================================================================== --- git.orig/btreplay/Makefile +++ git/btreplay/Makefile @@ -7,6 +7,7 @@ @@ -55,8 +59,8 @@ Signed-off-by: Fahad Usman OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 @@ -32,10 +33,10 @@ clean: docsclean - $(CC) $(CFLAGS) -c -o $*.o $< - + $(CC) $(CFLAGS) -c -o $*.o $< + btrecord: btrecord.o - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) @@ -67,6 +71,8 @@ Signed-off-by: Fahad Usman depend: @$(CC) -MM $(CFLAGS) *.c 1> .depend +Index: git/btt/Makefile +=================================================================== --- git.orig/btt/Makefile +++ git/btt/Makefile @@ -7,6 +7,7 @@ @@ -86,10 +92,12 @@ Signed-off-by: Fahad Usman ifneq ($(wildcard .depend),) include .depend +Index: git/iowatcher/Makefile +=================================================================== --- git.orig/iowatcher/Makefile +++ git/iowatcher/Makefile @@ -1,5 +1,6 @@ - C = gcc + CC = gcc CFLAGS = -Wall -O2 -g -W -Wunused-result +LDFLAGS = ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 From patchwork Fri Mar 9 18:56:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131240 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345467lja; Fri, 9 Mar 2018 11:06:51 -0800 (PST) X-Google-Smtp-Source: AG47ELu8H8Gy+a7j6+CqYumpGu8bLGcz32LIm+NvFbN1r807J1vT80J/enMHzch/yEE1eAQI+Cay X-Received: by 2002:a17:902:20e5:: with SMTP id v34-v6mr28145223plg.66.1520622411664; Fri, 09 Mar 2018 11:06:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622411; cv=none; d=google.com; s=arc-20160816; b=LRv0gPztEdfjgSG9szcXuU5C1kSEpYPl5dT8kov/vUrRjYJd0AL5aRJMmLYjOoXdzp Ik+qTVOlCcgFUjO2Qb+d/xkXZ6YBMJl1MVL4LL5+MxobmKkrzg6BQn1N/dGuBc5qczXd qAO5z7XnXRaORmLzVhE24eXcnQ/aLunNtVsBr7FEkjY9lj2QJaqBoLm9F7h18qCbD7ZM Pu2XS6JOgErWvuOu9rYR6DJFMshHANyTnFw9KMiN9tYDlV2AUqgt8IBH+2S4Q9X3XST/ 7+LAdxK/PIWL0N1k3HNkazQmxSQCgkrSDKaU+UeuO6mfiveH4QypC5l1ivVEnYVvyrAb h3JA== 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=bgjSmd10p+gh/cUYiBK0kF3QfeE2kYtn9xp9SRlpbvs=; b=Q3clMVWqLpAx229AGrl5j4zGBUSE51wzB1ZNRKo7qnlP6q1+4/SGnKNJJJKEBCq9ac GnsqwAP1zJCu2S+b57VveSp++2j+KgyMD7+Ckv0/xGwpE2SQH/2BAScTha+wu99oPz8S Kqa6ZT0lhmT+Nybj4eeBnKYOkEbxgrMM7nvABV8O4rkeWLP17MfUn75cquI8riTa4ddQ pzB6+PG8sog3X5Vl8NiCb1dgkaEXxtZ4sD9BuFLLt4KnxVYAz0aHZ3Wh5N4aPhinYBuo DDUPMBUIceIKF996dCgHAzkK9h9vq0oTzMz66KhYz+WR3Vlgee0nnOnR4RqqlfNQrvWi sAtw== 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 z19si1099730pgc.353.2018.03.09.11.06.51; Fri, 09 Mar 2018 11:06:51 -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 837AF789F6; Fri, 9 Mar 2018 19:03:47 +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 BF1607897D for ; Fri, 9 Mar 2018 19:03:36 +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:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652062" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:37 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:10 +0200 Message-Id: <20180309185614.31113-32-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 32/36] cryptodev: 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 --- ...pile-and-install-rules-for-cryptodev-test.patch | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 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-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch index 3f0298b0b0a..84fd27e681c 100644 --- a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch +++ b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch @@ -14,37 +14,37 @@ Upstream-Status: Pending tests/Makefile | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) -diff --git a/Makefile b/Makefile -index 31c4b3f..2ecf2a9 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,6 +34,9 @@ modules_install: - @echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..." - @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -35,6 +35,9 @@ modules_install: + $(MAKE) $(KERNEL_MAKE_OPTS) modules_install + install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h +install_tests: + make -C tests install DESTDIR=$(PREFIX) + clean: - make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean + $(MAKE) $(KERNEL_MAKE_OPTS) clean rm -f $(hostprogs) *~ -@@ -42,6 +45,9 @@ clean: +@@ -43,6 +46,9 @@ clean: check: - CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) make -C tests check + CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests check +testprogs: + KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs + CPOPTS = - ifneq (${SHOW_TYPES},) + ifneq ($(SHOW_TYPES),) CPOPTS += --show-types -diff --git a/tests/Makefile b/tests/Makefile -index c9f04e8..cd202af 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -19,6 +19,12 @@ example-async-hmac-objs := async_hmac.o - example-async-speed-objs := async_speed.o - example-hashcrypt-speed-objs := hashcrypt_speed.c +Index: git/tests/Makefile +=================================================================== +--- git.orig/tests/Makefile ++++ git/tests/Makefile +@@ -23,6 +23,12 @@ bindir = $(execprefix)/bin + + all: $(hostprogs) +install: + install -d $(DESTDIR)/usr/bin/tests_cryptodev @@ -55,9 +55,9 @@ index c9f04e8..cd202af 100644 check: $(hostprogs) ./cipher ./hmac -@@ -28,6 +34,8 @@ check: $(hostprogs) - ./cipher-gcm - ./cipher-aead +@@ -38,6 +44,8 @@ install: + install -m 755 $$prog $(DESTDIR)/$(bindir); \ + done +testprogs: $(hostprogs) + From patchwork Fri Mar 9 18:56:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131241 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345584lja; Fri, 9 Mar 2018 11:06:59 -0800 (PST) X-Google-Smtp-Source: AG47ELsBitIX7X6qRkiTc6ru62KB9iIOIMcCzpXdYgsJBl+OK3+ZT0b4b2RpLvIbmeYc88KlCBqg X-Received: by 10.167.131.135 with SMTP id u7mr24574581pfm.50.1520622419331; Fri, 09 Mar 2018 11:06:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622419; cv=none; d=google.com; s=arc-20160816; b=EY2TqBz3vVPrbZUnj2MmsvwjDswyE81hcPbPKBxaK0gABcGSaZjAeMu5pRoSRKYsys iq6OM01RssLCRZXC4Rt6fPVumLYSVhzCxA+VyOlw3hBmpV6qirosiTLOjwp/Bsr8SHfm XeabXTwsvRkgOQHEOVorSlXWBm6WugMbMCKedg4If4HQ8OeKC62cLwuWbvs6sj9ymQO2 L2/xMVvVISSrCxV/1X0DpIxSeFDJlYcIAp2/IWJp8eugFSgIWCKmbX/DB/neuic5imQu g9QwVKWS7eCIckOp1fgzvePhsuw4DcLczZV4nscdWtj7IkZ6W2nfruq7tEjdXSUtcfiB TeQQ== 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=+gL9aqdZeNjEb8rVlDsNfhlJwboe7aXzVYsfxB22ynM=; b=OVXtXz6K99nmPAHdX9S+AeDmD5saSE4FPLcWPXWfOnJdz9D5Ja4We9hdtByO1WPZf2 xbmxaF3gAUgniUoSzy7T1yP6QA1rykHvqR6PUi9d9zXfHPGNfbwimZDYS43kpcUpa/q8 rhrr/tse6j5ig3sq0C0gyCrpfMixdddIjpV2geVQPxBAOJhLd7J2U9sHsH0Ah7DdqR+U ARhR85KjloOVWPfeHXF02eOKTXFB24m2YARXDY7yowJEm/HHnFuYPoYS/lO/U/fVQtBH q5Wep8vCKUXQm3nI75ReMiK2nti9XxDUajvpXsWgIdcOTo/2XwAZQf6XRO2Xi1RjTBfE VS2w== 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 l29-v6si1399889pli.25.2018.03.09.11.06.58; Fri, 09 Mar 2018 11:06:59 -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 C71FC78A07; Fri, 9 Mar 2018 19:03:48 +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 20EAA7899A for ; Fri, 9 Mar 2018 19:03:38 +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:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652067" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:38 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:11 +0200 Message-Id: <20180309185614.31113-33-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 33/36] libtiff: 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 --- meta/recipes-multimedia/libtiff/files/libtool2.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 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-multimedia/libtiff/files/libtool2.patch b/meta/recipes-multimedia/libtiff/files/libtool2.patch index 4798e470719..a84c6889627 100644 --- a/meta/recipes-multimedia/libtiff/files/libtool2.patch +++ b/meta/recipes-multimedia/libtiff/files/libtool2.patch @@ -4,13 +4,13 @@ Upstream-Status: Inappropriate [configuration] configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: tiff-4.0.8/configure.ac +Index: tiff-4.0.9/configure.ac =================================================================== ---- tiff-4.0.8.orig/configure.ac -+++ tiff-4.0.8/configure.ac +--- tiff-4.0.9.orig/configure.ac ++++ tiff-4.0.9/configure.ac @@ -27,7 +27,7 @@ dnl Process this file with autoconf to p AC_PREREQ(2.64) - AC_INIT([LibTIFF Software],[4.0.8],[tiff@lists.maptools.org],[tiff]) + AC_INIT([LibTIFF Software],[4.0.9],[tiff@lists.maptools.org],[tiff]) AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR(m4) +dnl AC_CONFIG_MACRO_DIR(m4) From patchwork Fri Mar 9 18:56:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131242 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345696lja; Fri, 9 Mar 2018 11:07:06 -0800 (PST) X-Google-Smtp-Source: AG47ELs5Fo7J4a6IcAhsbTj8/lKwLaa3tTe4q/MZm8BEq4uRwCnH+X7ZGn0ZZdX35o3rS43TmV6F X-Received: by 10.98.192.203 with SMTP id g72mr31303319pfk.27.1520622426331; Fri, 09 Mar 2018 11:07:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622426; cv=none; d=google.com; s=arc-20160816; b=fOczs+c3JsCxpYpb/zYmlIw2ifEFAypq1Zv+0ar+TWBpzKjVd5x3CRZiuRauwY3BT9 eCubLM98YQwcV9g+GsHtDZXzSSGEQs4O0Ar9rt/cdpePn3XsNcZ6buMN+Fiqj84XbIhI Wuz8aII7nSFW77heRBqgdGmtd9hfgmNnKtbBLV5cr/CAmrZ9tIOSX1b+2TUkAEhx6TmT MC+aGPHi3EuzYMfe723UYhXUbk26rAAPvvqM+RQPdke9iOZxrQbkOBzD7uysVSSjadk4 ChwOZlf2ZUs1zxnFC67kUekR6XMLDrJHQyx7vuzgjmQQFRrd9HLP1xVm0syoHB4mECWs j08g== 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=e99eeTP7s9OYXx26NOsY4lWWy5jKIKLwcT5vQsDb6zw=; b=SzAiGTRE/5zpYptham3t4k8RKB7mfmlhGvoLED0eSQ88yon6cjEScU9a4hH8E9QEic 2fc6FhyolX3FP3Qi0Y709eWf1oU95gYl9AxdezJFu/J4zMF0XjoTAVf5YBkhrEtDZvgD P2LIfAVxgQAT70Rnd5pGtYBGmzrLclQls1kbHeCAZLWgAd3XBMsyAvc4bdAJLTHNn8Oc DUS9jKAvLAqxWekjmqoIOaYHXURE97FJeDhtPOqMRD+30LIl29LUjr4ACN7hwWKBp70i ueX+3S83YQgNssWEnc3j/dEbIAQ2pW4UeHFdqMEwmrXi0/b/fEi5a6EGHxV/O1x7JIFa Skbw== 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 e6si1092378pgt.680.2018.03.09.11.07.06; Fri, 09 Mar 2018 11:07:06 -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 CFAC478A02; Fri, 9 Mar 2018 19:03:49 +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 7310578933 for ; Fri, 9 Mar 2018 19:03:39 +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:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652072" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:40 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:12 +0200 Message-Id: <20180309185614.31113-34-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 34/36] libunwind: 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 --- ...Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 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-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch index 0dff2c86dcd..c8faca47244 100644 --- a/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch +++ b/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch @@ -28,10 +28,10 @@ https://raw.githubusercontent.com/rdnetto/teapot-buildroot/master/package/libunw include/libunwind_i.h | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) -diff --git a/acinclude.m4 b/acinclude.m4 -index 497f7c2..9c15af1 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 +Index: libunwind-1.2.1/acinclude.m4 +=================================================================== +--- libunwind-1.2.1.orig/acinclude.m4 ++++ libunwind-1.2.1/acinclude.m4 @@ -22,11 +22,5 @@ fi]) AC_DEFUN([CHECK_ATOMIC_OPS], [dnl Check whether the system has the atomic_ops package installed. @@ -45,18 +45,15 @@ index 497f7c2..9c15af1 100644 -# AC_CHECK_LIB(atomic_ops, main) + AC_CHECK_LIB(atomic_ops, main) ]) -diff --git a/include/libunwind_i.h b/include/libunwind_i.h -index 23f615e..deabdfd 100644 ---- a/include/libunwind_i.h -+++ b/include/libunwind_i.h -@@ -95,6 +95,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) +Index: libunwind-1.2.1/include/libunwind_i.h +=================================================================== +--- libunwind-1.2.1.orig/include/libunwind_i.h ++++ libunwind-1.2.1/include/libunwind_i.h +@@ -116,6 +116,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE + (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) #ifdef HAVE_ATOMIC_OPS_H +# define AO_REQUIRE_CAS # include static inline int cmpxchg_ptr (void *addr, void *old, void *new) --- -1.9.2 - From patchwork Fri Mar 9 18:56:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131243 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345800lja; Fri, 9 Mar 2018 11:07:14 -0800 (PST) X-Google-Smtp-Source: AG47ELvOUrYTAvlMRysg6BtMslO9E1t7zLjDOMcj0nYUVw6A7CE5HPLD0WfVnbmIKk1zxihI2Gco X-Received: by 10.99.103.195 with SMTP id b186mr25026249pgc.446.1520622433935; Fri, 09 Mar 2018 11:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622433; cv=none; d=google.com; s=arc-20160816; b=0FSrWWk0BG+enbUvb1vPClIMpEFB7IUnMmS16L1aNUaM9fOtSfLtSTHkr2HRK45VDi 1Jfb/+ZQOgHm7ACEHCTqWL3QgwnRXTbn4khAROhhc5koKNoXd3N0T3NkG3XjpTf52/Mm j4uIIJmmzVWoOmDbmqUc4jq304AGh95SYJsAmFgowKLLlSHRz8O9YntqvyeSGs3m2I3u xkGxBmCkyW8ubLKt+lhpdPj+TsiDbM1vzW7Bh5OriF6ppqsOu2+8ok90KMwbE+afUoy9 Th3yO9qW2Xr+LAX8cl501tC31ow1z6++JyPTWO2V+FAOqTZaV+SeMOI0YJTpq/d2B5Fk 4P7g== 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=pR5hK0z9DFE48s1/xrtTEtPgFA1zk8raJvDpfXzwUNk=; b=Fflzq6JtXCK3sSlaAoOUVXEYDWv1Fwg0FmAQH3RlEL4J/srEToXSR+aFxbAUaf1i61 cp1fwEi/xUkgRZuVdANAk2bvV8lzmLD5Vwk+TcLgOIuwms5w73SQQcrRt1w6TcygRWWp u8mLtXV9l/0abOwluA72EP4k+0Qzj/TAc2BvCBVzC1DPKA258kJYm2DwsTuW5H6lBJPF z7Yqc5Tov0ueqJuzJzVhRlX9OXxFdJxqvzwvBuHmvxuFTuYlMr5CD3HrSNpMp3gTVwo4 wf61FjoJvcA7egqD9Q2WRgWYm08NiD6wDuXkmMlDZ0+aB/AwMzk96OC1zPVupe396MpR iIYg== 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 e4si1097692pgv.581.2018.03.09.11.07.13; Fri, 09 Mar 2018 11:07:13 -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 0230178A0D; Fri, 9 Mar 2018 19:03:51 +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 09349789C5 for ; Fri, 9 Mar 2018 19:03:41 +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:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652079" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:41 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:13 +0200 Message-Id: <20180309185614.31113-35-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 35/36] attr: 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 --- .../acl/test-fix-insufficient-quoting-of.patch | 52 +++++++++------------- 1 file changed, 22 insertions(+), 30 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-support/attr/acl/test-fix-insufficient-quoting-of.patch b/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch index 0b350be5634..f392465b58e 100644 --- a/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch +++ b/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch @@ -35,61 +35,56 @@ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63 Signed-off-by: Kamil Dudka Signed-off-by: He Zhe ---- - test/cp.test | 2 +- - test/misc.test | 6 +++--- - test/sbits-restore.test | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/test/cp.test b/test/cp.test -index 0867f63..a927195 100644 ---- a/test/cp.test -+++ b/test/cp.test -@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given. +Index: acl-2.2.52/test/cp.test +=================================================================== +--- acl-2.2.52.orig/test/cp.test ++++ acl-2.2.52/test/cp.test +@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if > -rw-rw-r--+ - + $ cp f g - $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g' + $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g' > -rw-r--r-- - + $ rm g -diff --git a/test/misc.test b/test/misc.test -index 6e98053..29372b7 100644 ---- a/test/misc.test -+++ b/test/misc.test +Index: acl-2.2.52/test/misc.test +=================================================================== +--- acl-2.2.52.orig/test/misc.test ++++ acl-2.2.52/test/misc.test @@ -254,7 +254,7 @@ Add some users and groups Symlink in directory with default ACL? - + $ ln -s d d/l - $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g' + $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g' > lrwxrwxrwx - + $ ls -dl -L d/l | awk '{print $1}' @@ -343,7 +343,7 @@ Remove the default ACL Reset to base entries - + $ setfacl -b d - $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' + $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' > drwxr-x--- - + $ getfacl --omit-header d @@ -355,7 +355,7 @@ Reset to base entries Now, chmod should change the group_obj entry - + $ chmod 775 d - $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' + $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' > drwxrwxr-x - + $ getfacl --omit-header d -diff --git a/test/sbits-restore.test b/test/sbits-restore.test -index de21340..5899b0a 100644 ---- a/test/sbits-restore.test -+++ b/test/sbits-restore.test -@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works +Index: acl-2.2.52/test/sbits-restore.test +=================================================================== +--- acl-2.2.52.orig/test/sbits-restore.test ++++ acl-2.2.52/test/sbits-restore.test +@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via - $ touch d/g $ touch d/u $ setfacl --restore d.acl @@ -103,6 +98,3 @@ index de21340..5899b0a 100644 + $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g' > -rw-r-Sr-- $ rm -Rf d --- -1.9.1 -