From patchwork Thu Mar 8 18:17:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131034 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50130lja; Thu, 8 Mar 2018 10:24:50 -0800 (PST) X-Google-Smtp-Source: AG47ELvPGUFAwaw6acl+xW3Ku0Eth2Mp/OsYfZN5B7oEJ2ytrVYkT30AAFmU6vsNRmUJkd+kINZu X-Received: by 10.99.120.13 with SMTP id t13mr22114918pgc.35.1520533490833; Thu, 08 Mar 2018 10:24:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533490; cv=none; d=google.com; s=arc-20160816; b=tWI1N2HwRMf2A1kkYrPX8vmM5HIQBu+jIbGNPnKALwLA0hDzJjVxSbEpVcQ+CXvQ7f Uc4ZoUPlXPVTq8LyxU65R7PXkh3BpJQ5q7Z0QZM/Le/tm/ys5EJpEJ7rbNREPE6MewWI psJU2N1Tlfj0fd/4MM6srsedeLztjhzr6UGBoYDl6kKe2kVFToEZGKVEWYDwMcaQfEGh qIYAH/L+DdR3WA8a8E8RIoU7gpJ2MLFqzxAyjjgCy+fFlb3Ud4+0RNNMCITO2moKuj5r 8kzkoqcN5uFRqN9qTkRTrrV3HgM5JtIuO2P1vTb0tMOEz/98bXnNFbisAWAnvLEVdygL zLfw== 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=jY/wJrafmBQFpVI0FSsdwNc/wieNNXE9vSb0te8ph+I=; b=YN3fL49+WwGZqVcKv9Oiy617tktBWwA2/2fDxyu0zZAmwrvItGXy523ZnJEQ4Dx4CF qD5j5PUHvH63F7IsCpi3PkL9OyBNlukMkwIBX1jXBzqI0to2sJNV+H1zp96Vq208mi25 YXpCbTLOZqlh58NYuCMvma0dUT3SplwdwRl1BgarsnNH5BF7jdfmc7Qt4Q/PMYy9DmOJ +QUjw28oLbuhe2osxydHZ7IPgwEiCI+INOppWDcRVCC13/vkgHIQF7sUIfp78E58I9Hy DGC45cbJG6/avATToApTvK1NeBgkX+OSpxym5RJRzMFlDfuwr238N7c+lVQ+u6DixEIH PFMQ== 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 x2-v6si15227988plo.479.2018.03.08.10.24.50; Thu, 08 Mar 2018 10:24:50 -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 46F2878971; Thu, 8 Mar 2018 18:24:45 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id B05927886F for ; Thu, 8 Mar 2018 18:24:43 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053613" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:43 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:23 +0200 Message-Id: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 Subject: [OE-core] [PATCH 01/42] expat: 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: Alexander Kanavin --- meta/recipes-core/expat/expat/autotools.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-core/expat/expat/autotools.patch b/meta/recipes-core/expat/expat/autotools.patch index 3d3c5bad9d6..104717eabb7 100644 --- a/meta/recipes-core/expat/expat/autotools.patch +++ b/meta/recipes-core/expat/expat/autotools.patch @@ -10,11 +10,12 @@ Updated to apply over expat 2.1.0 Signed-off-by: Marko Lindqvist -diff -Nurd expat-2.1.0/configure.in expat-2.1.0/configure.in ---- expat-2.1.0/configure.ac 2012-03-04 01:45:53.000000000 +0200 -+++ expat-2.1.0/configure.ac 2012-05-10 21:04:44.000000000 +0300 -@@ -51,8 +51,6 @@ - +Index: expat-2.2.5/configure.ac +=================================================================== +--- expat-2.2.5.orig/configure.ac ++++ expat-2.2.5/configure.ac +@@ -53,8 +53,6 @@ LIBAGE=6 # CMakeLists.txt! + CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H" AC_CONFIG_HEADER(expat_config.h) -sinclude(conftools/ac_c_bigendian_cross.m4) From patchwork Thu Mar 8 18:17:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131035 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50434lja; Thu, 8 Mar 2018 10:25:10 -0800 (PST) X-Google-Smtp-Source: AG47ELu/D8rX7hUeFXQJdIMLEGg7bbC1+HQHq8+VMOyyEuW9SGVcmzWQbqPeSq7zfWruolQWxOsT X-Received: by 2002:a17:902:e83:: with SMTP id 3-v6mr24726314plx.158.1520533510099; Thu, 08 Mar 2018 10:25:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533510; cv=none; d=google.com; s=arc-20160816; b=VZtOZreRUeAccJsrYBSSQJIJdOXPwrzL6ZDdXNISH/3GLDRFmcthN5P0IbajpA06ej eySTWy1d8GrwLgrHpKANF7oz7SSly5a2OTDM4n0c/3L7EGluckx0ErExnY3nD1ckvYJg UmOrLVuxvBx/KsRx5Y4ogZzlNAEFvhg/u/TxTnSYHy28af/91J/1CLKmPCH9n2DHg7M8 Ce0hFdUO/VHXC6JFn3Ix0ZhZbsoX4FIcyAq3sb6Hmiq0RRijC8cA1pCNlRKppiWK2F5I q4ofZE9Z6AE0pik2ktsoqRzQIFNqFs9TBoh69JJzs7nai1jyuNd2gE9Unmu+0o6FS8oc 6YMw== 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=F9J6rh7xYD8CUdc0XJ9eaBn5yxcwLS9jpSS8X65MXQ4=; b=UW6f4ZXHrDZBI/F3zSPw+l0/Zgoaqf04VHDIg32seFtXppZmEDXrJDoEBbQPlLdnu/ W9RLy0ZhWhK9aDrKjCA1M0lLdpZ3c+Xj+GiZvkW/+bHRYpbX3PQ1vV/CRaZAyzNl/UPM hY+PqTYijy+eCPF469YPtU3B/FTFFF+BlEBNJ0NHL1/kcPqVEfuddMAxgwWVYbmJWyTe WGtVGPBtrXTrX5ME9VbIaqR9e4R/vm0xDKZwdMPhXJilPNyEzbyCORrzr/ZW1nYAt7QX qX6e2OSjI3cYO5e4SFAsx6OQvaYd8u5FigHnhOBy2GVlTrHnuYm8p91t1nwlhStdZ1oS vhUw== 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 f30-v6si15279248plf.654.2018.03.08.10.25.09; Thu, 08 Mar 2018 10:25:09 -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 CDBC578991; Thu, 8 Mar 2018 18:25:06 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 679907886F for ; Thu, 8 Mar 2018 18:24:44 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053619" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:44 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:24 +0200 Message-Id: <20180308181804.31261-2-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 02/42] grub: 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 --- ...odule-explicitly-keeps-symbole-.module_license.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-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch index 935c472cf8f..ffc2d40d893 100644 --- a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch +++ b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch @@ -43,19 +43,16 @@ Signed-off-by: Hongxu Jia grub-core/genmod.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in -index 76df0bb..39a9cfc 100644 ---- a/grub-core/genmod.sh.in -+++ b/grub-core/genmod.sh.in -@@ -59,7 +59,7 @@ if test x@TARGET_APPLE_CC@ != x1; then +Index: grub-2.02/grub-core/genmod.sh.in +=================================================================== +--- grub-2.02.orig/grub-core/genmod.sh.in ++++ grub-2.02/grub-core/genmod.sh.in +@@ -56,7 +56,7 @@ if test x@TARGET_APPLE_LINKER@ != x1; th if test x@platform@ != xemu; then - @STRIP@ --strip-unneeded \ + @TARGET_STRIP@ --strip-unneeded \ -K grub_mod_init -K grub_mod_fini \ - -K _grub_mod_init -K _grub_mod_fini \ + -K _grub_mod_init -K _grub_mod_fini -K .module_license \ -R .note.gnu.gold-version -R .note.GNU-stack \ - -R .note -R .comment $tmpfile || exit 1 + -R .note -R .comment -R .ARM.exidx $tmpfile || exit 1 fi --- -2.8.1 - From patchwork Thu Mar 8 18:17:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131036 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50533lja; Thu, 8 Mar 2018 10:25:15 -0800 (PST) X-Google-Smtp-Source: AG47ELukLO0X7yzYdVb0raYao1L5F/dKhctMcyMp57XO/b36+ZVWJtS45PPIFSijsoVq7BbAaLr+ X-Received: by 10.101.66.193 with SMTP id l1mr21625688pgp.57.1520533515265; Thu, 08 Mar 2018 10:25:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533515; cv=none; d=google.com; s=arc-20160816; b=WMt/bd0rEt7uGSy4GJW/YU4h0jjW6xgPC/wl+5gFSIX8eQvVD0aa37Lzo0yEi/nYYn wKvvgIWj1c1/53uG0/eibG8dUY/rYNTTpRrI+nptWQWR9L/m5MRA7S+g2GdHtW9cIxIU u6DeTUBWlWqHmbuW5Cf+qmEwF24P/UNHM8e03MV6enzeu+OFYY1yAKwJl0B37Bfm5Xwp XiOXg3RzDIf5/xnnjgtFnswOWuPwtO45LjQThNZl2x/ry34s16DlA8Kclg8PpZKfywDR VM5q45Y+1nwL0zwGY/s4+Z2g8lNzYrgH6XIjIZ1E69/HxIFVPwHpf/qR6I34nYT7tm9h xB/g== 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=6YwmzB1zHjrkaD66IpPh0uWvrAfTsKYTFHcTnpfD/Is=; b=SfIXbBAecx84tsaEN1+MPts7cWkY4A8fFv110cSM6tioRI4Ltu0YtjjSY8RF4xouFp DCTy2vK8qE0waGQ9hs3+rla7bEOu4yGZPWH2viCuHGHT6A3Qz+Mlm8Sq84bWsH5x+DEU 5oNc4wyDW8jWVJySz5SVa32nIpMhgUc1yReP3Y+W4ohcg+EHL5K0gf9pvUZpAIB/kJ9S 8enVVBrE0GP+4Q2usV6w7uPKismBxrZHCT2+Jg7KgHoMjUiiMvBFQ5+zRdkB0KZfi5bM pDmtQTaxtsl8E4ai+outViVzTWAXfjQKOvhuKSLaKC/KYNhRB76oTFWqOqYl2DCs2o8P gGiw== 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 w62si13282660pgd.573.2018.03.08.10.25.14; Thu, 08 Mar 2018 10:25:15 -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 0FD1D78995; Thu, 8 Mar 2018 18:25:08 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id EE35F7886F for ; Thu, 8 Mar 2018 18:24:45 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053624" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:46 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:25 +0200 Message-Id: <20180308181804.31261-3-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 03/42] shared-mime-info: 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 --- .../shared-mime-info/install-data-hook.patch | 14 ++++++++------ .../shared-mime-info/shared-mime-info/parallelmake.patch | 12 ++++++------ 2 files changed, 14 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-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch index 3c9f1ea438c..262ff7562ce 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch @@ -8,16 +8,18 @@ Upstream-Status: Pending Signed-off-by: Joe Slater ---- a/Makefile.am -+++ b/Makefile.am -@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status - @INTLTOOL_XML_RULE@ - @INTLTOOL_DESKTOP_RULE@ +Index: shared-mime-info-1.9/Makefile.am +=================================================================== +--- shared-mime-info-1.9.orig/Makefile.am ++++ shared-mime-info-1.9/Makefile.am +@@ -50,7 +50,9 @@ else + update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" + endif -install-data-hook: install-binPROGRAMS +# do NOT make this dependent on anything! +# +install-data-hook: if ENABLE_UPDATE_MIMEDB - $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime" + $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" endif diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch index 84c4d03731b..fea34a55a25 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch @@ -11,17 +11,17 @@ RP 10/10/2011 Upstream-Status: Pending Signed-off-by: Constantin Musca -Index: shared-mime-info-1.0/Makefile.am +Index: shared-mime-info-1.9/Makefile.am =================================================================== ---- shared-mime-info-1.0.orig/Makefile.am -+++ shared-mime-info-1.0/Makefile.am +--- shared-mime-info-1.9.orig/Makefile.am ++++ shared-mime-info-1.9/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS=. po - AM_CPPFLAGS = $(ALL_CFLAGS) packagesdir = $(datadir)/mime/packages -@@ -72,8 +70,7 @@ uninstall-hook: +@@ -81,8 +79,7 @@ endif all: $(defaultmakedeps) @@ -29,5 +29,5 @@ Index: shared-mime-info-1.0/Makefile.am - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot +create-pot: po - check: create-pot freedesktop.org.xml update-mime-database check-translations - if test -e $(top_builddir)/freedesktop.org.xml; then \ + local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT) + if CROSS_COMPILING From patchwork Thu Mar 8 18:17:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131037 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50639lja; Thu, 8 Mar 2018 10:25:21 -0800 (PST) X-Google-Smtp-Source: AG47ELvJmNxGPKbOqdiMq9qaNDBrT3c2OjGEabAfqtbXtGC0cK7/yPLs9vvdv+80BWfBcMI3C2+T X-Received: by 2002:a17:902:900b:: with SMTP id a11-v6mr15811703plp.366.1520533521693; Thu, 08 Mar 2018 10:25:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533521; cv=none; d=google.com; s=arc-20160816; b=IZGuPO4JygbmFs1CqrY4Nvh7r0HaZ21Xo0mvUH1lmA+f3NoQ7SJVew8zwki/HrTrHb WLEBkp4TMdmDnri2SnZQ0/tX9UKVC/5ZH5/RQdbE3aElDq7gyYiVrEOd0ma46KkiV0BN +OjLJBzY+V6z5ateirtIO/irYxbD19SdWbM4s0JRfCUdzfiVRc/idiWHq9xNAVYOSSPp /wth7hmaDCLznvYE/xh4fLCsQsY8LykZCvSXQjHd67dsTQKJRSmjXuSIBnn5gme1aLoS un0CiRP762kCql7XTvx46w2V387uED91F2d8m3Wk0zWtLADkeLlgGJ/IZJICuxkVCgmo ehFA== 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=r+HIebDS/SDb/23G1fwB2Ldkb2s1jqduXVn6s/DQ7qc=; b=lf10JRIRsn0s/iaied4ulGxqdTZQ6oTnFpHYKggKu35Tutnnb/3hf9F48KF9JisKii fcDpvS5I0WiKqn173UCo3y4hC8iD2Ocv/aPY9uEGSKZUUwhZgWcsCdeGbUx1RhYwnRfT HN76IdSs4KNVvEmeB421Xvm0j6i8Afhe91sp/UhSMR9rsjxg1OIhVT7DH1ULUdiK7+se 5aA09Z2015ySTs+lTrenBYyjdtpBddPc/CzYuKOhQpDU8DRM+mFMixnDNMJmcHRKCrYE uMAM8etz+F0CJ2MRflZBq5dSfRRw+4/UHdDVLX9jDdPz/Wv/KgAY2kVZ1Hr9TAV1wBNe OdPw== 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 f22-v6si15833688pli.181.2018.03.08.10.25.21; Thu, 08 Mar 2018 10:25: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 25D617899D; Thu, 8 Mar 2018 18:25:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 8135A7886F for ; Thu, 8 Mar 2018 18:24:47 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053629" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:47 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:26 +0200 Message-Id: <20180308181804.31261-4-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 04/42] serf: 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-support/serf/serf/norpath.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-support/serf/serf/norpath.patch b/meta/recipes-support/serf/serf/norpath.patch index 380f5d00d2d..c392444f7b3 100644 --- a/meta/recipes-support/serf/serf/norpath.patch +++ b/meta/recipes-support/serf/serf/norpath.patch @@ -5,11 +5,11 @@ Upstream-Status: Inappropriate RP 2014/7/17 -Index: serf-1.3.6/SConstruct +Index: serf-1.3.9/SConstruct =================================================================== ---- serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +0000 -+++ serf-1.3.6/SConstruct 2014-07-17 20:04:21.784399616 +0000 -@@ -218,8 +218,7 @@ +--- serf-1.3.9.orig/SConstruct ++++ serf-1.3.9/SConstruct +@@ -224,8 +224,7 @@ if sys.platform != 'win32': else: LIBNAMESTATIC = 'serf-${MAJOR}' @@ -17,9 +17,9 @@ Index: serf-1.3.6/SConstruct - PDB='${TARGET.filebase}.pdb') +env.Append(PDB='${TARGET.filebase}.pdb') - #for i in env: - # print(str(env[i])) -@@ -371,12 +370,6 @@ + if sys.platform == 'darwin': + # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) +@@ -385,12 +384,6 @@ if gssapi and CALLOUT_OKAY: if sys.platform == 'win32': env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) @@ -32,8 +32,8 @@ Index: serf-1.3.6/SConstruct # Set up the construction of serf-*.pc pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), env.File('build/serf.pc.in'), -@@ -446,7 +439,6 @@ - ENV={'PATH' : os.environ['PATH']})) +@@ -461,7 +454,6 @@ else: + TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ] # Find the (dynamic) library in this directory -tenv.Replace(RPATH=thisdir) From patchwork Thu Mar 8 18:17:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131038 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50762lja; Thu, 8 Mar 2018 10:25:28 -0800 (PST) X-Google-Smtp-Source: AG47ELuiyPNMv9Fk34loqyfw4qSkeqB4eP3pI9FRhWk/dpSVVBIMMfuHsc88IAoKm8/vlgbLi7/P X-Received: by 10.99.180.3 with SMTP id s3mr21706597pgf.258.1520533528485; Thu, 08 Mar 2018 10:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533528; cv=none; d=google.com; s=arc-20160816; b=CUhwewBIBh5pWLOZJLRTwVSQWxD2LYJw+D5APL1CnTMAmCXpiksgRtc2nMtHXuYEMr xnJHTAEYL6qGso/x7q+gW9IoCErI9jofj7iqt6Pvz4BYMURXP0AHRcstTtorj/6YyRlx 6u42jVqnPG2LpphTyjmKd67HlY2B48NaCzRiTGxPb4jkgNotvR+b7XWIfJvk0g2m1ZgO H/UeLSxaXX7Wv6SJaQSUmndEkpDNsQcX1BPJyXwvcpV4w2z6tX26HD02/kFuO2QSg82n wmCw65XExTxgvyo8GPszy9c8xzdRW7hc4b1w21JWFKc+08w4sefVu7e+/XG0bHTOm4ZI R7/w== 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=9lCZo8JXrEOEYAI2JbwipZBNSzoEcL/QbUtGZiTUsao=; b=EogJuDi+WIYgA+Hpe75T2eLZLLkxOFeyWYe5TGetC0fDv5Hg7z/RdLXqyPs96Rlm5t +Zn4mNFYAjw5HXgRr8rfBsqTwCzIkJa/sCruVbrWt1++FFpqAOdCCGffcT/bdTRdEi8t IjujaI/ajJH5H9NOLHKPAXj/QyHTgub2+VR3RfTfhVY/C3Ig3AYE/+O25TV1rHYyIfN7 geIHc72gqpGynZ+YF9O/BlcoWnycH9I00LKmqrr4uZ04p74joa807B6gkZ2XU06Ywc9p dPCXZmmiK+rmASwZ/JmmgSEMuCgw9P+ivFn7FozarxM7aT1iSh8po53CdUCJvIWJTYxs Uyug== 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 q15-v6si8025789plk.518.2018.03.08.10.25.28; Thu, 08 Mar 2018 10:25:28 -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 2BA1F789A4; Thu, 8 Mar 2018 18:25:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 12DE478973 for ; Thu, 8 Mar 2018 18:24:49 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053640" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:49 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:27 +0200 Message-Id: <20180308181804.31261-5-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 05/42] nspr: 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-support/nspr/nspr/fix-build-on-x86_64.patch | 2 +- meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch | 10 +++++----- 2 files 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-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch index c2b7258e50e..f12acc85480 100644 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -49,4 +49,4 @@ Index: nspr/configure.in - PR_MD_ASFILES=os_Linux_ppc.s fi ;; - m68k) + esac diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch index a7e7853de1a..ecc6d31874a 100644 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch @@ -11,12 +11,12 @@ in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-sp Signed-off-by: Andrei Gherzan Upstream-Status: Pending -Index: nspr-4.8.9/mozilla/nsprpub/pr/tests/Makefile.in +Index: nspr/pr/tests/Makefile.in =================================================================== ---- nsprpub.orig/pr/tests/Makefile.in 2012-02-11 00:01:10.476220505 +0200 -+++ nsprpub/pr/tests/Makefile.in 2012-02-10 23:57:40.000000000 +0200 -@@ -379,7 +379,7 @@ - endif +--- nspr.orig/pr/tests/Makefile.in ++++ nspr/pr/tests/Makefile.in +@@ -315,7 +315,7 @@ ifeq ($(OS_ARCH), SunOS) + endif # SunOS ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) - LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) From patchwork Thu Mar 8 18:17:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131039 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50875lja; Thu, 8 Mar 2018 10:25:36 -0800 (PST) X-Google-Smtp-Source: AG47ELsPlWjCqYS+cCIv2ZMX9M4pQB1YqQQWJOEp8gotqt2nxkDkZfmg2R+IZ1BRYE6v8PLbsZTq X-Received: by 10.99.168.75 with SMTP id i11mr21591385pgp.420.1520533536144; Thu, 08 Mar 2018 10:25:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533536; cv=none; d=google.com; s=arc-20160816; b=sZ9S+DAk1VSRfEDDoGzRhWbOonTlHUkIjQ+SslHtcbQUtFQzX5BJVwpMbMI/zM0GYT nWqeS2Z6idMxOFpOxtjHEoGC1ftvxz4U09cfa4a6MmlZm6zYWs8Y8og4xlrRDTMFPPo1 bHIIl2rgNkZfbofKYXw+FiQgKg9sT/tpOhX5cPdfVXIil9P5wpk2eOVHOgoz0SClFBjc OP40u2KY4Fu9qFzonMNQlbPmOM9arwflfkqbFPLA2ClgrRxXAEvgHKInYd2DTWtJ+2gI qTvkaJPysVppkDKdGGcht3VMV3kKIYxj7twKt29JeOgbesE7wCt0XQskM58ZnJ0nDc4K YR+w== 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=EWQkr/Bk/jTQ3JMQTWYvDhnO6SG/eWBfK1TH7ChJ79Y=; b=ycjZPMIICIgfD5vJY80uMhgaZ2aeaVHB/6lovaCw+k67QBGkAed4yr0lnZjUOZiglf mDwNakNiwkSfsjGXrtqe++7Q7M0Cd/Tj6Ne2QrtT2ZE9kLbfoI5HpJue4nGsZgADE5m9 rFO8Ijh0cx/roHE+xUnjQbX0RQ0/soCMHuPcKaD1AWA0kzK4V8L4txV5NTsL1w3IJ/HB 5lcXBe0pEG3loc01Z2YyO7HHT1S0SpuLuNB7KkdrRpbeh7pgBq4DuD0S4M/WeCD2OsJ0 3K9CiGbva2NHT9UGfC1hjb/KtL5EemOJBiOVzHt4bznGNC3dI17Nw4rlMp8L2UR1L6NV rYGA== 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 t84si13311579pgb.241.2018.03.08.10.25.35; Thu, 08 Mar 2018 10:25:36 -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 3A42F789AA; Thu, 8 Mar 2018 18:25:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 8DDE37897D for ; Thu, 8 Mar 2018 18:24:50 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053646" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:51 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:28 +0200 Message-Id: <20180308181804.31261-6-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 06/42] libical: 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 --- .../libical/libical/Remove-cmake-check-for-Perl.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-support/libical/libical/Remove-cmake-check-for-Perl.patch b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch index c5c0cb076e6..b50f50e7017 100644 --- a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch +++ b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch @@ -14,11 +14,11 @@ Signed-off-by: Jussi Kukkonen CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d5aad80..5cc9863 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,8 +91,7 @@ if(SHARED_ONLY) +Index: libical-2.0.0/CMakeLists.txt +=================================================================== +--- libical-2.0.0.orig/CMakeLists.txt ++++ libical-2.0.0/CMakeLists.txt +@@ -116,8 +116,7 @@ if(SHARED_ONLY) set(LIBRARY_TYPE SHARED) endif() @@ -26,8 +26,5 @@ index d5aad80..5cc9863 100644 -find_package(Perl REQUIRED) +set(PERL_EXECUTABLE perl) - # MSVC specific definitions - if(WIN32) --- -2.1.4 - + # Ensure finding 64bit libs when using 64-bit compilers + if(CMAKE_CL_64) From patchwork Thu Mar 8 18:17:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131040 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51007lja; Thu, 8 Mar 2018 10:25:44 -0800 (PST) X-Google-Smtp-Source: AG47ELu8NRSsu2niUU6PkTWTlfdHkcTHfVwDiZxPrzi/3zxrqxX+f3dY9IBUCnV6VLEZnfqgj9Y4 X-Received: by 2002:a17:902:d807:: with SMTP id a7-v6mr24612036plz.330.1520533544150; Thu, 08 Mar 2018 10:25:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533544; cv=none; d=google.com; s=arc-20160816; b=I0zhGYzZSaESPpJHyDWwrwDsxvlwu0cnTGi25g9a1DOvqZ8dMust5OOiuihOfdod0u M0mLGmDYGtLSU5Ku96NRkh8gJVtOBNlHzVJDaC+94p6uQh4OnnVO9vSCt2GpUY+izu7F KlD14u1o6FnaV3u02R9K9H9Vn9YdW5LZarY3eo/vd5nbnJxhTejE+JlPcjXezGsfU3po /AbpVVq7AXsZWDKhqtMcmRulORP9r7bmllSQ0Yz8i4dumtxGRO4bZOnf6b89sEtDjF8R Q8EspG2SPh5hv9KY2VOdqTMb8m8GPFKNlOldT1UYBoo3ZSWf7oej9gaPaR6DfOYGQXEk /qNw== 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=ECLt0DuB2nmlb2u2u62HL0u1Oer35MrIZhmmTvOcubI=; b=WbSdN2x1b1EftMlaf8EOkiCfAYYXn39q1QaAV7X/5fYkw6GcyLvLz8eMKanH/TbcvA qYBrPf1diMLbI2f3IGWXKirdO4C+tR5kpFU7PXOPkf4oXlqQw0L2/5asxB/BS9V82UOK ZNiEjAiW8jNqsO+Gx1MD+3nuYL2Yrof8MUYZyyYFbvZvh7N6Bvdw8+lGMxZGYxHwZvi4 x3It6JqnA6gPgNb1dyCIG4OVvhy7CCZUCd2Dd4W8WN7EfX3S9iBzzE/7/4oxTqMMe6hv E29/kquInxWV/WLK/4AEQzer7tEqsE96b0UAwshg8oGp3bCtwkr9uw+diJ30yZtqDWeD E5ow== 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 x2si13385222pgc.260.2018.03.08.10.25.43; Thu, 08 Mar 2018 10:25:44 -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 4240F789A0; Thu, 8 Mar 2018 18:25:12 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 1B23D78973 for ; Thu, 8 Mar 2018 18:24:52 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053660" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:52 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:29 +0200 Message-Id: <20180308181804.31261-7-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 07/42] gmp: 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 --- ...fiure.ac-Believe-the-cflags-from-environment.patch | 19 ++++++++----------- meta/recipes-support/gmp/gmp-6.1.2/amd64.patch | 10 +++++----- .../gmp/gmp-6.1.2/use-includedir.patch | 14 +++++++------- 3 files changed, 20 insertions(+), 23 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/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch index 665367658bc..1e47924ccc7 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ b/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -18,13 +18,13 @@ Upstream-Status: Inappropriate[OE-Specific] configure.ac | 11 ----------- 1 file changed, 11 deletions(-) -diff --git a/configure.ac b/configure.ac -index 857ea3b..359e919 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -607,15 +607,6 @@ case $host in - GMP_INCLUDE_MPN(arm/arm-defs.m4) - CALLING_CONVENTIONS_OBJS='arm32call.lo arm32check.lo' +Index: gmp-6.1.2/configure.ac +=================================================================== +--- gmp-6.1.2.orig/configure.ac ++++ gmp-6.1.2/configure.ac +@@ -604,15 +604,6 @@ case $host in + any_32_testlist="sizeof-long-4" + any_64_testlist="sizeof-long-8" - # This is needed for clang, which is not content with flags like -mfpu=neon - # alone. @@ -38,7 +38,7 @@ index 857ea3b..359e919 100644 # FIXME: We make mandatory compiler options optional here. We should # either enforce them, or organise to strip paths as the corresponding # options fail. -@@ -686,8 +677,6 @@ case $host in +@@ -746,8 +737,6 @@ case $host in ;; *) path="arm" @@ -47,6 +47,3 @@ index 857ea3b..359e919 100644 ;; esac ;; --- -1.9.1 - diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch index 564d12d42b9..3935589f8b2 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch +++ b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch @@ -1,10 +1,10 @@ Upstream-Status: Pending -Index: gmp-5.0.3/longlong.h +Index: gmp-6.1.2/longlong.h =================================================================== ---- gmp-5.0.3.orig/longlong.h -+++ gmp-5.0.3/longlong.h -@@ -994,8 +994,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( +--- gmp-6.1.2.orig/longlong.h ++++ gmp-6.1.2/longlong.h +@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype count is only an int. */ #define count_trailing_zeros(count, x) \ do { \ @@ -14,5 +14,5 @@ Index: gmp-5.0.3/longlong.h + __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ + (count) = __cbtmp; \ } while (0) - #endif /* x86_64 */ + #endif /* __amd64__ */ diff --git a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch index 74904a25302..6b089cf39c2 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch +++ b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch @@ -1,15 +1,15 @@ Upstream-Status: Pending -Index: gmp-4.2.4/Makefile.am +Index: gmp-6.1.2/Makefile.am =================================================================== ---- gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.000000000 +0000 -+++ gmp-4.2.4/Makefile.am 2009-07-06 20:19:19.000000000 +0000 -@@ -106,7 +106,7 @@ - # but anyone knowledgable enough to be playing with exec_prefix will be able +--- gmp-6.1.2.orig/Makefile.am ++++ gmp-6.1.2/Makefile.am +@@ -130,7 +130,7 @@ EXTRA_DIST += gmpxx.h + # but anyone knowledgeable enough to be playing with exec_prefix will be able # to address that. # -includeexecdir = $(exec_prefix)/include +includeexecdir = $(includedir) include_HEADERS = $(GMPXX_HEADERS_OPTION) - nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION) - lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION) + nodist_includeexec_HEADERS = gmp.h + lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) From patchwork Thu Mar 8 18:17:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131041 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51193lja; Thu, 8 Mar 2018 10:25:54 -0800 (PST) X-Google-Smtp-Source: AG47ELsYEWkyXhUfn730OpZk+jao/GeUdns6Tdhpsh/4rGGI/S5JTBPJX40GGP+Byf962bbXAgaL X-Received: by 2002:a17:902:ba95:: with SMTP id k21-v6mr25260155pls.111.1520533554045; Thu, 08 Mar 2018 10:25:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533554; cv=none; d=google.com; s=arc-20160816; b=JZ28xy8GHtBWMWCGTsWNM5pABTTSrkD01pqc1L1LrhDh/fky+zgKU5f6mwRtBIctm/ puGExE6EimWI48lyzg0Ce0c535xDA9EaFNHc881nSfC2sKMUgA6fnlQawdDC3e/FDh0t cXuoIgiZUPUbi7kyIaUswWZZBTiQpl9hS4PtosNda5DgqJpXCTOVAyYy0LvBf4j5kmBe YZqxO81H7zicb5wIWFjDmdxTPmw5XM4hwVTgOpVOV0FZvIw11fkB8QYino3eknWACPIv ONfXtNRNYzL1r1t52IAGK0+9KwNha82OnZ58bF3XmWc/izIqTF9qRQpDuKqqo9umCro3 iMYw== 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=7/ktcmQMVBsEuXj/LS5XDmyA06kKzIrn33Co15uh0QE=; b=eOpSXJzSyfTjyS19U7p7hvHSRjL+jXp5iWTlmmgbkJMHvEXiy7M5dD124SksspBIft FVSon5iP23dp/OzJRzmFrigb7Og37c6+pxDPcCTL29G+Flc6sJEqOPZgTargd4JxAbRj CN2cRiQr4uSCiVIIdPoIN35PrEJDBpD0RjmMm15DppcijcWEGHKVD1EDEP4auKl7jy/P lO4NYFIJ0VxYtwCezOeOJNFMHJBEzJq4CZSm1r0bZ5BaaX3rfWeU5xf9Dwz3YQCKpUaK moZ20fA2k9O2gVmxikDQNJA2UUu1XW7YEufzOd9Z7PjmwpkEsmVu5dbybnSMWX5OxUfC gLOw== 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 v62si14105012pfi.156.2018.03.08.10.25.53; Thu, 08 Mar 2018 10:25:54 -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 B33F8789AF; Thu, 8 Mar 2018 18:25:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 9E9DA78985 for ; Thu, 8 Mar 2018 18:24:53 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053676" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:54 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:30 +0200 Message-Id: <20180308181804.31261-8-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 08/42] gnutls: 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 --- .../gnutls/gnutls/0001-configure.ac-fix-sed-command.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-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch index f0b7ca2ec84..b6e7bc96504 100644 --- a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch +++ b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch @@ -14,19 +14,16 @@ Signed-off-by: Alexander Kanavin configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 6907b21..7c70d9e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -948,7 +948,7 @@ YEAR=`date +%Y` +Index: gnutls-3.5.16/configure.ac +=================================================================== +--- gnutls-3.5.16.orig/configure.ac ++++ gnutls-3.5.16/configure.ac +@@ -955,7 +955,7 @@ YEAR=`date +%Y` AC_SUBST([YEAR], $YEAR) for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do - nam=$(basename $i|sed 's/.bak//g') + nam=$(basename $i|sed 's/\.bak$//') if test "$create_libopts_links" = "yes";then + rm -f "src/$nam.stamp" rm -f "src/$nam" - AC_CONFIG_LINKS([src/$nam:$i]) --- -2.11.0 - From patchwork Thu Mar 8 18:17:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131042 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51337lja; Thu, 8 Mar 2018 10:26:03 -0800 (PST) X-Google-Smtp-Source: AG47ELs+0uF98x7rfRK+rQ1kxNd3N3HPskfITPf/aNpSAWuM40wTkIppZQYJ+6uJwcwmaQ1z7zid X-Received: by 10.101.93.135 with SMTP id f7mr21147601pgt.82.1520533562923; Thu, 08 Mar 2018 10:26:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533562; cv=none; d=google.com; s=arc-20160816; b=P4ULaUwWdYVBx1eXGIH+az08cC8OgRpSMGqqITzVUYv/lCSahU57ECK7Skqoqk5Jus VQRiRY7n8Qy7pdy52bLrZlWhbZFAOi9CTvPuQLkFBwE3HpEnnVLSXrV/y+t22KBkjTNP Khm0ww2uRe3ikCDuVF8tL5S2+FvtjJtMCivPUciwjpvvz0PaOwtV9KKX6JwtoG2/Z/bI yCOWR43XMjR/H5FTVRLAG3Ck1OzWuA1qYRIPvlgmIRCVr+YfAROG/rXyJwro30yWT/w4 YDQaxxG/G8UOc4TB1obFTFz/xFITit55hqAVIRlMMY7nJQ8B0IYxOmrL7htGNxgGSBNl luhA== 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=og1271azbcizoHl1SAANlWWDpGgXiR85aE720u+ZChI=; b=BpmUWy1cUaQ2/BMowjn/F7nqNHbXIN+voIY3Khd0XvtYt5JLy3wQfAhUfFLWg6wNGg 5L0SlJidbumNqV74+O6OhegxBFtZ/YOFuM8TzMHJ36IKwxxiC0CrYwgpvm4Pijc4gqjH ZSaJPFezHt2ESVzZowX8HgrtsZVGhpCArCPJhJ9uMzYrsyW/0PlmbgVf+wT0IFII0tDe QyQODzmfEIcg2GcTrFdJAHT84p4TEwA+BtvdxRZVdz+vhRjLtARQ2u423oWsQBCscI6F vKI6YuoMDKZ9h1r5ZcO7TeLHPckMHCz7+2apHaoalVE5Ho8zS1WxZ2Uhuj/eWIVeZ8+Q WrFA== 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 i2si12588742pgs.639.2018.03.08.10.26.02; Thu, 08 Mar 2018 10:26:02 -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 C52C778979; Thu, 8 Mar 2018 18:25:17 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 2CD9178973 for ; Thu, 8 Mar 2018 18:24:55 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053691" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:55 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:31 +0200 Message-Id: <20180308181804.31261-9-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 09/42] libffi: 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-support/libffi/libffi/not-win32.patch | 12 ++++++++---- 1 file changed, 8 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-support/libffi/libffi/not-win32.patch b/meta/recipes-support/libffi/libffi/not-win32.patch index 1e90125edd7..80c40a4742d 100644 --- a/meta/recipes-support/libffi/libffi/not-win32.patch +++ b/meta/recipes-support/libffi/libffi/not-win32.patch @@ -11,12 +11,16 @@ As this block is generally pointless, disable it. Upstream-Status: Inappropriate Signed-off-by: Ross Burton ---- a/configure.ac~ 2014-11-12 11:56:51.000000000 +0000 -+++ b/configure.ac 2016-02-04 14:02:53.765710532 +0000 -@@ -593,5 +593,5 @@ +Index: libffi-3.2.1/configure.ac +=================================================================== +--- libffi-3.2.1.orig/configure.ac ++++ libffi-3.2.1/configure.ac +@@ -592,7 +592,7 @@ AC_ARG_ENABLE(purify-safety, + # These variables are only ever used when we cross-build to X86_WIN32. # And we only support this with GCC, so... -if test "x$GCC" = "xyes"; then +if false; then if test -n "$with_cross_host" && - test x"$with_cross_host" != x"no"; then \ No newline at end of file + test x"$with_cross_host" != x"no"; then + toolexecdir="${exec_prefix}"/'$(target_alias)' From patchwork Thu Mar 8 18:17:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131043 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51487lja; Thu, 8 Mar 2018 10:26:11 -0800 (PST) X-Google-Smtp-Source: AG47ELsg4QL9g8gtv7BDDjcvaWM3CfF8QlEY87eQxbYD/g1bRQa5D034S78O/a9Sen+dBRrDa74z X-Received: by 10.98.86.15 with SMTP id k15mr27499287pfb.187.1520533571581; Thu, 08 Mar 2018 10:26:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533571; cv=none; d=google.com; s=arc-20160816; b=Xw1hQAohPEAFE1uuCgCCjciphmnALOHmdoBL6mkk4KWZ2APySnJV/jQvS8z/PxsZUj TE9h5NOMFPI1D9QLR268iA0xw9bVfBTiYN9MLcNgDzlaAjvJHHtHsAELjESZbPU5bG7p Z/mB5DSsDrKuNPyz+3fqWUa7kk3M+xcJxOwJVvjTBO21nPXIafawK6m5321QIWQ7k7V0 MC+v4a5VykP1zdGZgA96JAdsaaujcBasVq2hu0JpFf+WTImt55rRMm6GZ79RzUf92bQX VFdlrFahsXKmt10u8GEctjYVITjEz7GO0gv9ZxOozlnRSdU660yVBE7jjg8qH3ysOljj oVtg== 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=w3WKdjHGaRpCCvQVySJBmX2qKCNrogUNe67NLJT9H/s=; b=XfyCtiw/dPsXa6xpomwdYl5WTiUgyXBfahnWvUEavAnVMveEmkmIZ55rVPM1Cdul9l n+GFpA8A0ffB26njjEY8xU29I5zJTwo9140PXJmiLA1t/ySh8MDsa6lZn3Y/fmhIjGsz XjEWBE+53zJK6hfGkyBkvC4Vq6pqu55a9/nowvf0HLwEVbjr+RZ0VM/8cY3q7HsjgJd8 4hI8IxlpU+Qk69nMr/vUS4Rfnw7E61dwe08xhnzXjtDruSjbVhrCP5w1BOEzTceH3w+/ RDnno7f5GjqdYPak5ULim0eHijxk8+AC0Nr8NrVgp8v8t6b86pNg1kTST93y711OHCzb cvUQ== 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 t13si13259133pgp.450.2018.03.08.10.26.11; Thu, 08 Mar 2018 10:26:11 -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 C792B789BE; Thu, 8 Mar 2018 18:25:18 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id B73417897D for ; Thu, 8 Mar 2018 18:24:56 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053700" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:57 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:32 +0200 Message-Id: <20180308181804.31261-10-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 10/42] libksba: 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 --- .../libksba/ksba-add-pkgconfig-support.patch | 38 +++++++++++----------- 1 file changed, 19 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-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index d28dfd9ebeb..5afe6de923f 100644 --- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -6,13 +6,13 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile. Signed-off-by: Chen Qi -Index: libksba-1.3.0/Makefile.am +Index: libksba-1.3.5/Makefile.am =================================================================== ---- libksba-1.3.0.orig/Makefile.am 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/Makefile.am 2014-05-13 21:39:22.462385646 +0000 -@@ -21,6 +21,9 @@ +--- libksba-1.3.5.orig/Makefile.am ++++ libksba-1.3.5/Makefile.am +@@ -20,6 +20,9 @@ + ACLOCAL_AMFLAGS = -I m4 -I gl/m4 - AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip +pkgconfigdir = ${libdir}/pkgconfig +pkgconfig_DATA = ksba.pc @@ -20,11 +20,11 @@ Index: libksba-1.3.0/Makefile.am # (A suitable gitlog-to-changelog script can be found in GnuPG master.) GITLOG_TO_CHANGELOG=gitlog-to-changelog -Index: libksba-1.3.0/configure.ac +Index: libksba-1.3.5/configure.ac =================================================================== ---- libksba-1.3.0.orig/configure.ac 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/configure.ac 2014-05-13 21:39:22.462385646 +0000 -@@ -400,6 +400,7 @@ +--- libksba-1.3.5.orig/configure.ac ++++ libksba-1.3.5/configure.ac +@@ -414,6 +414,7 @@ gl/Makefile src/Makefile src/ksba-config src/versioninfo.rc @@ -32,10 +32,10 @@ Index: libksba-1.3.0/configure.ac tests/Makefile doc/Makefile ]) -Index: libksba-1.3.0/ksba.pc.in +Index: libksba-1.3.5/ksba.pc.in =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libksba-1.3.0/ksba.pc.in 2014-05-13 21:39:22.462385646 +0000 +--- /dev/null ++++ libksba-1.3.5/ksba.pc.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -54,11 +54,11 @@ Index: libksba-1.3.0/ksba.pc.in +Libs.private: -L${libdir} -lgpg-error +Cflags: -I${includedir} + -Index: libksba-1.3.0/src/ksba.m4 +Index: libksba-1.3.5/src/ksba.m4 =================================================================== ---- libksba-1.3.0.orig/src/ksba.m4 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/src/ksba.m4 2014-05-13 21:49:03.650382696 +0000 -@@ -22,18 +22,7 @@ +--- libksba-1.3.5.orig/src/ksba.m4 ++++ libksba-1.3.5/src/ksba.m4 +@@ -22,18 +22,7 @@ dnl with a changed API. dnl AC_DEFUN([AM_PATH_KSBA], [AC_REQUIRE([AC_CANONICAL_HOST]) @@ -77,7 +77,7 @@ Index: libksba-1.3.0/src/ksba.m4 tmp=ifelse([$1], ,1:1.0.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -43,48 +32,13 @@ +@@ -43,48 +32,13 @@ AC_DEFUN([AM_PATH_KSBA], min_ksba_version="$tmp" fi @@ -129,7 +129,7 @@ Index: libksba-1.3.0/src/ksba.m4 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([KSBA API version]) if test "$req_ksba_api" -eq "$tmp" ; then -@@ -97,10 +51,8 @@ +@@ -97,10 +51,8 @@ AC_DEFUN([AM_PATH_KSBA], fi fi if test $ok = yes; then @@ -141,7 +141,7 @@ Index: libksba-1.3.0/src/ksba.m4 if test x"$libksba_config_host" != xnone ; then if test x"$libksba_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -114,8 +66,6 @@ +@@ -114,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA], fi fi else From patchwork Thu Mar 8 18:17:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131044 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51632lja; Thu, 8 Mar 2018 10:26:20 -0800 (PST) X-Google-Smtp-Source: AG47ELs0mgmuWaaHcR6Fe8G46q7qgWx4nl77IEbLoS1wxiecvAHqBVOETTxKcmP9q0EzVcRUxkI7 X-Received: by 2002:a17:902:d909:: with SMTP id c9-v6mr24712811plz.34.1520533579935; Thu, 08 Mar 2018 10:26:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533579; cv=none; d=google.com; s=arc-20160816; b=QWOQqIz799d74Acg/iAOWodu9JvuxGaHlxGTdKQWuS0lec/TBmmFZyPh8g0oUOH/ob y6KCIUFqzOLUeHb5d7vCBzWdjjrkzvtZHLIn77ZIWuJ24eL1wTu51/4QvGCjzC2a44ue 8D2gUEr25Z7rKsytqOhOOtut+MMSVka/5Pf6LIucKt9+0A4M18pSKqaIxOTV67aNbhGt WhiAwJtnN7dPgYJ5PyxTAmQk4LpY9GrR5baGuek3gcnEScbInJhX+L96uroz0JOHsuUV 2+NU09hK1RR3PCEi34t64/26Pxt6zRwuAS548ARwAAOBp19c+yvLDMOOcuQIMD/yfYVu rDjw== 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=PCPxoMVt73j2Va7OWsilHTXD7lck/je2USn2DTobkY0=; b=yUDekwl+NtmQP/K2x8O59yF5s2Cm654Jr6GWuVTFdvXcLw5l0zBQ+AXOxMhbZXl9U3 ix6b78Cs7Kzt7IslK2tyzT4egOCyvr5ZUgfAZJBwmuAMbYXuVNrzbJgz/im1WVfKJrdi 60t5aPzwXoswk9Zyu8N0l2dux1jrID7Bm8Sj1fmgM1WzQSgG5lysfwb32KDVHXlwurlo RXFgRdArgh/xmAp28qOrW/Sefy+4ZCoFW9HVBZbJ6jgG6cYzJE1yYJBMtEXk315wlJJ6 p47nr9jG1vqT6FkiZ/UsxLPGgcLac1J80ntJEo01llna+pcTZam+ZQPhHVuoUb+17DRu jEIQ== 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 l5-v6si15504227plk.390.2018.03.08.10.26.19; Thu, 08 Mar 2018 10:26: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 D9FAF789CD; Thu, 8 Mar 2018 18:25:19 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 4284278973 for ; Thu, 8 Mar 2018 18:24:58 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053714" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:58 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:33 +0200 Message-Id: <20180308181804.31261-11-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 11/42] 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 457202eae50..4798e470719 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-3.9.5/configure.ac +Index: tiff-4.0.8/configure.ac =================================================================== ---- tiff-3.9.5.orig/configure.ac -+++ tiff-3.9.5/configure.ac +--- tiff-4.0.8.orig/configure.ac ++++ tiff-4.0.8/configure.ac @@ -27,7 +27,7 @@ dnl Process this file with autoconf to p AC_PREREQ(2.64) - AC_INIT([LibTIFF Software],[3.9.5],[tiff@lists.maptools.org],[tiff]) + AC_INIT([LibTIFF Software],[4.0.8],[tiff@lists.maptools.org],[tiff]) AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR(m4) +dnl AC_CONFIG_MACRO_DIR(m4) From patchwork Thu Mar 8 18:17:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131045 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51760lja; Thu, 8 Mar 2018 10:26:28 -0800 (PST) X-Google-Smtp-Source: AG47ELttKNYcVBbD3JMZK9HqTNzn2dkLJ+pj5yAiK3f5QrAItbdXFJcf7u/TYJA8jeTuwUvJYWXf X-Received: by 10.99.140.85 with SMTP id q21mr21403423pgn.51.1520533588089; Thu, 08 Mar 2018 10:26:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533588; cv=none; d=google.com; s=arc-20160816; b=FzH5o208yZ4+3JuX3VFBKRUnQ2T8XVhbcGb1AaoOzhd1c094i+3gPo2P3WZYAVfLvH FRpsvdgRQHu9MTZsXJ4AGhwuBLrqDUDdKwsPs7hkjvy59bwnHdUVcA7KNU2uirLRy88o 9s5Xl771JSdZeb9qEpsVOgHedtdfviSCTloHhe6gel5/iXwnW3U4ncx2nZHnkH1bMuO7 y3/hRU+HhVSWiWCzxNyREarbNXqwMH3/CjiCQR0kiQgyhRG6neoM90BK0P27nBr5sE4t oID1OE50eAM1uAi/2nq7mOfuO2FcXS4jUJUnI3pkILnHafX2Fo0mhyUBT0xF3zYQ55Km GI6w== 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=17XH5pNU6bGpnN660KxEnnFv3YaTEzCXTAxaQV59eU0=; b=HCGQ1/nyV6lZZcUeaPKCjWTANwsDBb0jjo/zZUw3NfH3RdMfJ8MF2Q5ZVDdp3Imj/4 Db7MLqEDGaQMq9wcFL3DtGpNEGeMmXhBJnQBYZmdKpcloJBRlM9VL6A2qjfWuBuxXf2r pPdg3vK6fhNgyS3tlokr17clepQLamFnmuobVf8aXPSB62xZVZb3Kc15nENfmZLJhCjb UzvbgjhKxQp/vfi/CfXyquC2EQ8JhVlOsfgYNy1ys3HJdHpjaC+OFYLAaevn7Bo0rIHp dCWzwZf8u1GE4AOz/aCXRNZUvJxpbf6mbZ/a23D3jAmALpdfRaJkyuADcomg37obdmmA tcdw== 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 o23-v6si1195144pll.433.2018.03.08.10.26.27; Thu, 08 Mar 2018 10:26:28 -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 DF777789D5; Thu, 8 Mar 2018 18:25:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 109B378973 for ; Thu, 8 Mar 2018 18:25:00 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053734" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:00 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:34 +0200 Message-Id: <20180308181804.31261-12-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 12/42] gstreamer: 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 --- .../configure-allow-to-disable-libssh2.patch | 17 ++- ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 135 ++++++++++----------- 2 files changed, 73 insertions(+), 79 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/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch index d52afd5d57b..ad863298938 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch @@ -18,11 +18,11 @@ Signed-off-by: Wenzong Fan configure.ac | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 0e95c5c..12153b4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1901,6 +1901,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chromaprint], chromaprint, [ +Index: gst-plugins-bad-1.12.3/configure.ac +=================================================================== +--- gst-plugins-bad-1.12.3.orig/configure.ac ++++ gst-plugins-bad-1.12.3/configure.ac +@@ -2139,6 +2139,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chrom ]) dnl *** Curl *** @@ -37,8 +37,8 @@ index 0e95c5c..12153b4 100644 + translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true) AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ - PKG_CHECK_MODULES(CURL, libcurl >= 7.21.0, [ -@@ -1915,12 +1924,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ + PKG_CHECK_MODULES(CURL, libcurl >= 7.35.0, [ +@@ -2161,12 +2170,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin] ]) AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) @@ -59,6 +59,3 @@ index 0e95c5c..12153b4 100644 AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes") AC_SUBST(SSH2_CFLAGS) AC_SUBST(SSH2_LIBS) --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch index 0a8bc9b076d..6616e2cf0d7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch @@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin gst-libs/gst/video/Makefile.am | 8 ++++---- 11 files changed, 38 insertions(+), 38 deletions(-) -diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am -index bc7f53a..0ef5f86 100644 ---- a/gst-libs/gst/allocators/Makefile.am -+++ b/gst-libs/gst/allocators/Makefile.am -@@ -35,7 +35,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ +Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am +@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I --c-include "gst/allocators/allocators.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -33,7 +33,7 @@ index bc7f53a..0ef5f86 100644 --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -59,7 +59,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -42,11 +42,11 @@ index bc7f53a..0ef5f86 100644 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am -index dcc2fe0..dc076cb 100644 ---- a/gst-libs/gst/app/Makefile.am -+++ b/gst-libs/gst/app/Makefile.am -@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO +Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am +@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE --c-include "gst/app/app.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -57,11 +57,11 @@ index dcc2fe0..dc076cb 100644 --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am -index 2374196..295eb42 100644 ---- a/gst-libs/gst/audio/Makefile.am -+++ b/gst-libs/gst/audio/Makefile.am -@@ -106,12 +106,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE +Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am +@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ --c-include "gst/audio/audio.h" \ @@ -78,7 +78,7 @@ index 2374196..295eb42 100644 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -140,8 +140,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir="$(top_builddir)/gst-libs/gst/tag/" \ @@ -89,11 +89,11 @@ index 2374196..295eb42 100644 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am -index f545354..1bb6243 100644 ---- a/gst-libs/gst/fft/Makefile.am -+++ b/gst-libs/gst/fft/Makefile.am -@@ -62,7 +62,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO +Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am +@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE --c-include "gst/fft/fft.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -102,7 +102,7 @@ index f545354..1bb6243 100644 --library=libgstfft-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -86,7 +86,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -111,11 +111,11 @@ index f545354..1bb6243 100644 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am -index 91dc214..dc8e1d3 100644 ---- a/gst-libs/gst/pbutils/Makefile.am -+++ b/gst-libs/gst/pbutils/Makefile.am -@@ -84,14 +84,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP +Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am +@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR --c-include "gst/pbutils/pbutils.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -134,7 +134,7 @@ index 91dc214..dc8e1d3 100644 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --library-path="$(top_builddir)/gst-libs/gst/video/" \ --library-path="$(top_builddir)/gst-libs/gst/audio/" \ -@@ -124,8 +124,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -145,11 +145,11 @@ index 91dc214..dc8e1d3 100644 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ --includedir="$(top_builddir)/gst-libs/gst/video/" \ --includedir="$(top_builddir)/gst-libs/gst/audio/" \ -diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am -index 3bd8fc0..0a115cc 100644 ---- a/gst-libs/gst/riff/Makefile.am -+++ b/gst-libs/gst/riff/Makefile.am -@@ -41,8 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am +@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS # --c-include "gst/riff/riff.h" \ # --add-include-path=$(builddir)/../tag \ # --add-include-path=$(builddir)/../audio \ @@ -160,7 +160,7 @@ index 3bd8fc0..0a115cc 100644 # --library=libgstriff-@GST_API_VERSION@.la \ # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ -@@ -73,8 +73,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS # --includedir=$(builddir) \ # --includedir=$(builddir)/../tag \ # --includedir=$(builddir)/../audio \ @@ -171,11 +171,11 @@ index 3bd8fc0..0a115cc 100644 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) # #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am -index f5445c1..527c0b4 100644 ---- a/gst-libs/gst/rtp/Makefile.am -+++ b/gst-libs/gst/rtp/Makefile.am -@@ -60,8 +60,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO +Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am +@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE --c-include "gst/rtp/rtp.h" \ -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ @@ -186,7 +186,7 @@ index f5445c1..527c0b4 100644 --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -88,8 +88,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -197,11 +197,11 @@ index f5445c1..527c0b4 100644 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am -index 9b0b258..4f6d9f8 100644 ---- a/gst-libs/gst/rtsp/Makefile.am -+++ b/gst-libs/gst/rtsp/Makefile.am -@@ -67,7 +67,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS +Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am +@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ --add-include-path=$(builddir)/../sdp \ @@ -210,7 +210,7 @@ index 9b0b258..4f6d9f8 100644 --library=libgstrtsp-@GST_API_VERSION@.la \ --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ -@@ -97,7 +97,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../sdp \ @@ -219,11 +219,11 @@ index 9b0b258..4f6d9f8 100644 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am -index 0e149b8..9aa0512 100644 ---- a/gst-libs/gst/sdp/Makefile.am -+++ b/gst-libs/gst/sdp/Makefile.am -@@ -29,7 +29,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO +Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am +@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE --warn-all \ --c-include "gst/sdp/sdp.h" \ -I$(top_srcdir)/gst-libs \ @@ -232,7 +232,7 @@ index 0e149b8..9aa0512 100644 --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -53,7 +53,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -241,11 +241,11 @@ index 0e149b8..9aa0512 100644 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am -index cafafd3..ba99279 100644 ---- a/gst-libs/gst/tag/Makefile.am -+++ b/gst-libs/gst/tag/Makefile.am -@@ -40,8 +40,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO +Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am +@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE --c-include "gst/tag/tag.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -256,7 +256,7 @@ index cafafd3..ba99279 100644 --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -68,8 +68,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -266,12 +266,12 @@ index cafafd3..ba99279 100644 + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) - CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am -index ac64eb3..342c8c6 100644 ---- a/gst-libs/gst/video/Makefile.am -+++ b/gst-libs/gst/video/Makefile.am -@@ -111,8 +111,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE + CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) +Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am +=================================================================== +--- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am ++++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am +@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS --c-include "gst/video/video.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -282,7 +282,7 @@ index ac64eb3..342c8c6 100644 --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -139,8 +139,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -293,6 +293,3 @@ index ac64eb3..342c8c6 100644 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) --- -2.6.2 - From patchwork Thu Mar 8 18:17:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131046 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51892lja; Thu, 8 Mar 2018 10:26:38 -0800 (PST) X-Google-Smtp-Source: AG47ELs4tRdcilX+1YQquPaX7GSzmh2cHGtZQ7VG8hoeshZRocwS4hGdZi4UOW8OL+pbZwyhoFvs X-Received: by 2002:a17:902:70c5:: with SMTP id l5-v6mr4860762plt.13.1520533598505; Thu, 08 Mar 2018 10:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533598; cv=none; d=google.com; s=arc-20160816; b=BhvplWYaVdssuQfa7RtHr7WodqkuuUZzq2bXf5TcWsC85bvFQ1S5IC7Swa1RQguRhd EXhLSb1PHMdhI8jGZwT1s8rqPx6Pw5B+dN591VKxGELl1cCPQEgIWirDgX7TkSki5C2r TeVL0D5avJPlfaJFT/gZWogef/l51c/Zf4eFI01lU0eSJboTn/gN/Cmhw6320jVGaKzI lfEmIpk+qeurghqnQZtCILY6EtdNFrZHEzLnpPND+f8BJgr8zhsfchjjJoIzJGmWimgk XREQXY8ZRW1zLnWJ/ruv6C+CcYx3flqFjhhGrFBZdWfNw9ndj2ocTS4JB53DfB8mJt3W Vgxg== 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=GrAEE8ze+qumkSWsHIlzeTAt+FOID2de4W9a4m7qEqU=; b=u95v054exN/adrqhpxlXpISvSrdOMYcJwJq6Di9X6DSYvZUYKJoiZqJUTJv2y85H+m MXjupEeghlG5vHx3I0sBo7yHc0ClzEF01J1pO4DPdOQOgxDF/WPwW5COvqiTblOK9G6Y YfytF/emeCr03x57jOgLeuPeNUZL6ZCqY7HSZz80DNOt5xO1kygbYdvoTxxaKro4Lkte NLkoYXLsNMN7EIaNxNK0zrUdLpmaTeNXlHfwiFKXd4Yqame1R5MwN04MBNCSwKybfIL9 83c1dbb5ETd8GGec0Ea4Xuwd2i3h9kXRt8BJaJ49ozjTTgpMG/NB9DzEnhJegWw+PdLh gq/Q== 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-v6si4107960pla.271.2018.03.08.10.26.38; Thu, 08 Mar 2018 10:26: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 2EECB789D9; Thu, 8 Mar 2018 18:25:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 8993978980 for ; Thu, 8 Mar 2018 18:25:01 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053769" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:02 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:35 +0200 Message-Id: <20180308181804.31261-13-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 13/42] kmod: 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/kmod/kmod/avoid_parallel_tests.patch | 13 +++++-------- meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch | 15 ++++++--------- 2 files changed, 11 insertions(+), 17 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/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch index feafcb9b7c6..5f45fce932e 100644 --- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch @@ -11,10 +11,10 @@ Upstream-Status: Inappropriate (disable feature incompatible with ptest) configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index eb0f9d1..a539968 100644 ---- a/configure.ac -+++ b/configure.ac +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac @@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE AC_PREFIX_DEFAULT([/usr]) @@ -23,7 +23,4 @@ index eb0f9d1..a539968 100644 +AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) AM_SILENT_RULES([yes]) LT_INIT([disable-static pic-only]) - --- -1.9.1 - + DOLT diff --git a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch index 8161d6128d3..5d9d40c387f 100644 --- a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch +++ b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch @@ -18,12 +18,12 @@ Upstream-Status: Pending libkmod/libkmod-internal.h | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h -index 0180124..100b40f 100644 ---- a/libkmod/libkmod-internal.h -+++ b/libkmod/libkmod-internal.h -@@ -9,6 +9,10 @@ - #include "macro.h" +Index: git/libkmod/libkmod-internal.h +=================================================================== +--- git.orig/libkmod/libkmod-internal.h ++++ git/libkmod/libkmod-internal.h +@@ -10,6 +10,10 @@ + #include "libkmod.h" +#ifndef O_CLOEXEC @@ -33,6 +33,3 @@ index 0180124..100b40f 100644 static _always_inline_ _printf_format_(2, 3) void kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {} --- -1.7.10.4 - From patchwork Thu Mar 8 18:17:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131047 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52053lja; Thu, 8 Mar 2018 10:26:47 -0800 (PST) X-Google-Smtp-Source: AG47ELtOieeA4+Mk5Ua3/iW/zsHYgil21DbTdh0XJrZNOEfErYSHfJdPxWu/36KpK7XlQzLNmtqu X-Received: by 10.99.119.72 with SMTP id s69mr21743471pgc.224.1520533606907; Thu, 08 Mar 2018 10:26:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533606; cv=none; d=google.com; s=arc-20160816; b=MT0ycRaFtZ9IXHJQrxlY5GOD2+LZbs86uybDmVcXFx8gN0Ziv0rqJkpOtYT4vGTU1s cGvenrQuAoHetkyMKaMQoJPzop6+TaYRoMj7bNGASO+TfT1pu/4cTlxJC2ts54ckAyEh 6vE2gjgA/I7uxfBrrmHpvnRRhGE2wda3XFQwJDI9Jsd/7dT2TkfX677Eiz3F3gw+flzT BP5nEk/STuYSKNMLX7DDGIgGuaeCZAlcd4DoPLPuYtsvSljSqApnSWMr46jvzndBkGls G8aMa+vRQ+uoiz4XzGv+S3B3ZZ1D9G9gONo7EcZx84l0Kz6LIrp2mjhMXlc+RWI4Ej8c W0dA== 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=ZezPjv+07Qe+MPF20+KV5WSgiQzFK3fmxZB2+0rGt8w=; b=kSriu5OFWk+6fF25tIb7ZnpQhUIo69sYyzHErqgMCv3CfR+qoPZMX35DE1qe9TgHK8 FYxVbQP6XMb+gt2IUpztwtHLz8vQKRr+01sqESi0Yvog8w6svG9O4wXGhDDXPdfILVxZ ahNdUsPJIuYHTo509kkLaK7mJ/n6Lg1UDRESnBjDZkb7DNcCr41AZ61IGOKuwmH6s1Zt d3wI5PHqQi4lzqe01dZajsj+wkhQ+qUPEjJN9/HvvbH3m4j2pi82OpSb7qjBEzP043xr H14mkKUhaM+FRHXCC9ux+QHeopgqf6A8PCcb26beHDtdcDgEkx7OyIWCEIA+0o1uFFTO Imhg== 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 u91-v6si12236136plb.341.2018.03.08.10.26.46; Thu, 08 Mar 2018 10:26: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 41AEF789E1; Thu, 8 Mar 2018 18:25:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 1535478980 for ; Thu, 8 Mar 2018 18:25:03 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053779" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:03 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:36 +0200 Message-Id: <20180308181804.31261-14-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 14/42] dtc: 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/dtc/dtc/make_install.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-kernel/dtc/dtc/make_install.patch b/meta/recipes-kernel/dtc/dtc/make_install.patch index 1120617e7be..ccf17b38fdb 100644 --- a/meta/recipes-kernel/dtc/dtc/make_install.patch +++ b/meta/recipes-kernel/dtc/dtc/make_install.patch @@ -2,11 +2,11 @@ Upstream-Status: Inappropriate [configuration] Index: git/Makefile =================================================================== ---- git.orig/Makefile 2011-11-02 14:52:17.243104779 -0700 -+++ git/Makefile 2011-11-02 15:06:01.555104982 -0700 -@@ -161,8 +161,8 @@ - $(INSTALL) -d $(DESTDIR)$(BINDIR) - $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) +--- git.orig/Makefile ++++ git/Makefile +@@ -168,8 +168,8 @@ install-bin: all $(SCRIPTS) + install-lib: all + @$(VECHO) INSTALL-LIB $(INSTALL) -d $(DESTDIR)$(LIBDIR) - $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) - ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname) @@ -14,4 +14,4 @@ Index: git/Makefile + ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib)) ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT) $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) - $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) + From patchwork Thu Mar 8 18:17:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131048 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52185lja; Thu, 8 Mar 2018 10:26:54 -0800 (PST) X-Google-Smtp-Source: AG47ELu0+v+cjGPxer2IQVDBGVJZBmWpvjDiAbqEWFfRDD6SiLVKOJ7ik/A3cJWh4vUOLowqaryH X-Received: by 2002:a17:902:8f89:: with SMTP id z9-v6mr25226088plo.370.1520533614652; Thu, 08 Mar 2018 10:26:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533614; cv=none; d=google.com; s=arc-20160816; b=roPvEVO4HhyNUQitldBtKpESfi2HsC3zip3024XpvUQHj+mm0LzjIBMwgE4QoZTaZ1 2P11Gvz5nlZhi/YfvNycqK0mNpqcQ6hoMwAE6l7dFVjpVt/WfI8q/x3IDoP2Pl8B1rxS b2YkhThE4PF3Rx5tpxpPS80DHOvrWISal1DxZdpJHw1LzGQZ6KlII1ZerN9ZSrQHQXCW L7K5ZhpdBB7dYKn01ISZJJj1WQ1nbLruQEFwa/NgBPwCOquE7pa1kOLvo83YnEb1PE05 RIlH4Ucm2zdzsei5cVVdsdcHSyD2hDlPhUnRtcixvO9KAeDq22RKhAmJIlNcqeHQVgtO 7pHQ== 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=ld24bdCbsJ+Z6w1uY7xZZ+J01I2l3g4PFciTv9OZ84g=; b=fvYDSkyOqyp/4TcfkowdsdsFnQdPnjfFV/cPVdds9BFOEMP06QLn4NiOWeX8y40lyE liqgcHUccEShw6SZHn+B9GjXomWx4YtGX8x+xAndkOK5LPvhs8mSB55f+LKA3kx+KX6i fk8ft6GLRW2oYboaZc2v0yN94fBEWpI9Qerl0G+uk8iPcWLtTAQURNS9x3rDeGgW0i8j Gny+NhqvAE8cLE5gOe7yQYPKtAEMbrxrrW1ILtui0QR85+qLH0vPbqTtv7QkXdWXBPpO 8vm733GYKLsn1fPcjeYqXrZnI/LlzfCDrl2iT2cpUdXVcRpFMV1qY/+cqybgEw1Jp7f4 0UFQ== 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 z11-v6si14866150plo.811.2018.03.08.10.26.54; Thu, 08 Mar 2018 10:26:54 -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 522BE789E9; Thu, 8 Mar 2018 18:25:24 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id A61B47898A for ; Thu, 8 Mar 2018 18:25:04 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053826" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:05 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:37 +0200 Message-Id: <20180308181804.31261-15-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 15/42] lttng: 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 --- .../lttng/lttng-ust/lttng-ust-doc-examples-disable.patch | 11 +++++------ 1 file changed, 5 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-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch index 0f18c5d9f1b..bff852799d0 100644 --- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch +++ b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch @@ -6,13 +6,12 @@ recipe anyway. Signed-off-by: Tom Zanussi -Index: doc/Makefile.am +Index: lttng-ust-2.9.1/doc/Makefile.am =================================================================== ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,4 +1,4 @@ +--- lttng-ust-2.9.1.orig/doc/Makefile.am ++++ lttng-ust-2.9.1/doc/Makefile.am +@@ -1,3 +1,3 @@ -SUBDIRS = . man examples +SUBDIRS = . man - dist_man_MANS = man/lttng-gen-tp.1 \ - man/lttng-ust.3 \ + dist_doc_DATA = java-agent.txt From patchwork Thu Mar 8 18:17:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131049 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52324lja; Thu, 8 Mar 2018 10:27:02 -0800 (PST) X-Google-Smtp-Source: AG47ELuhO7YYwySv9YWedPLdyUiVCvKmExReVCrz2ReLOviefRzrx7f03bjy28yLS2NI6DIM97+q X-Received: by 10.99.147.11 with SMTP id b11mr9495209pge.379.1520533622411; Thu, 08 Mar 2018 10:27:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533622; cv=none; d=google.com; s=arc-20160816; b=VWv/5zhsrrRNWDW1PTZz3wVLYoe7VYUivvbI4xOIA+98crmq0InZs/WfodWsIzh9wa lwc5oKIXWvlUiDvJTp5qjv5Jthf/4I8opc0nLSFqwF+todSpOhodOwmg3KGPo+loDvQj KzJC9z3IWaVlSH8xYEzeQdvjzSdIKe4sqN4Y/KMETxBckT2MGISXuTjWtd+AOJdq6h5u xy15BaDGMAcLVAaZ3gn9WAYCLYBK7CxoIykqHk7kN0ZLKtn47t818AfTvqSRSEJNPtBQ TEHL/Cz+BkPypa4WOcWDYYueY0FTxbMMgwiWXJ//NqOYyZBf27SPwaGCurTaW+rYjZVE EF4Q== 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=30lgULiPDpGDO7djEyqIZIhRhs41cxLvS1vL/Cs7Q1k=; b=rZcRncOLcdkhhngizdEkRKCrNkR+UxMCkEkWZuDQvjAbiSKrzFClfciCtJnzezPoLH XSG/LWPw2btejhFY91BZREvNfwW3EmqMSQj17+e927zPWL0aJiA/+5FNr5fwvvF5mBuC KuvzodUXZE8xv8IRw5ltBxOsA8JCNokNjue2J3ghazUKr3qmH+8QzqdRZT8BnNMXDbGB 4GveSHjR4rgcszN4ffj0dU4Tc3Zhke6rsr/UrnqWnefhsYM4AtrcFrF51iOTIpo4HXQR fLZLSYc9qPyMI22qKaNKxP//tls0wumIzqYy14k4d0fa2DLrrpGY//1HXgo0wj8JAJnp 6dWQ== 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 7-v6si13919804plb.573.2018.03.08.10.27.02; Thu, 08 Mar 2018 10:27:02 -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 683ED789F0; Thu, 8 Mar 2018 18:25:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 3E31C78989 for ; Thu, 8 Mar 2018 18:25:06 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053862" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:06 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:38 +0200 Message-Id: <20180308181804.31261-16-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 16/42] wayland: 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 --- .../wayland/wayland/fixpathinpcfiles.patch | 3 +-- .../wayland/weston/0001-make-error-portable.patch | 22 ++++++++++++++-------- 2 files changed, 15 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-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch index 9fb12522843..ad3526d9845 100644 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch @@ -21,8 +21,7 @@ Index: wayland-1.14.0/src/wayland-scanner.pc.in =================================================================== --- wayland-1.14.0.orig/src/wayland-scanner.pc.in +++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -1,8 +1,8 @@ - prefix=@prefix@ +@@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ pkgdatadir=@datadir@/@PACKAGE@ diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch index e2213aca60c..0671a450442 100644 --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch @@ -16,9 +16,11 @@ Upstream-Status: Submitted 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/weston-error.h ---- a/configure.ac -+++ b/configure.ac -@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], +Index: weston-3.0.0/configure.ac +=================================================================== +--- weston-3.0.0.orig/configure.ac ++++ weston-3.0.0/configure.ac +@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], [[#include ]]) AC_CHECK_HEADERS([execinfo.h]) @@ -26,9 +28,11 @@ Upstream-Status: Submitted + AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" + # check for libdrm as a build-time dependency only +Index: weston-3.0.0/libweston/weston-error.h +=================================================================== --- /dev/null -+++ b/libweston/weston-error.h ++++ weston-3.0.0/libweston/weston-error.h @@ -0,0 +1,20 @@ +#ifndef _WESTON_ERROR_H +#define _WESTON_ERROR_H @@ -50,8 +54,10 @@ Upstream-Status: Submitted + +#endif + ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c +Index: weston-3.0.0/libweston/weston-launch.c +=================================================================== +--- weston-3.0.0.orig/libweston/weston-launch.c ++++ weston-3.0.0/libweston/weston-launch.c @@ -33,7 +33,6 @@ #include #include @@ -60,7 +66,7 @@ Upstream-Status: Submitted #include #include -@@ -59,6 +58,7 @@ +@@ -60,6 +59,7 @@ #endif #include "weston-launch.h" From patchwork Thu Mar 8 18:17: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: 131050 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52456lja; Thu, 8 Mar 2018 10:27:10 -0800 (PST) X-Google-Smtp-Source: AG47ELtrmygyTXxWD+qdZZKZCwtSZoeKABZ4BBn0mJ3rl0EG/EI7XEMI8gMkDdXXbozW4jJh0a7P X-Received: by 2002:a17:902:7797:: with SMTP id o23-v6mr18872014pll.427.1520533629892; Thu, 08 Mar 2018 10:27:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533629; cv=none; d=google.com; s=arc-20160816; b=MFLiBYI77djbcy2JYeCTYASoYFFslOojaW51N/79eKcbHU3zhh2hLZkaFcnvJDKpOn N0r2HJ4RfVFp3fWO8zm89iyicLFDDI0UoGNVJhTy+tSHaL1+aAPAi0aognlcLJFuZLAR c5VUnFxWecGdQZGHMS0NQSIYQZ18Dge0LEtdseFa+H+39sVwqoLdiMQA7CBruuQ/SyEa GIx6RZ5cIBGaxo3XcorAkjB8Oc6Z2eBrXn3O+9VyEd4Cfi/0Z/E7//IQwMCOvUZMJ1MG mbhdcTUGD+OH0WmVBGBL/8ddvN0529FqFHnHpgvdCQNR/gNwxXqihQlTbAAPVqg2Jgfh g4Wg== 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=SX6rNxAPwecgd4JwLyvqRAKp8qfT1Fj3L8Ts0WIBNUc=; b=hcD5gpRWQNeLFmjgnPI2UpfocPb+HQsnI40URn7g7qM1Ty5oQpjv6TRNuD6DM7cqhd EQhIBSxRyOHeZWluc0DSgOhopbSasrJzoEGrXzPbpZFYvZ+pKObl4uWR/Q5N0UyMOWXi AdEKvIFoJGXn4XJ6zDEphribPmatRQ38n0crt2dRtCdD0JpyZVzgSYiKoX6Vsuj6DGho zQRWntgSOIqLRE1QPHqzvYT02tZ1tKWho515y6GL6/xm2PVArXnMCq/W+6q27KGTaTmn zX/3vdtkmd+V9TZtsnNZi62acYnIjJ1vhYDoi3/ehbX9Mn1YctKLSrw5KjCAU5U3pPKS RFXw== 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 e9-v6si14937250plt.685.2018.03.08.10.27.09; Thu, 08 Mar 2018 10:27:09 -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 75DDB789F2; Thu, 8 Mar 2018 18:25:26 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id CD6817898A for ; Thu, 8 Mar 2018 18:25:07 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053877" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:08 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:39 +0200 Message-Id: <20180308181804.31261-17-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 17/42] clutter: 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 --- .../clutter/clutter-1.0/install-examples.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-graphics/clutter/clutter-1.0/install-examples.patch b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch index 3b6a70ef0a7..ce9ab3a2489 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch +++ b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch @@ -3,11 +3,11 @@ Install the examples to $libdir/clutter/. Signed-off-by: Ross Burton Upstream-Status: Inappropriate -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 4b9b449..232cd19 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -38,6 +38,7 @@ AM_CPPFLAGS = \ +Index: clutter-1.26.2/examples/Makefile.am +=================================================================== +--- clutter-1.26.2.orig/examples/Makefile.am ++++ clutter-1.26.2/examples/Makefile.am +@@ -33,7 +33,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/clutter \ -I$(top_builddir)/clutter @@ -16,3 +16,4 @@ index 4b9b449..232cd19 100644 +example_PROGRAMS = $(all_examples) EXTRA_DIST = redhand.png + From patchwork Thu Mar 8 18:17:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131051 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52590lja; Thu, 8 Mar 2018 10:27:17 -0800 (PST) X-Google-Smtp-Source: AG47ELvB+KllZLKE43Lz3QvWy4zmFnyklCdIuZgTdok760hAoeBuzj2RvhKFwGuXSvJuEJ7hL8Hz X-Received: by 2002:a17:902:bd41:: with SMTP id b1-v6mr24651483plx.147.1520533637370; Thu, 08 Mar 2018 10:27:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533637; cv=none; d=google.com; s=arc-20160816; b=kZ+1MujLrkjA+VtTWTcvq/iF7stMrDa4blj3Kqv/B+e3hGc58xoigpjjzeOwqnRvgj cf9yPZQiWUrJ0IHULU6Bc3helVmlxyF2mkdao+3+WLMJ/pH+RRMSlPPOjDroG1QO1uNZ Rd3MiZfCRaLfERkmn1d4IsUVFqAYoGiamKkeYYY6/B/pv23GFSO689MSXnuRwv3Mnpr9 VJRg5WnR3VBeE0shs7IIL35A4zEQCj36SMQHvGH2LnhSYQPeqEtfkPqWxuggDd+JSIn2 yxEZ5Hzaz7Y+qJzgQp7fbXEQ2QM//DEfHg6xTRfa6YiWfSyY2spvy4OGawpF40lO7G5o OL8Q== 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=uZp3C4+aoqcLttfjcsGDQ0rRFRFvntCp1OFzEbPgego=; b=rdelO2evBArEDwMb37VbC2eaUDq41uK/sCkuNIYfiLgzi+vL7/ByWjLogbbg8rlJeE crIq2w3Bw/ZxAYLCZ3CwEBQTdN/ErXPa6hj+wRcCB7ls1VtvR2U+nomoIdKi7ZlcKoVr PIDgHLa2clycPBLfpKf0iKgLpGm9jPtNoi6dSeFY3Cxs7eRKfAB22q+6VKExF/x94rZI tCXLZRiZmvTR2P+Po8vbcyTVSIkIQs1/JXoqlTdYRPu+S0jYclJxT7OTD5LsjACvJLrT 7a0uSVriyS5j4Ir8HohaTPJRfcD+8qTPHS/5+upOEzYVYoPydFYAUOYiDXELxD3ORYbi 2wjA== 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 b16si7826189pgs.810.2018.03.08.10.27.16; Thu, 08 Mar 2018 10:27:17 -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 9149E789FA; Thu, 8 Mar 2018 18:25:27 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 59F6A789A0 for ; Thu, 8 Mar 2018 18:25:09 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053890" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:09 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:40 +0200 Message-Id: <20180308181804.31261-18-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 18/42] xset: 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: Alexander Kanavin --- meta/recipes-graphics/xorg-app/xset/disable-xkb.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-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch index 97d13a30df8..a97c7b72fac 100644 --- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch +++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch @@ -4,11 +4,11 @@ Upstream-Status: Pending Rebase for 1.2.1 by: Yu Ke -diff --git a/configure.ac b/configure.ac -index 81c3ae4..26601bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, +Index: xset-1.2.3/configure.ac +=================================================================== +--- xset-1.2.3.orig/configure.ac ++++ xset-1.2.3/configure.ac +@@ -53,11 +53,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include ]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) @@ -22,5 +22,5 @@ index 81c3ae4..26601bf 100644 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +fi - AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), + AC_ARG_WITH(xf86misc, AS_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"]) From patchwork Thu Mar 8 18:17: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: 131052 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52694lja; Thu, 8 Mar 2018 10:27:24 -0800 (PST) X-Google-Smtp-Source: AG47ELt+k0XOS7ocAKn0lYOIbaxhEGKjnU4paIA+eR75wd6fl8nZQjb/ZlkDCRe943lPfU6Fd6rA X-Received: by 2002:a17:902:b690:: with SMTP id c16-v6mr25199957pls.264.1520533644238; Thu, 08 Mar 2018 10:27:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533644; cv=none; d=google.com; s=arc-20160816; b=PafWLW4G1toSW372zKT5gFSvyDxeyjzX7VaO/vjkcse1kmXuMT6X6YuFvgRYkeQC5K ihwO9UTQfoLFFLRYMK/atjVAbVErSUe/7/DIii0mB+Hbedo/IonkucPdiLY3ia8V5ZYL VvIqEl7HMBjUk9VaUmo5XMh89dOXTuyoKlXRcB/0N/5/O0+xFxQZKzlZUZaOr6cwvuLl QtBJUKXrmuSc6QAWTZW+ENo8WQdh8WsOvOEx9yH6/xW4dtFwfPOZ/SvSXWnmwM+jfLxN ucN4ZzlSiHupQwgjy1XsNMFwmLDH8djrQg9DtH/ChDAMJ0hCbmYiUqjh9nwFX8YIm1Db THPg== 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=DhMKjBzzII9P8s+R6oIF9AAtmKrNZJnSvXQL+bSjtRI=; b=kpDlsh3WnRb1v+fY1bAWtXxQeXAzAPLyrWEULx4nOn75M0BZ6slpF72bpGVvGgyaR0 ehtht6OcszJoGi6V6MOh7ZqjBSUR7Bmv8VtbrmcaWfQoo1pJnaAC0qNTnJJ2s/IjfoS2 v2ZFKl2QEGbtt25FnwV7SnPUHSgVMY2pUC9NRYQCpTZS1ocnAcUoN39w7LFXJdgJtfmh G0aBBnpVo7ifICctp9Mu7MbBt7vdviZe54ULuOsbcGWPwfBuUdtGlYdW+zx/FgWeDKY3 dv9pkL9t8HRwic5pgtvO4VVaDlJklAI4odPhSfhezGlNvVzw2RSP43l5DkOZjKpTpwSU 35fA== 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 x3-v6si15220709plb.738.2018.03.08.10.27.23; Thu, 08 Mar 2018 10:27:24 -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 B1961789F6; Thu, 8 Mar 2018 18:25:28 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id DB2B6789A0 for ; Thu, 8 Mar 2018 18:25:10 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053903" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:11 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:41 +0200 Message-Id: <20180308181804.31261-19-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 19/42] at: 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/at/at/makefile-fix-parallel.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/at/at/makefile-fix-parallel.patch b/meta/recipes-extended/at/at/makefile-fix-parallel.patch index 932a4c0bfe6..d6056dceffa 100644 --- a/meta/recipes-extended/at/at/makefile-fix-parallel.patch +++ b/meta/recipes-extended/at/at/makefile-fix-parallel.patch @@ -15,13 +15,13 @@ Signed-off-by: Robert Yang Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in -index 2a9b918..aa7c04a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -75,7 +75,9 @@ at: $(ATOBJECTS) +Index: at-3.1.20/Makefile.in +=================================================================== +--- at-3.1.20.orig/Makefile.in ++++ at-3.1.20/Makefile.in +@@ -76,7 +76,9 @@ at: $(ATOBJECTS) atd: $(RUNOBJECTS) - $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) + $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) -y.tab.c y.tab.h: parsetime.y +y.tab.h: y.tab.c @@ -30,6 +30,3 @@ index 2a9b918..aa7c04a 100644 $(YACC) -d parsetime.y lex.yy.c: parsetime.l --- -1.7.9.5 - From patchwork Thu Mar 8 18:17: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: 131053 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52783lja; Thu, 8 Mar 2018 10:27:31 -0800 (PST) X-Google-Smtp-Source: AG47ELsiBhboCsjWeqIZc69Nl2RRyBn7RtiPctSL8o/QsLSAv8ISCD2YAM1w0jji4YRCpK898Esm X-Received: by 10.101.82.10 with SMTP id o10mr10770441pgp.271.1520533651426; Thu, 08 Mar 2018 10:27:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533651; cv=none; d=google.com; s=arc-20160816; b=nWVp1cs44k+2y89rHzmrJJCtkot2gj/fOyVR7FNOWYzdQZoh/9AcuSWOTKMyRauP2v TEoG92OYy3qFpvJm7ul9etIMDy7X/UQocy4ZpLQ25wEIlxkVOIux9q+gVGLc+ChRvLMI cy2pVjVxIT7BBX8XjE2w5dTKOqE0n+xRI3uVhHG0LHSf7LSIBrv3A2rgQTDrl7UjibLW 7GQNiUYj5h7Dsai3Oe8+cs8a6aie8YcFF+qW4fUNwXopeQNuHwREi6Xnq0vEAlH9LZJc EvGFABrxwyIa/o6aPG0UIFcRmDr8Yy5ZO4xyWW9K2x6mDUTri/ooK/ltFp2ypunvVSjl TbXQ== 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=3pIli8HVoHldsgxlIv1wlH+67GBN/RMtA2efssd7hJo=; b=eF5IaZV+TilJ9AHxgfLeU1SX2Do7okZp4QUENpF67FyYZoYeHUTpmew3gB9jD9uwFS vdx6YDrUXIgBB/J1OOhP1metmLLXhfLpyS27KoAdGFOXAsGcxtdgvUAK76UwAhjbCanU HbbUlyFNH+KpiU0SO+EWjcDm3utziQhrIW8UH+hDRbEmxcAKkzPItsSHLy0I2fgyB5cf aWOLkRH80HJMbS3d0ARBSuULki0JklmdV6NDA6Qq0KdBAnyqQ6fZrYZB+dGJ+fijZ9rE qjsDWriu9RuQ0rse6JtrKpvJqtAdQg4+7GI6jrU0xqNXuGd9OtFGTb/XIlBAr/UA3eSj QVGw== 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 3-v6si15023597plr.440.2018.03.08.10.27.31; Thu, 08 Mar 2018 10:27:31 -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 0AE4E78A05; Thu, 8 Mar 2018 18:25:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 681A3789B4 for ; Thu, 8 Mar 2018 18:25:12 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053914" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:12 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:42 +0200 Message-Id: <20180308181804.31261-20-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 20/42] bash: 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/bash/bash/execute_cmd.patch | 10 ++++++---- 1 file changed, 6 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/bash/bash/execute_cmd.patch b/meta/recipes-extended/bash/bash/execute_cmd.patch index 81f8f0a9cd5..9970b4d8f93 100644 --- a/meta/recipes-extended/bash/bash/execute_cmd.patch +++ b/meta/recipes-extended/bash/bash/execute_cmd.patch @@ -1,8 +1,10 @@ Upstream-Status: Inappropriate [embedded specific] ---- execute_cmd.c.orig Fri Jun 3 13:34:42 2011 -+++ execute_cmd.c Fri Jun 3 13:36:41 2011 -@@ -2202,7 +2202,11 @@ +Index: execute_cmd.c +=================================================================== +--- execute_cmd.c.orig ++++ execute_cmd.c +@@ -2459,7 +2459,11 @@ execute_pipeline (command, asynchronous, /* If the `lastpipe' option is set with shopt, and job control is not enabled, execute the last element of non-async pipelines in the current shell environment. */ @@ -13,5 +15,5 @@ Upstream-Status: Inappropriate [embedded specific] +#endif + asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) { - lstdin = move_to_high_fd (0, 0, 255); + lstdin = move_to_high_fd (0, 1, -1); if (lstdin > 0) From patchwork Thu Mar 8 18:17: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: 131054 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52899lja; Thu, 8 Mar 2018 10:27:37 -0800 (PST) X-Google-Smtp-Source: AG47ELtka96ZVEU0wHtnf39q2CnphbPVOUo8a1ES0L3YloKC2iXDs1YlwuQ4Qqyn/5kLFjZH0nbC X-Received: by 10.101.72.69 with SMTP id i5mr21125600pgs.78.1520533657642; Thu, 08 Mar 2018 10:27:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533657; cv=none; d=google.com; s=arc-20160816; b=kjdioUgpYWAjeWOggQ6Z/LmwKnjgsehRWGd2fp+k6aRpUvJSCcRlv7Xy63wYng2nvV tTyLqxatUTMmWc32UcWqG8PnTxIFX/jx28orrJA86KHlr9ZRB+JgRX4t7N1rjaJp9CD/ +JFn9trgo26PCYJDB/IBdpuLWXevad8oWSdsX46XyucdewBy6DzlmPvxTJChp0okty1D piKcmsRh7CwnG2IpZ+HYI9zXBbp9N01b1pWu7V0JfpzvkMeG5MjLQfrtDPrklJxsGpzj JhUbak3n9yBmksu1JYkLpsECa1cF/mU9cmHrbK1dFfjq5svyjdwZ7n7Uc7M4l9ZfZQr+ 7mzg== 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=BVr5QxCdGwJ/WO21Yquf+oYmNxdmteCdn9cAH7mFiT8=; b=xeStDD/JL5w7HYlh3kZL/IBeww5hoJyKXmP2UXm98mu2qIiM2im1eBnWazSfrUdrot si/W/OJMCQC25nfLNHxvl924FmELIWJpQL7RSnz+Un4dDXrH6fChaDFM+PHrDxKMLRMm AtJyc3gq5Jynfjfrwg14TjOIATajkHUCdhtbS6TO7Oiiduzvkm1knWiUueRFuW/w3uGi w98OEkaKagGZ8hJ+TGodDX6Q3V5YAHwC4alxmI3hR081BndMtVwy3KcqleM4armWKDM6 SUSn1MW3pTE26N2Ii07rg/iTY7QY9b9rTtaBTrj5SW92XH1vR31VlErAL/2mxVBToXqX XPBw== 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 h91-v6si6232130pld.14.2018.03.08.10.27.37; Thu, 08 Mar 2018 10:27:37 -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 3247278A08; Thu, 8 Mar 2018 18:25:31 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id E8F037899C for ; Thu, 8 Mar 2018 18:25:13 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053921" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:14 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:43 +0200 Message-Id: <20180308181804.31261-21-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 21/42] 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 --- .../ethtool/ethtool/avoid_parallel_tests.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-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index bf66267e81b..dbf7142f18a 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -5,11 +5,12 @@ Signed-off-by: Tudor Florea Upstream-Status: Inappropriate (default automake behavior incompatible with ptest) -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-28 18:19:13.513980977 +0200 -+++ b/configure.ac 2014-05-28 18:19:21.129660215 +0200 -@@ -2,7 +2,7 @@ - AC_INIT(ethtool, 3.14, netdev@vger.kernel.org) +Index: ethtool-4.11/configure.ac +=================================================================== +--- ethtool-4.11.orig/configure.ac ++++ ethtool-4.11/configure.ac +@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p + AC_INIT(ethtool, 4.11, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu]) From patchwork Thu Mar 8 18:17: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: 131055 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53016lja; Thu, 8 Mar 2018 10:27:44 -0800 (PST) X-Google-Smtp-Source: AG47ELtqsLL2oeBeEohGlElX61YgmMcBCqAZLBIKubqCoiuhuoaUm0iAELZWM48hZ/9+v+yImMG8 X-Received: by 10.98.90.196 with SMTP id o187mr25964549pfb.170.1520533663990; Thu, 08 Mar 2018 10:27:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533663; cv=none; d=google.com; s=arc-20160816; b=cu5P4VcY0c1PowWjzl+7vdMCRJdTWORquxvD5bEuyzdZfF0iHZo8qSDMR/dOdvqNRB 4NPSJi2inUIMV/f6IeTmvWQBxRCaHIDywMmmGrIs+2auxDj9VlaavrVJ5a8wi+GRBk6U ilmQ15OarUUvas9ATLqkcpRbcYzMlLlxlKkHW31atots7K8EDtgX8qw8IPnimXe+rUZG N3IRs+JXN+GDV5xyl9l/L5NEJcq5Evkwqwt4DfM2CRybZpckMe+3vtSsmdbkhd+fj0hl xI9IUbGvDYku0ygcYX3HWmS4HCuQzvSaD1puGp1G8l8ad6YJ2jM12iBpuSd+72CqlxYm OZWA== 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=QtEM1eey2En9dz23Ky6eJ+g+E8P6pxV784ZkXZh2sn0=; b=UyOnaI4OJbpdoVzrrF8AaDzsk7Kr53LIEjjs9U1yGYGlvMsPtt9B7UX+O1axZlGDVF DOR7YwrULJnr+wgcDEJB538N8REhJeK0+SVSggMoINe9EA8N9Mi+dLuuhPmAQsjR/pRp LtxliscvyokGQbIIotqtFmuqtY9UL3o2e4dG4rOzL0ODMrD6owJtRSmvttV9chDvl6u0 15mDwMm3R66V7lgrvR4KYz1L4nn6NVTijj5nxiKilvFoOmy/aCtxfyvSfstTUUxlB3fB i3FYrVHee3XArD+oYKGDG6zjdAu4NCyCFKYlx38M2S4D5OcsitgejEYqt2ACI+/XiEe1 5s+A== 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 p1si13125224pgd.328.2018.03.08.10.27.43; Thu, 08 Mar 2018 10:27:43 -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 460E878A0E; Thu, 8 Mar 2018 18:25:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 75ED17899C for ; Thu, 8 Mar 2018 18:25:15 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053936" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:15 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:44 +0200 Message-Id: <20180308181804.31261-22-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 22/42] ghostscript: 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 --- .../ghostscript/ghostscript/ghostscript-9.02-genarch.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-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch index e28a949bf71..b4c14ea231e 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch @@ -12,11 +12,12 @@ Signed-off-by: Wenzong Fan # Summary: Generate arch.h for ppc32 # -diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak ---- ghostscript-8.64.orig/base/lib.mak 2010-02-10 10:30:02.000000000 +0800 -+++ ghostscript-8.64/base/lib.mak 2010-02-10 10:56:21.000000000 +0800 -@@ -67,8 +67,8 @@ - stdpre_h=$(GLSRC)stdpre.h $(stdpn_h) +Index: ghostscript-9.21/base/lib.mak +=================================================================== +--- ghostscript-9.21.orig/base/lib.mak ++++ ghostscript-9.21/base/lib.mak +@@ -73,8 +73,8 @@ arch_h=$(GLGEN)arch.h + stdpre_h=$(GLSRC)stdpre.h stdint__h=$(GLSRC)stdint_.h $(std_h) -$(GLGEN)arch.h : $(GENARCH_XE) From patchwork Thu Mar 8 18:17: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: 131056 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53211lja; Thu, 8 Mar 2018 10:27:57 -0800 (PST) X-Google-Smtp-Source: AG47ELsvdM65qLJPVN8ydP+7sJNnmhih6sYhn05HYV+4QmNiCg2sIwQg4cjeE9usqoKzeTPiXeRu X-Received: by 10.98.174.16 with SMTP id q16mr26940915pff.92.1520533677137; Thu, 08 Mar 2018 10:27:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533677; cv=none; d=google.com; s=arc-20160816; b=SJZWXvJvuZGogbevZjmIv4FBSuv2Ael5ZrFcdNPT2AgpP0oUgxRQnXUURWtCSiE4Ft bSVOvTfroybr57n4TBmWn+nR5jf8dODsP2KrVA6RdAjf6GDAUlOTj7ydSO1ow2jwSB1k Uk5hO9uhKJaew66352NLVryVZScipEx1HkNSdOxXet0YMOLQ7MKLfixzunOk7Zwi6JFz b6Sh/IR4IlEVloDnBjLfv4SljAmUHMB/wqqp+qIpT+Z7lYkpe00VVDjoFr0ZpBWgjPJ0 SB3eptJLHLJaKPOhg5Gn7xzJi14fNESij5/PShJBm17UCIvIRKF8krnLlJl2r2U0wKvN E3ew== 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=NZJT3skPhP+q0FAUACok2MHDUjvv/Hd0THTJC7T8P5k=; b=c38dNjS44v6WKl5yznzlWMg4xlT0qbevxVwHzgE1MQpddFP9tpHaOp8WF56+VX8LRR RsNGxxqrB86uzmMuFfXEawLoC56ygD9QnDgvB7VJhuamzh5e7g8JsxBoJmKokQ/fwGhu hR8zg8bg4VgZ4feIYKQ373LwYC85zJCAqevsnDwJ9L299QO4ZkIX1d/nP7hE2Cw9FEFJ rzF9GSBiQvfZF6sfVlPTTwJqouvi6wF5JOwZfFwWYzHuu1nnsgtKv8SUWFKB/o+DpbDv 4lWHKT6YaNTYLNP/gE7sEHbjtjMcUqNKYCNKnY0sLo7N5oRKBm7QggBX3qPB5QyyqKJX oDoA== 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 be3-v6si11998892plb.581.2018.03.08.10.27.56; Thu, 08 Mar 2018 10:27: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 741CC78A20; Thu, 8 Mar 2018 18:25:34 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 4F12D789C3 for ; Thu, 8 Mar 2018 18:25:18 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053949" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:18 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:46 +0200 Message-Id: <20180308181804.31261-24-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 24/42] libidn: 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 --- .../libidn/libidn/libidn_fix_for_automake-1.12.patch | 10 +++++----- 1 file changed, 5 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-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch index 5683d3c98d7..db91317ca5b 100644 --- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch @@ -9,12 +9,12 @@ This patch fixes following issue with automake 1.12 Signed-off-by: Nitin A Kamble 2012/05/03 -Index: libidn-1.24/configure.ac +Index: libidn-1.33/configure.ac =================================================================== ---- libidn-1.24.orig/configure.ac -+++ libidn-1.24/configure.ac -@@ -34,6 +34,10 @@ AC_SUBST(LT_CURRENT, 17) - AC_SUBST(LT_REVISION, 7) +--- libidn-1.33.orig/configure.ac ++++ libidn-1.33/configure.ac +@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 17) + AC_SUBST(LT_REVISION, 16) AC_SUBST(LT_AGE, 6) +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it From patchwork Thu Mar 8 18:17:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131057 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53303lja; Thu, 8 Mar 2018 10:28:03 -0800 (PST) X-Google-Smtp-Source: AG47ELsbBWgxCf7bTywqjaiFYisfV+Ny+TnKn2yq1B6Kx3ffjtTyYBQ6kdceXi94daGdMOcYqUuN X-Received: by 2002:a17:902:76cb:: with SMTP id j11-v6mr24972065plt.431.1520533683111; Thu, 08 Mar 2018 10:28:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533683; cv=none; d=google.com; s=arc-20160816; b=Bhey91IIWExRLbED7hV9nbmIWifNR8dc7pH3HVFL/tfJpbZYMP+88TIY5ZbAENXIbZ 3dtMHiQ9qmCiuZ0h4k/Bd2uTUP9rp7NVTmICQiwjm/UW6eaaq4VsHVDHZaAq2Op0M+wW +6BcrBgzj/oxu2wBFs7t09tZyVaGJaDgZwYsaIKiPAiauNQISi8Rm9l/hLrLbZTkjKsz jHvRX3YM5YUGAuXUkWpDL5+B+0CeGsAEhoHWfenyxNbPNhJ6Pk9PF5vvlVcReh0X6ymT 8FaXJxGeF7ykO4PyN7Ajk5Pn02roPRpHn9PsS1yYDBUuS+cqg+lIjFKWsiUhVLEOHUn3 DRGA== 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=uq56mfEhIDkaisISN7cOU/HOZkHZaho2ZDo7fREyz38=; b=MKYqJHP4tr/zggCTC46u1dFCRK2xfQzEnQLk/+GWHR1iGTkXDJa8hWU411yuC+6JIv 9oRyj9RAJwb8YxcMDlpUDfsudSMehtWTQl/ryELds3pIsdXWCmvAhsnEbsRJUoNz6Zsz aQauZpKM/NEsqJ9MtBXKHc6BPfXeNvDnXldyvU/Twscl02U8e7+8InADecCAsLopSI7h lAmfRMrMi5ArG/wzTLW0IGJZkVgG9KGmNoRAGtvr3ROKLq/eS1SFCtAuea8tQkiVbTFc 6uLgni4ylOQnBgFgWJluDBux26Grc0tnofQczt/6bVkZX6HFQuol4ay3BVLE6Od4B2XU DYLg== 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 z3si13246219pgp.788.2018.03.08.10.28.02; Thu, 08 Mar 2018 10:28:03 -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 913FB78A26; Thu, 8 Mar 2018 18:25:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id E2AAA789CE for ; Thu, 8 Mar 2018 18:25:19 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053960" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:20 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:47 +0200 Message-Id: <20180308181804.31261-25-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 25/42] mdadm: 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 --- meta/recipes-extended/mdadm/files/gcc-4.9.patch | 12 ++++++------ .../mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-extended/mdadm/files/gcc-4.9.patch b/meta/recipes-extended/mdadm/files/gcc-4.9.patch index 54bf1d79ab7..df21399deb2 100644 --- a/meta/recipes-extended/mdadm/files/gcc-4.9.patch +++ b/meta/recipes-extended/mdadm/files/gcc-4.9.patch @@ -7,13 +7,13 @@ make: *** [super-intel.o] Error 1 Signed-off-by: Khem Raj Upstream-Status: Pending -Index: mdadm-3.3/super-intel.c +Index: mdadm-4.0/super-intel.c =================================================================== ---- mdadm-3.3.orig/super-intel.c 2014-05-02 15:08:21.154319651 -0700 -+++ mdadm-3.3/super-intel.c 2014-05-02 15:09:31.470985794 -0700 -@@ -5060,7 +5060,7 @@ - spare->cache_size = mpb->cache_size, - spare->pwr_cycle_count = __cpu_to_le32(1), +--- mdadm-4.0.orig/super-intel.c ++++ mdadm-4.0/super-intel.c +@@ -5725,7 +5725,7 @@ static int write_super_imsm_spares(struc + spare->cache_size = mpb->cache_size; + spare->pwr_cycle_count = __cpu_to_le32(1); - snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, + (void)snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch index c656d073e37..00e6657e091 100644 --- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch +++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch @@ -5,13 +5,13 @@ Upstream-Status: Pending Signed-off-by: Aníbal Limón -Index: mdadm-3.3.4/monitor.c +Index: mdadm-4.0/monitor.c =================================================================== ---- mdadm-3.3.4.orig/monitor.c -+++ mdadm-3.3.4/monitor.c -@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar - mdi->curr_state = read_dev_state(mdi->state_fd); - } +--- mdadm-4.0.orig/monitor.c ++++ mdadm-4.0/monitor.c +@@ -445,9 +445,12 @@ static int read_and_act(struct active_ar + if (FD_ISSET(mdi->bb_fd, fds)) + check_for_cleared_bb(a, mdi); } - gettimeofday(&tv, NULL); From patchwork Thu Mar 8 18:17: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: 131058 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53438lja; Thu, 8 Mar 2018 10:28:09 -0800 (PST) X-Google-Smtp-Source: AG47ELtrH2dM/GbsWGNfYTCKLOy6mfeWvEOoItghzN3vXT7qSCLeJNswtBM9SuU1Ie1yTUAK9i1y X-Received: by 10.98.198.92 with SMTP id m89mr18580180pfg.73.1520533689565; Thu, 08 Mar 2018 10:28:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533689; cv=none; d=google.com; s=arc-20160816; b=EIwxWwOx2X3hLdIRw+no5XuQFG7z2U0D+F5yUu91eV2goLLyiEFX7ZjpMvcHGN57Mu ouS8bJ6cJ6G6EyS2ZYpYvD8H5GinTu/LW+DyEhCr0MhDjU/1hdyxccqSOoMAe8sO/npC AEmPsvg+f0wFnXs6ktLvoYQ8wnzSNU4/Q6QzZ++DmJ4CuZk3Erp3UUiI7NOSJ/CS24f0 94boktqijZuveuDR04f7uIRaIuEbmkRYxRQ+IOzUCfN7Zjo6PI5v0jgJkUkEnvu/D3Q0 Lh7Axdn8DrROgQuk7Gpy9sflR0hqerLkYE7uuK6s4xNnO0u6cJkJV2pBt7Qfukbptm+p WLwQ== 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=qqmxZi2rtJlDOnP1G7eu7TyWWJQ/iGSjdSg/RZJnYjo=; b=zN5uOKeQcjJCfDqO5yA6DYo0gaPdOVy6S6af1nkfwNTHd6PAO10coXsg0obsFhmQ6V rualO2fniR/kF4acgw6Z88YsZSC1mMq4wwWvD0dbcGmPLPMuBtwTkHKx5QxZ6Dd8klaf HxpiYtFNfI478MZ5EyMSU+HUcRBAeb/A+wHW39gaUk+p3dWijLgmefBL8BKWGfkFvqVt UtQTqcgzEfucRgNhDqDZFUZimf+Cn3E7UdiqJQvbSUOT7u6Lq3khej9LJ5Vvdygiu6P1 e0ymKU4SWW3F36C5mtoXBvs+/wJCoMyO8uggWSVOMlCXnWe3ww3GItnKTupvQB+VHrFW ypyg== 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 s4si13319631pgf.390.2018.03.08.10.28.09; Thu, 08 Mar 2018 10:28:09 -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 A327578A25; Thu, 8 Mar 2018 18:25:36 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 68EC1789C4 for ; Thu, 8 Mar 2018 18:25:21 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053973" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:21 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:48 +0200 Message-Id: <20180308181804.31261-26-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 26/42] pam: 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 --- .../pam/libpam/libpam-xtests.patch | 14 +++++++------ .../pam-security-abstract-securetty-handling.patch | 23 ++++++++++++---------- 2 files changed, 21 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-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch index be687457f82..7edf66f9153 100644 --- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch +++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch @@ -3,18 +3,20 @@ This patch is used to create a new sub package libpam-xtests to do more checks. Upstream-Status: Pending Signed-off-by: Kang Kai ---- Linux-PAM-1.1.4/xtests/Makefile.am.orig 2011-07-19 17:00:09.619980001 +0800 -+++ Linux-PAM-1.1.4/xtests/Makefile.am 2011-07-19 16:54:00.229979998 +0800 -@@ -7,7 +7,7 @@ - AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \ - -L$(top_builddir)/libpam_misc -lpam_misc +Index: Linux-PAM-1.3.0/xtests/Makefile.am +=================================================================== +--- Linux-PAM-1.3.0.orig/xtests/Makefile.am ++++ Linux-PAM-1.3.0/xtests/Makefile.am +@@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src + LDADD = $(top_builddir)/libpam/libpam.la \ + $(top_builddir)/libpam_misc/libpam_misc.la -CLEANFILES = *~ $(XTESTS) +CLEANFILES = *~ EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ -@@ -51,3 +51,18 @@ +@@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS) xtests: $(XTESTS) run-xtests.sh "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} diff --git a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch index f1834f6ce34..9b8d4c29751 100644 --- a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch +++ b/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch @@ -5,12 +5,13 @@ Upstream-Status: Pending Signed-off-by: Ming Liu =================================================================== -diff -urpN a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am ---- a/modules/pam_securetty/Makefile.am 2013-07-05 11:08:23.224483237 +0800 -+++ b/modules/pam_securetty/Makefile.am 2013-07-05 11:15:21.304486456 +0800 +Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am +=================================================================== +--- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am ++++ Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am @@ -24,6 +24,10 @@ endif securelib_LTLIBRARIES = pam_securetty.la - pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam + pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la +pam_securetty_la_SOURCES = \ + pam_securetty.c \ @@ -19,9 +20,10 @@ diff -urpN a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile. if ENABLE_REGENERATE_MAN noinst_DATA = README README: pam_securetty.8.xml -diff -urpN a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_securetty.c ---- a/modules/pam_securetty/pam_securetty.c 2013-07-05 11:07:50.064483568 +0800 -+++ b/modules/pam_securetty/pam_securetty.c 2013-07-05 11:12:23.994483344 +0800 +Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c +=================================================================== +--- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c ++++ Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c @@ -1,7 +1,5 @@ /* pam_securetty module */ @@ -104,9 +106,10 @@ diff -urpN a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_s if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) { FILE *cmdlinefile; -diff -urpN a/modules/pam_securetty/tty_secure.c b/modules/pam_securetty/tty_secure.c ---- a/modules/pam_securetty/tty_secure.c 1970-01-01 08:30:00.000000000 +0830 -+++ b/modules/pam_securetty/tty_secure.c 2013-07-05 11:14:21.534482900 +0800 +Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c +=================================================================== +--- /dev/null ++++ Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c @@ -0,0 +1,90 @@ +/* + * A function to determine if a particular line is in /etc/securetty From patchwork Thu Mar 8 18:17: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: 131059 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53542lja; Thu, 8 Mar 2018 10:28:16 -0800 (PST) X-Google-Smtp-Source: AG47ELthtY0iA9+ey4/EEbU86gHFEzIqYRhFlwP2Nvqf/3Ghrg4ZYA7oS2eZpx3vEWs9KNVQuSuc X-Received: by 10.101.100.208 with SMTP id t16mr21082757pgv.398.1520533696702; Thu, 08 Mar 2018 10:28:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533696; cv=none; d=google.com; s=arc-20160816; b=G2kkyRF0PkKOXZu+MWXDa6d+mR2KLPVSemnHYpCaybiWU2f87aC3cYt8hepDN+ImIW J9YlpbC9deueBWpeffYKTrM8mnJQdiCuuPGE1Wi+WdSQruMBYgouZXWHLGqgCThH6+lc AZOGqigYUeKoSn8SRUtPOunrU+MxZlp34Uu4gIRm4LFSj2vSAswtklCFcF36m2fyUk// ExeeWANIJ5oFE3ELAQ7JZW8/G4DE60U8aWIV579roKf75u2E4a/fExcdwb97l6TOnj0D AoBiy/ktseqv3ZTZYPITifZCZVZ061oafLvOwqHEa3ZVCjkOrcwgNdDSLqS60zVsF/OA yFBg== 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=pVISjXwpCVdjv8jgMqy57lp2cEZSQRn7UAqhBq63y1k=; b=Wdzc1F6H/LbY88Hr433sNYHuIIr3DInmGvxr1e8GJuURL5epesQy/6TRhXY4mJEz2y DsXXepT9YcAWiddkaRbs7BsiK8KEBbHKzh6SLPJQPduE4bNGQYBl9lioFwjgJzToFlDl 3KY8hRJaI3hO19fuaivebQTycU6Ea8arvptmW76boRQypQWH5NzXSBl6tU/3X0reK9ad yOek4BE0Li4msG5YOgXP0NaiPVSSNqQN3Uuoz+DS7CKhvA+A+Q6MwbCMbP4g7f0iQ2of xn5FcIwjGQR7B4O6lEWwpNxPrHSnppVd8qoXQbT5Z+0+Bn9SkDSndHhr59B9a9pvNZB9 PF6Q== 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 y4si13391307pgq.380.2018.03.08.10.28.16; Thu, 08 Mar 2018 10:28:16 -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 E62A478A2E; Thu, 8 Mar 2018 18:25:37 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 3CDC97898C for ; Thu, 8 Mar 2018 18:25:23 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053986" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:23 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:49 +0200 Message-Id: <20180308181804.31261-27-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 27/42] parted: 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/parted/files/no_check.patch | 10 +++++----- meta/recipes-extended/parted/files/syscalls.patch | 12 ++++++------ 2 files changed, 11 insertions(+), 11 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/parted/files/no_check.patch b/meta/recipes-extended/parted/files/no_check.patch index 58d8db44264..e6a26d11a5c 100644 --- a/meta/recipes-extended/parted/files/no_check.patch +++ b/meta/recipes-extended/parted/files/no_check.patch @@ -5,12 +5,12 @@ it to be disabled. RP - 4/11/08 -Index: parted-1.9.0/configure.ac +Index: parted-3.2/configure.ac =================================================================== ---- parted-1.9.0.orig/configure.ac 2009-07-23 18:52:08.000000000 +0100 -+++ parted-1.9.0/configure.ac 2010-02-02 14:13:56.013905093 +0000 -@@ -477,7 +477,7 @@ - AM_CONDITIONAL([BUILD_LINUX], [test "$OS" = linux]) +--- parted-3.2.orig/configure.ac ++++ parted-3.2/configure.ac +@@ -555,7 +555,7 @@ AC_CHECK_HEADER([execinfo.h], [ + AM_CONDITIONAL([COMPILE_FOR_S390], [test "$host_cpu" = s390 || test "$host_cpu" = s390x]) dnl check for "check", unit testing library/header -PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no) diff --git a/meta/recipes-extended/parted/files/syscalls.patch b/meta/recipes-extended/parted/files/syscalls.patch index e9bbe9a956d..93205a0a804 100644 --- a/meta/recipes-extended/parted/files/syscalls.patch +++ b/meta/recipes-extended/parted/files/syscalls.patch @@ -4,10 +4,10 @@ Upstream-Status: Pending libparted/arch/linux.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) -Index: parted-1.9.0/libparted/arch/linux.c +Index: parted-3.2/libparted/arch/linux.c =================================================================== ---- parted-1.9.0.orig/libparted/arch/linux.c 2009-07-23 18:52:08.000000000 +0100 -+++ parted-1.9.0/libparted/arch/linux.c 2010-02-02 14:14:16.523904768 +0000 +--- parted-3.2.orig/libparted/arch/linux.c ++++ parted-3.2/libparted/arch/linux.c @@ -17,6 +17,8 @@ #define PROC_DEVICES_BUFSIZ 16384 @@ -16,8 +16,8 @@ Index: parted-1.9.0/libparted/arch/linux.c + #include #include - -@@ -1477,12 +1479,14 @@ + #include +@@ -1696,12 +1698,14 @@ linux_refresh_close (PedDevice* dev) #if SIZEOF_OFF_T < 8 @@ -32,7 +32,7 @@ Index: parted-1.9.0/libparted/arch/linux.c loff_t llseek (unsigned int fd, loff_t offset, unsigned int whence) -@@ -1490,11 +1494,20 @@ +@@ -1709,11 +1713,20 @@ llseek (unsigned int fd, loff_t offset, loff_t result; int retval; From patchwork Thu Mar 8 18:17: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: 131060 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53620lja; Thu, 8 Mar 2018 10:28:22 -0800 (PST) X-Google-Smtp-Source: AG47ELvC+TbPHnVVRoC5lvUQQQA4P9PO7NOKVsdR8vFjygrs++WbDVFnyEbC5KVr9U/ad7qao+rm X-Received: by 10.99.110.11 with SMTP id j11mr21992919pgc.294.1520533702380; Thu, 08 Mar 2018 10:28:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533702; cv=none; d=google.com; s=arc-20160816; b=CBwSFlV5fcH3FjfNzKayyMAb3e7o/V5SSXB4m1LrI14w6WFBBEHwaDfpoCUCTHJGye /ao1LpVraibdEYK60B4k85BpOX446KXK56xPT1VRW7Wce/OHTqXlyjVoKw86QlaWRMFh haaqXkCV6ZF/IJXceNoNUnqJNSvgEVwiANI6qkv4u8lDjWqHPjbZJKP1ba4oGe1gK8q3 ki0D0i094wJClo1HPjDLINEfW0gsXHJUVcV7OdTPa6RokmKkm6XjMaOAYjgBi/mYcGmM 8wDepSemA1xvLNU/Kh+n4nK6KtoFUQaARrd3fvr5HwDHddXeuLZzIz7VODjCzO/JJB6h VhTQ== 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=nSItSlW2XH4lEwbVNFh4L55UPfhVVj8ZNJN39gDQ/qo=; b=YNM/OyX2/ElIaJR43z52iGFTbZQR3goAtMuIrgvSODw0lvV44kWg8IKe3d4QITQ0Qf sNu7hMA6lYMXfn1JMUJbRK2DXb1sf5aLs3d01t3Oh2D5q8Ip+dZmrmoRIVYFUofGzwF1 a2O3dbd6t0oYbnqTl9HlI7jVhZVP+eGJmrwlxDD7xRt5iDF35YOm7RnyMm/5r2+1BwVo YDA4VPEkYU+hE6rCAAYRE7UIk0bcHaVwTgyg3tgU1M+vi4JHMre0LIlvsnzx6kQIrS34 HqBpXFQSH/LhJ43om2PlNZ1yh4aqsIc8cU0ACdsgjK/IjBAw45wuK56ZI4rFLJjXlX54 3U5A== 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 j14si15891689pfh.405.2018.03.08.10.28.22; Thu, 08 Mar 2018 10:28:22 -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 0067878A31; Thu, 8 Mar 2018 18:25:39 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id BED6E7898C for ; Thu, 8 Mar 2018 18:25:24 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053995" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:25 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:50 +0200 Message-Id: <20180308181804.31261-28-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 28/42] tcp-wrappers: 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 --- .../tcp-wrappers-7.6/12_makefile_config.patch | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 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/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch index e8289e44d93..d473fb63429 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch @@ -1,9 +1,10 @@ Upstream-Status: Backport -diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ---- tcp_wrappers_7.6.orig/Makefile 2003-08-21 01:43:39.000000000 +0200 -+++ tcp_wrappers_7.6/Makefile 2003-08-21 01:43:35.000000000 +0200 -@@ -45,7 +45,7 @@ +Index: tcp_wrappers_7.6/Makefile +=================================================================== +--- tcp_wrappers_7.6.orig/Makefile ++++ tcp_wrappers_7.6/Makefile +@@ -45,7 +45,7 @@ what: # # SysV.4 Solaris 2.x OSF AIX #REAL_DAEMON_DIR=/usr/sbin @@ -12,7 +13,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile # BSD 4.4 #REAL_DAEMON_DIR=/usr/libexec # -@@ -512,6 +519,7 @@ +@@ -513,6 +513,7 @@ VSYSLOG = -Dvsyslog=myvsyslog # (examples: allow, deny, banners, twist and spawn). # #STYLE = -DPROCESS_OPTIONS # Enable language extensions. @@ -20,7 +21,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ################################################################ # Optional: Changing the default disposition of logfile records -@@ -535,6 +543,7 @@ +@@ -536,6 +537,7 @@ VSYSLOG = -Dvsyslog=myvsyslog # The LOG_XXX names below are taken from the /usr/include/syslog.h file. FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use @@ -28,7 +29,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile # The syslog priority at which successful connections are logged. -@@ -631,6 +640,7 @@ +@@ -632,6 +634,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\ # lookups altogether, see the next section. PARANOID= -DPARANOID @@ -36,7 +37,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ######################################## # Optional: turning off hostname lookups -@@ -644,6 +654,7 @@ +@@ -645,6 +648,7 @@ PARANOID= -DPARANOID # mode (see previous section) and comment out the following definition. HOSTNAME= -DALWAYS_HOSTNAME @@ -44,7 +45,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ############################################# # Optional: Turning on host ADDRESS checking -@@ -670,6 +681,7 @@ +@@ -671,6 +675,7 @@ HOSTNAME= -DALWAYS_HOSTNAME # Solaris 2.x, and Linux. See your system documentation for details. # # KILL_OPT= -DKILL_IP_OPTIONS @@ -52,7 +53,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ## End configuration options ############################ -@@ -677,9 +689,10 @@ +@@ -678,9 +683,10 @@ HOSTNAME= -DALWAYS_HOSTNAME # Protection against weird shells or weird make programs. SHELL = /bin/sh @@ -65,7 +66,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ -@@ -712,10 +725,11 @@ +@@ -713,11 +719,12 @@ all other: config-check tcpd tcpdmatch t config-check: @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; } @@ -81,3 +82,4 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile + @if [ ! -d shared ]; then mkdir shared; fi $(LIB): $(LIB_OBJ) + rm -f $(LIB) From patchwork Thu Mar 8 18:17: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: 131061 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53829lja; Thu, 8 Mar 2018 10:28:34 -0800 (PST) X-Google-Smtp-Source: AG47ELtx81g9m1zqqqP3C+i1EIHlSgJDPNzJ7DLW0naPcZx1KcawNnlBIn8AttVa/8MWP2azL/AL X-Received: by 2002:a17:902:7044:: with SMTP id h4-v6mr24542801plt.378.1520533714441; Thu, 08 Mar 2018 10:28:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533714; cv=none; d=google.com; s=arc-20160816; b=Z9N38tKPSBXiqxOEx3qJfRAarcR91OOXkpQDNWpiKHvbofTHy36soGvgxjKN25IHY1 WZW1FfIa093DJVQcgoP5pByV5djghqboRc7J0Sm20ixnisTLMZRGv1wX1ppUwRBTewsC WepOA+D050u9TE9uXfCR2/XLsahUSJ8CKNpW66x6CrDpODpYxJIpuTIXg3oNnNo8i3TF /n2TgQCymhS54JN1UQF/MgXaUZgyD/xS7YRapqZZR+NDyCVI85zfyumE6z0Q6+rXppk3 YxIO1Lh+Wo9p8vXP5qtbs4Ck7dISOjvL+3WFISmSkeyoK8n5sCJybZkdVgq6ZRAT6/k0 OnaA== 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=QK4kQ408/dpuqNZlOq/XlYn7WwzdDONef++P6Tg7rwA=; b=WGG6Ew+AfUKZgjT2m0uveJ3ybaKJVhNXtp6z5Y9lElChKijW0NU3sNL5ir8uKFMBYM LbPircDBbR3lukkM041de7eOUgpQ9inR8yMpIm20mSTosnuiAmqISTu7dp12i3wv+Yd2 C4WS5kZntGQOGbZmWV1x8vFhxKyxlKpanbJkE1A7DgAGMFwpjhJBwWzCdjlibTwKRuMF oe5x0GzZgAvqs0eXlKJLoh47e0tjsWJzA7qR5jV9WGT7zAYZ+ClZVA3NSU6O3grZ5Yr/ RPmKvNvh1gOiRXLelTF5L1NRrLQi20efN+uCUk9wiQzUwBEM7Km8yUgAK8w2IB0Z1Z2t 7ITw== 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 e13-v6si14125749pln.204.2018.03.08.10.28.34; Thu, 08 Mar 2018 10:28: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 36BF978A46; Thu, 8 Mar 2018 18:25:41 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 9EC76789FB for ; Thu, 8 Mar 2018 18:25:27 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054006" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:28 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:52 +0200 Message-Id: <20180308181804.31261-30-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 30/42] apt: 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 --- meta/recipes-devtools/apt/apt/disable-test.patch | 23 ++++++++++------------ .../apt/apt/fix-gcc-4.6-null-not-defined.patch | 10 ++++++---- meta/recipes-devtools/apt/apt/makerace.patch | 10 +++++----- meta/recipes-devtools/apt/apt/no-nls-dpkg.patch | 12 ++++++----- meta/recipes-devtools/apt/apt/nodoc.patch | 12 +++++------ 5 files changed, 34 insertions(+), 33 deletions(-) diff --git a/meta/recipes-devtools/apt/apt/disable-test.patch b/meta/recipes-devtools/apt/apt/disable-test.patch index 0532671747e..d16b5c771b6 100644 --- a/meta/recipes-devtools/apt/apt/disable-test.patch +++ b/meta/recipes-devtools/apt/apt/disable-test.patch @@ -17,10 +17,10 @@ Signed-off-by: Aníbal Limón configure.ac | 7 ------- 2 files changed, 3 insertions(+), 13 deletions(-) -diff --git a/Makefile b/Makefile -index 7680f08..69527a5 100644 ---- a/Makefile -+++ b/Makefile +Index: apt-1.2.24/Makefile +=================================================================== +--- apt-1.2.24.orig/Makefile ++++ apt-1.2.24/Makefile @@ -9,8 +9,8 @@ endif .PHONY: default default: startup all @@ -32,9 +32,9 @@ index 7680f08..69527a5 100644 $(MAKE) -C vendor $@ $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ -@@ -21,8 +21,6 @@ all headers library clean veryclean binary program doc manpages docbook test upd +@@ -21,8 +21,6 @@ all headers library clean veryclean bina $(MAKE) -C dselect $@ - $(MAKE) -C doc $@ + # $(MAKE) -C doc $@ $(MAKE) -C po $@ - # FIXME: -C test has issue swith parallel builds, investigate! - -$(MAKE) -C test $@ @@ -52,10 +52,10 @@ index 7680f08..69527a5 100644 dirs: startup -diff --git a/configure.ac b/configure.ac -index 1f05da5..e47f459 100644 ---- a/configure.ac -+++ b/configure.ac +Index: apt-1.2.24/configure.ac +=================================================================== +--- apt-1.2.24.orig/configure.ac ++++ apt-1.2.24/configure.ac @@ -90,13 +90,6 @@ AC_CHECK_LIB(curl, curl_easy_init, AC_MSG_ERROR([failed: I need CURL due https support]), ) @@ -70,6 +70,3 @@ index 1f05da5..e47f459 100644 AC_SUBST(BDBLIB) HAVE_ZLIB=no --- -2.1.4 - diff --git a/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch index 801ae6dddb4..899c6ef2fcf 100644 --- a/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch +++ b/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch @@ -1,12 +1,14 @@ Upstream-Status: Pending ---- a/apt-pkg/contrib/weakptr.h -+++ b/apt-pkg/contrib/weakptr.h +Index: apt-1.2.24/apt-pkg/contrib/weakptr.h +=================================================================== +--- apt-1.2.24.orig/apt-pkg/contrib/weakptr.h ++++ apt-1.2.24/apt-pkg/contrib/weakptr.h @@ -21,6 +21,7 @@ #ifndef WEAK_POINTER_H #define WEAK_POINTER_H +#include #include - /** - * Class for objects providing support for weak pointers. + #include + diff --git a/meta/recipes-devtools/apt/apt/makerace.patch b/meta/recipes-devtools/apt/apt/makerace.patch index 46e3161b673..0c686d6e276 100644 --- a/meta/recipes-devtools/apt/apt/makerace.patch +++ b/meta/recipes-devtools/apt/apt/makerace.patch @@ -8,16 +8,16 @@ RP 2012/3/19 Upstream-Status: Pending -Index: apt-0.9.9.4/buildlib/library.mak +Index: apt-1.2.24/buildlib/library.mak =================================================================== ---- apt-0.9.9.4.orig/buildlib/library.mak 2013-07-31 15:45:07.320440575 +0300 -+++ apt-0.9.9.4/buildlib/library.mak 2013-07-31 15:46:49.440440561 +0300 -@@ -61,7 +61,7 @@ +--- apt-1.2.24.orig/buildlib/library.mak ++++ apt-1.2.24/buildlib/library.mak +@@ -65,7 +65,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR # Compilation rules vpath %.cc $(SUBDIRS) -$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) +$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(LOCAL)-HEADERS) echo Compiling $< to $@ - $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< + $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ '$(abspath $<)' $(DoDep) diff --git a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch index a0996d4d440..98b6c96caac 100644 --- a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch +++ b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch @@ -1,8 +1,10 @@ Upstream-Status: Pending ---- a/apt-pkg/deb/dpkgpm.cc -+++ b/apt-pkg/deb/dpkgpm.cc -@@ -42,6 +42,12 @@ +Index: apt-1.2.24/apt-pkg/deb/dpkgpm.cc +=================================================================== +--- apt-1.2.24.orig/apt-pkg/deb/dpkgpm.cc ++++ apt-1.2.24/apt-pkg/deb/dpkgpm.cc +@@ -54,6 +54,12 @@ #include /*}}}*/ @@ -14,8 +16,8 @@ Upstream-Status: Pending + using namespace std; - namespace -@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const + APT_PURE static string +@@ -1703,7 +1709,7 @@ void pkgDPkgPM::WriteApportReport(const } // check if its not a follow up error diff --git a/meta/recipes-devtools/apt/apt/nodoc.patch b/meta/recipes-devtools/apt/apt/nodoc.patch index 449e42df4a9..78cf53884a4 100644 --- a/meta/recipes-devtools/apt/apt/nodoc.patch +++ b/meta/recipes-devtools/apt/apt/nodoc.patch @@ -3,16 +3,16 @@ Disable documentation Upstream-Status: Inappropriate [configuration] Signed-off-by: Constantin Musca -Index: apt-0.9.7.7/Makefile +Index: apt-1.2.24/Makefile =================================================================== ---- apt-0.9.7.7.orig/Makefile -+++ apt-0.9.7.7/Makefile -@@ -17,7 +17,7 @@ all headers library clean veryclean bina +--- apt-1.2.24.orig/Makefile ++++ apt-1.2.24/Makefile +@@ -19,7 +19,7 @@ all headers library clean veryclean bina $(MAKE) -C cmdline $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ - $(MAKE) -C doc $@ +# $(MAKE) -C doc $@ $(MAKE) -C po $@ - $(MAKE) -C test $@ - + # FIXME: -C test has issue swith parallel builds, investigate! + -$(MAKE) -C test $@ From patchwork Thu Mar 8 18:17:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131062 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp53934lja; Thu, 8 Mar 2018 10:28:40 -0800 (PST) X-Google-Smtp-Source: AG47ELtWtsu4eCv6pBj5mZKKQ0ARn35oUFa8jES2wTGCmMSdvvq50MxGcZWh7mo8LHeXIPgwSCvh X-Received: by 10.98.137.147 with SMTP id n19mr27511041pfk.193.1520533720606; Thu, 08 Mar 2018 10:28:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533720; cv=none; d=google.com; s=arc-20160816; b=DmLhYwRYkbvhhaSaN9Mvhr4bnjXhsOw3bj4jTb5uCdNjHNG77IvZX2V5q4dwi6mEIF a3DhGusI3isC5EnCaJdxV7bpr0cQvJ5WNTFWC0Os62Ao8DFczDDpAggar0ILwjGHfU/g ggk6pVGC0eihkL1juOM5Cb2dJ1ZAwfVmhkEgk+audtd+xhWalh3nrBhD2EE3PVVpVGXm aIYYBe0/qweviS8DOLDlqbXANLREq+QSArU6LAeftGt7Wpu7pf5+/lowf71+ryFZEzOu jBZC+Wgv/rfzSTBmAsXalo166nj7ihYF35CJEaw6kANGYDXNNW0RJmpqstCOtE8iSDRx iZnA== 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=ypLd+qiECucs/flR5BuxGB3I/4FHJrtowuoxqicEo8Y=; b=KB+gcr1hodJDcrefFFPoXKJNBFzXSH7uoUpso7oBFu9XUEL8YW8OPus/eRGaSEb3J2 ecZ/fjVA8jwSbCMSTO1122SWbn4Qy5tH12VgGxNLkpqUcgw1FBgEGMVnrtDhy6qOVPxd 9O+0eRfK8xrg1NnA+5clwx3qA6Zj0kjqBUqphgY6W5dcF2zrX/869Qsww6svhfd2zRc7 aNZPb3qQhbqm2+jAfGXu4ZrQSt6uobdNBAnUnrP8d2apS1jFDeJ9FDmLIYWXDEG8AD+F kN6sj6BlY5nHJItvEPSSvSxlKO9wFKjC/4iFwK5ONQOHm0nBcMgJq8NCA/V9uDzmiw1Y W5Eg== 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 u25si13305043pgv.221.2018.03.08.10.28.40; Thu, 08 Mar 2018 10:28: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 493D178A48; Thu, 8 Mar 2018 18:25:42 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 43C8578A01 for ; Thu, 8 Mar 2018 18:25:29 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054019" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:29 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:53 +0200 Message-Id: <20180308181804.31261-31-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 31/42] automake: 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 --- ...tion-in-shebangs-with-modern-use-warnings.patch | 41 ++++++++++------------ .../automake/automake/buildtest.patch | 32 +++++++++-------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch index 64eb253a6ea..96b5a3d6b2a 100644 --- a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch +++ b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch @@ -22,10 +22,10 @@ Signed-off-by: Serhii Popovych t/wrap/automake.in | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) -diff --git a/bin/aclocal.in b/bin/aclocal.in -index 349f24a..50cb8d3 100644 ---- a/bin/aclocal.in -+++ b/bin/aclocal.in +Index: automake-1.15.1/bin/aclocal.in +=================================================================== +--- automake-1.15.1.orig/bin/aclocal.in ++++ automake-1.15.1/bin/aclocal.in @@ -1,4 +1,4 @@ -#!@PERL@ -w +#!@PERL@ @@ -40,17 +40,17 @@ index 349f24a..50cb8d3 100644 use Automake::Config; use Automake::General; -diff --git a/bin/automake.in b/bin/automake.in -index eedc8bc..e0a01cf 100644 ---- a/bin/automake.in -+++ b/bin/automake.in +Index: automake-1.15.1/bin/automake.in +=================================================================== +--- automake-1.15.1.orig/bin/automake.in ++++ automake-1.15.1/bin/automake.in @@ -1,4 +1,4 @@ -#!@PERL@ -w +#!@PERL@ # -*- perl -*- # @configure_input@ -@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' +@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; package Automake; use strict; @@ -58,16 +58,16 @@ index eedc8bc..e0a01cf 100644 BEGIN { -diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in -index e64b546..9996899 100644 ---- a/t/wrap/aclocal.in -+++ b/t/wrap/aclocal.in +Index: automake-1.15.1/t/wrap/aclocal.in +=================================================================== +--- automake-1.15.1.orig/t/wrap/aclocal.in ++++ automake-1.15.1/t/wrap/aclocal.in @@ -1,4 +1,4 @@ -#!@PERL@ -w +#!@PERL@ # @configure_input@ - # Copyright (C) 2012-2014 Free Software Foundation, Inc. + # Copyright (C) 2012-2017 Free Software Foundation, Inc. @@ -19,6 +19,7 @@ BEGIN { @@ -76,16 +76,16 @@ index e64b546..9996899 100644 @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib'); unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib' if '@srcdir@' ne '.'; -diff --git a/t/wrap/automake.in b/t/wrap/automake.in -index 8b943b1..be61226 100644 ---- a/t/wrap/automake.in -+++ b/t/wrap/automake.in +Index: automake-1.15.1/t/wrap/automake.in +=================================================================== +--- automake-1.15.1.orig/t/wrap/automake.in ++++ automake-1.15.1/t/wrap/automake.in @@ -1,4 +1,4 @@ -#!@PERL@ -w +#!@PERL@ # @configure_input@ - # Copyright (C) 2012-2014 Free Software Foundation, Inc. + # Copyright (C) 2012-2017 Free Software Foundation, Inc. @@ -19,6 +19,7 @@ BEGIN { @@ -94,6 +94,3 @@ index 8b943b1..be61226 100644 @Automake::perl_libdirs = ('@abs_top_srcdir@/lib'); unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib' if '@srcdir@' ne '.'; --- -2.3.0 - diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch b/meta/recipes-devtools/automake/automake/buildtest.patch index 1dd5337849f..c32cd1fb11e 100644 --- a/meta/recipes-devtools/automake/automake/buildtest.patch +++ b/meta/recipes-devtools/automake/automake/buildtest.patch @@ -4,21 +4,23 @@ be run separately. Signed-off-by: Björn Stenberg Upstream-Status: Pending ---- a/lib/am/check.am 2012-11-14 13:46:16.335475995 +0100 -+++ b/lib/am/check.am 2012-08-13 18:40:12.000000000 +0200 -@@ -44,7 +44,7 @@ - am__tty_colors = $(am__tty_colors_dummy) - endif !%?COLOR% - +Index: automake-1.15.1/lib/am/check.am +=================================================================== +--- automake-1.15.1.orig/lib/am/check.am ++++ automake-1.15.1/lib/am/check.am +@@ -41,7 +41,7 @@ am__tty_colors = { \ + fi; \ + } + -.PHONY: check-TESTS +.PHONY: check-TESTS buildtest-TESTS runtest-TESTS - - if %?PARALLEL_TESTS% - -@@ -465,7 +465,14 @@ - - else !%?PARALLEL_TESTS% - + + if !%?SERIAL_TESTS% + +@@ -466,7 +466,14 @@ else %?SERIAL_TESTS% + + ## Obsolescent serial testsuite driver. + -check-TESTS: $(TESTS) +AM_RECURSIVE_TARGETS += buildtest runtest + @@ -28,6 +30,6 @@ Upstream-Status: Pending + $(MAKE) $(AM_MAKEFLAGS) runtest-TESTS + +runtest-TESTS: - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ ## Make sure Solaris VPATH-expands all members of this list, even From patchwork Thu Mar 8 18:17: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: 131063 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54026lja; Thu, 8 Mar 2018 10:28:46 -0800 (PST) X-Google-Smtp-Source: AG47ELvM/C78Ha24Z8nrZ4fnI+X+E0u2S4xW0HGgu+B9gL1LKiP1W6wG0tPM85HdNEoF++sADhNw X-Received: by 10.99.121.131 with SMTP id u125mr22085901pgc.263.1520533726670; Thu, 08 Mar 2018 10:28:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533726; cv=none; d=google.com; s=arc-20160816; b=gMiRnMSn/mhWhCn03MhYZ17wvp1rooyQbaqp/uJ78ASN1b0y8ppfYYmH4baIDgV1JR mT5Ot2YfUHmcarkKJcOtniUYLN4ulRFLG7X7dszFTrKjvk+Hq0gFJm1FDAdreMUFkb5E EwCjMQokHrVLFl9pIHgMxbgaxuatlj1TOVTIhR2Q8GB83COURgy+b6NzCHJt/wp4ySPZ mepCtEtuIW7LtN/Ctz1HHFLOJE5MEsQYuzFcvdMa83rib0RkVrBIQR0vBniMM1MdtY3X tlE+0mPbeDHfciuDM9f7pp6S2aQGfz6aPURC+dXBd9NkNivcV7r6Zuay7+MPSXBIzv8y RtNw== 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=aWsWWfgL6LKQJnL21xRyryt1cTPSRh31j8+RVnylyQY=; b=FDC/5f3mpl1COzg25GCe5S9/N7TOcXoZGnIWmyZbJfX1poIcEnTOjwjf0p/d9AFmwZ VH7TMsyB6011ekiHnM8+9Mox+sxffGm/jjEmOSw3GyPFt+jQjoE+fXJeulwt6evcT6VK ffuXvpGqBDxI1AVuMdsYddD6rpi9ZT3uMvNmoxFsa6fc9RZ5zKAsecbv0m1axmen/Lfo ddUH9aXpu9XwQLUQ2QJlqSGEzp/01e5lg8SMfHZLsB0ep7wPwbsiYy6bAO+3p4OEpsOI 5GocWWNV1gtBYI5HeF8zihOFqcGhtvlwCD48MmRmEiyat+cjvv9rAErdZvMlA7mZu7Pr FV6g== 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 b89-v6si15146922plb.809.2018.03.08.10.28.46; Thu, 08 Mar 2018 10:28: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 66AEB78A50; Thu, 8 Mar 2018 18:25:43 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id CB1807899E for ; Thu, 8 Mar 2018 18:25:30 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054027" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:31 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:54 +0200 Message-Id: <20180308181804.31261-32-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 32/42] intltool: 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 --- .../intltool/intltool/perl-522-deprecations.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/intltool/intltool/perl-522-deprecations.patch b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch index eb52172e10b..f1049e433e2 100644 --- a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch +++ b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch @@ -10,9 +10,11 @@ Take a patch from Debian to solve this. Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010) Signed-off-by: Ross Burton ---- intltool-0.51.0-ORIG/intltool-update.in 2015-05-27 00:20:43.038379963 +0200 -+++ intltool-0.51.0/intltool-update.in 2015-05-27 00:23:53.309078052 +0200 -@@ -1062,7 +1062,7 @@ +Index: intltool-0.51.0/intltool-update.in +=================================================================== +--- intltool-0.51.0.orig/intltool-update.in ++++ intltool-0.51.0/intltool-update.in +@@ -1062,7 +1062,7 @@ sub SubstituteVariable } } @@ -21,7 +23,7 @@ Signed-off-by: Ross Burton { my $rest = $3; my $untouched = $1; -@@ -1190,10 +1190,10 @@ +@@ -1190,10 +1190,10 @@ sub FindPackageName $name =~ s/\(+$//g; $version =~ s/\(+$//g; @@ -36,7 +38,7 @@ Signed-off-by: Ross Burton } if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) -@@ -1219,11 +1219,11 @@ +@@ -1219,11 +1219,11 @@ sub FindPackageName $version =~ s/\(+$//g; $bugurl =~ s/\(+$//g if (defined $bugurl); @@ -52,4 +54,4 @@ Signed-off-by: Ross Burton + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/); } - # \s makes this not work, why? \ No newline at end of file + # \s makes this not work, why? From patchwork Thu Mar 8 18:17: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: 131064 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54152lja; Thu, 8 Mar 2018 10:28:52 -0800 (PST) X-Google-Smtp-Source: AG47ELtWyGFCjFmb6zLf1HUi2YzACevvf4VVnX48UWib0wNUlT476NbqyIfauamRguCSysuDpKO5 X-Received: by 10.98.133.86 with SMTP id u83mr27345811pfd.172.1520533732828; Thu, 08 Mar 2018 10:28:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533732; cv=none; d=google.com; s=arc-20160816; b=EGCim2Bs6K1CDWYruPv5OL0xa1MZoiQIqOMTmwl6HiuHMV1GgUTlJ3hUER1s0AzLJ0 F/XhhsnOcseWzX+eSYeC+4RU2/dlJu1IfqSN4omySLXlwBD4pX4co3No8EI/kNy2u54u m2Gg8hPbu4wXkg8jXQI36it32oBQPKjMHQ1YYCwaf362C62clwXduXxEMR0MqOMcj8rO 3CCjtoSqO7gDewVpXYPOzNHB3SuOADfI1cmDllu8U5Et9WExauMcmUdYLZ/Vorosegfv +amCepzpVmwCuu+P6TUhf3el+LPAuIRL+9p4IFyF3PKIMlc2uhk8DEjpzcbvdgMZ83Ei h3bg== 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=bQCivKDV81WNToy3k31MVNWJLlrjehJtDFTWP+qR5H8=; b=x+PzYJ4I3BvGhNJ1TwK3JvWHXUiGaRmaQiv0JeX5mDh7Y9/xpaG5nz40FFNdR0zJHF i5GlfS/Wigat+2JAXdx6DE1xV1KEEdlZ6vt4rbdwUXesXMyBwpEcHh/buwq1F9+liU4U IxhBd1Ml8pLG56mjt1hjqt+ua1yc7ZJ7YqHQIeix1RGf8XuT0c3uLtq5UuAwG2XBqDMQ +4lzWQQ69jU0ZG4oP3B2licd4DYpF/jtvNqNBSX9bjdy5gipSmYf3QFnn5/Y6L3Hmdxf iboY5nJy9/70+0u1N1wYQpxvNuteGj0pxzVm1HZR/WlxEOXb+Qw2MYkDmDhQ9rOXiccR 4ETA== 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 d10si13353589pgu.703.2018.03.08.10.28.52; Thu, 08 Mar 2018 10:28: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 7686B78A17; Thu, 8 Mar 2018 18:25:44 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 534D478A0F for ; Thu, 8 Mar 2018 18:25:32 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054041" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:32 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:55 +0200 Message-Id: <20180308181804.31261-33-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 33/42] mtd: 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-exclusion-to-mkfs-jffs2-git-2.patch | 30 ++++++++++++---------- 1 file changed, 16 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/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch index 0e3776af048..5d874d9810b 100644 --- a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch +++ b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch @@ -1,8 +1,10 @@ Upstream-Status: Pending ---- /tmp/mkfs.jffs2.c 2009-01-11 15:28:41.000000000 +0100 -+++ git/jffsX-utils/mkfs.jffs2.c 2009-01-11 15:59:29.000000000 +0100 -@@ -100,6 +100,11 @@ +Index: git/jffsX-utils/mkfs.jffs2.c +=================================================================== +--- git.orig/jffsX-utils/mkfs.jffs2.c ++++ git/jffsX-utils/mkfs.jffs2.c +@@ -100,6 +100,11 @@ struct filesystem_entry { struct rb_node hardlink_rb; }; @@ -14,7 +16,7 @@ Upstream-Status: Pending struct rb_root hardlinks; static int out_fd = -1; static int in_fd = -1; -@@ -408,7 +413,7 @@ +@@ -309,7 +314,7 @@ static struct filesystem_entry *recursiv char *hpath, *tpath; struct dirent *dp, **namelist; struct filesystem_entry *entry; @@ -22,8 +24,8 @@ Upstream-Status: Pending + struct ignorepath_entry* element = ignorepath; if (lstat(hostpath, &sb)) { - perror_msg_and_die("%s", hostpath); -@@ -417,6 +422,15 @@ + sys_errmsg_die("%s", hostpath); +@@ -318,6 +323,15 @@ static struct filesystem_entry *recursiv entry = add_host_filesystem_entry(targetpath, hostpath, sb.st_uid, sb.st_gid, sb.st_mode, 0, parent); @@ -38,8 +40,8 @@ Upstream-Status: Pending + n = scandir(hostpath, &namelist, 0, alphasort); if (n < 0) { - perror_msg_and_die("opening directory %s", hostpath); -@@ -1453,6 +1467,7 @@ + sys_errmsg_die("opening directory %s", hostpath); +@@ -1359,6 +1373,7 @@ static struct option long_options[] = { {"root", 1, NULL, 'r'}, {"pagesize", 1, NULL, 's'}, {"eraseblock", 1, NULL, 'e'}, @@ -47,15 +49,15 @@ Upstream-Status: Pending {"output", 1, NULL, 'o'}, {"help", 0, NULL, 'h'}, {"verbose", 0, NULL, 'v'}, -@@ -1500,6 +1515,7 @@ - " -L, --list-compressors Show the list of the avaiable compressors\n" +@@ -1409,6 +1424,7 @@ static const char helptext[] = + " -L, --list-compressors Show the list of the available compressors\n" " -t, --test-compression Call decompress and compare with the original (for test)\n" " -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n" +" -I, --ignore=PATH Ignore sub directory and file tree below PATH when recursing over the file system\n" " -o, --output=FILE Output to FILE (default: stdout)\n" " -l, --little-endian Create a little-endian filesystem\n" " -b, --big-endian Create a big-endian filesystem\n" -@@ -1666,6 +1682,7 @@ +@@ -1566,6 +1582,7 @@ int main(int argc, char **argv) char *compr_name = NULL; int compr_prior = -1; int warn_page_size = 0; @@ -63,7 +65,7 @@ Upstream-Status: Pending page_size = sysconf(_SC_PAGESIZE); if (page_size < 0) /* System doesn't know so ... */ -@@ -1676,7 +1693,7 @@ +@@ -1576,7 +1593,7 @@ int main(int argc, char **argv) jffs2_compressors_init(); while ((opt = getopt_long(argc, argv, @@ -72,7 +74,7 @@ Upstream-Status: Pending { switch (opt) { case 'D': -@@ -1700,6 +1717,28 @@ +@@ -1600,6 +1617,28 @@ int main(int argc, char **argv) warn_page_size = 0; /* set by user, so don't need to warn */ break; @@ -100,4 +102,4 @@ Upstream-Status: Pending + case 'o': if (out_fd != -1) { - error_msg_and_die("output filename specified more than once"); + errmsg_die("output filename specified more than once"); From patchwork Thu Mar 8 18:17: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: 131065 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54263lja; Thu, 8 Mar 2018 10:28:59 -0800 (PST) X-Google-Smtp-Source: AG47ELt+8wdDAjwhpywd+UPcY9SjRwuNOwOz7+sMAU45khQTQU0aMmOziWkl5MZ1WpV2xWAJogLQ X-Received: by 2002:a17:902:467:: with SMTP id 94-v6mr24468600ple.57.1520533739743; Thu, 08 Mar 2018 10:28:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533739; cv=none; d=google.com; s=arc-20160816; b=trut5PnxBZP77G32dVwfqIV1KmhMRztPoijfxjWw0sXQk+xajtEv5B6/L5KATlxYcV WOYdh3Nr0piNWFBuycYF3mrdLJN4CF4iHrGi9HRSVLThAj/6jxxemdlH+y9iUTL8aCXe 6d3/0xSdPR3G/amXwBs2etFXR5XqOXKVRjAPZ878FKZUMfd+a+xynlx8DQZnhfJOW+DP NpUQPmANQmFQ43INTUAOoHnwXQ6QatsrKtliivnR3rsk4dawewfTRQeeCeDkjUXB5vk3 87isMG+6mCiRM15/QNs18Z/KwIbDEXu0m+M/X/u64hg5KXg/BaqvnW8QjfFkH01HfwNj f4GQ== 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=uHKqPq2ib8tz4Sx3ThCvv5XU3hhRwaps8k7M5ekzhCI=; b=O6wN2ETyzC7KZGvTO14QJ07DzOyQLCr4IpFGy4dNW7KyL0aR7T0tCNp6dkhniIsphw u9LW4NH3ehwCer2cVvxGwTGwW6zahoa/u1peCyK/TXaRnMBFY1DQk04H0tfwBL33CiFq SbkT5LZtAMyvYwGWUGnHpsivfbqjtNktaenjgBw9d7lg8oAdCsFGEItD6xftgJVwNK0k oY6P0WX07XobdCAtKvv4qlbYMO7/ke2brSFGJRJhS8VTw7FMSVuAXr8WdECSvjw7NbxV 5nGfpttlqTmCL7Hag5t3XMpD4W4HNgahPl1YOVRetQusyHHtEkUGPg3/GKzPDpu37Q3C Ax0w== 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 u2-v6si15141622plr.50.2018.03.08.10.28.59; Thu, 08 Mar 2018 10:28: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 D6C90789F4; Thu, 8 Mar 2018 18:25:45 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id D588278A1E for ; Thu, 8 Mar 2018 18:25:33 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054057" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:34 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:56 +0200 Message-Id: <20180308181804.31261-34-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 34/42] syslinux: 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 --- .../syslinux/syslinux-libupload-depend-lib.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/syslinux/syslinux/syslinux-libupload-depend-lib.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch index c0714b51757..6ba96aeb568 100644 --- a/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch +++ b/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch @@ -20,15 +20,12 @@ Signed-off-by: Robert Yang com32/Makefile | 1 + 1 file changed, 1 insertion(+) -diff --git a/com32/Makefile b/com32/Makefile -index 9a1721b..f172db2 100644 ---- a/com32/Makefile -+++ b/com32/Makefile -@@ -21,3 +21,4 @@ rosh: lib libutil - samples: libutil elflink/ldlinux - sysdump: libupload gpllib +Index: syslinux-6.03/com32/Makefile +=================================================================== +--- syslinux-6.03.orig/com32/Makefile ++++ syslinux-6.03/com32/Makefile +@@ -22,3 +22,4 @@ samples: libutil elflink/ldlinux + sysdump: lib libutil libupload gpllib + lua/src: cmenu modules gpllib: lib +libupload: lib --- -1.7.9.5 - From patchwork Thu Mar 8 18:17: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: 131066 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54378lja; Thu, 8 Mar 2018 10:29:05 -0800 (PST) X-Google-Smtp-Source: AG47ELu2dPqR5d5v5hoSFhMEULCuOqdnu4DQZhqdSCl+vne+u6ho8cFk+FEJ1cq2nRGK3RLTgdWt X-Received: by 10.98.152.86 with SMTP id q83mr27103845pfd.218.1520533745832; Thu, 08 Mar 2018 10:29:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533745; cv=none; d=google.com; s=arc-20160816; b=zRA8niAFHpkGo98C5gDqogwEzliS0t7vsetfG9KrrgP/upg6P5DAWDH8ZXIIf6AMWg WAXWLZC4PjLEiEIYpqGSt9AZew2wx5Rm+lD8iAQ8EtwSQJy0huHal0cTLPLJWbagf6oL jdh/WMItOCEium734Vbxx9uDF0AIKaZkkIFtCiwkA7geHHuQDvUJZ7cFFa3poZFI5k5C N1Ls0NixHRQc5XepU27/XLEfBS76tRMWhiFC4BslagfSKFHAmh0aUY8doqskQZa/uxqp LzlqKV2wgxDbQWOj83RivUkWO0vkF6A4KHjkcGMnOiyB78gr+C0t1MxwlzZQTNYjPqpH LD7g== 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=PbvVFZlGPtPkonsMqtKZYYeEEtavNbw+LXhQi6aA55o=; b=X64rLDL0s2D8mrIbEVzTisGk5sFaGJcz5We03Ghdp0VBGQCfyDldCv3jkTgNc/OCWM 0R/M6Tz87bccZmfbahjzin0JXusaiNuAkUhkBEkVi2+ZPeec/VofUKsrBXMLNH04PwAC iqUHBZBNG0agxb+SejIRnzeqQ5xhc5OLWmPdXSx+pget31ZPAaY03v0GJPndfUtBc8rz UowT2ObkjLKGWAP4CfpH/yRqusqz8C+Mx+H2NQo5Rls8BzvNBtkzFlVFT2BqDq/8jqsN 3aI4LrRK6K8sLpxyrJEBnQw39a+ht8QjslcbJHXPrAJi7ZZ8KmRUakc45JzCG3L3O7e3 ZdGA== 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 v4-v6si13555951plz.414.2018.03.08.10.29.05; Thu, 08 Mar 2018 10:29: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 EEA6D78A6B; Thu, 8 Mar 2018 18:25:46 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 6514D78A25 for ; Thu, 8 Mar 2018 18:25:35 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054062" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:35 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:57 +0200 Message-Id: <20180308181804.31261-35-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 35/42] ppp: 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-connectivity/ppp/ppp/cifdefroute.patch | 71 ++++++++++++---------- .../ppp/makefile-remove-hard-usr-reference.patch | 15 ++--- 2 files changed, 46 insertions(+), 40 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/ppp/ppp/cifdefroute.patch b/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch index db4dbc27a97..7dd69d8f4d8 100644 --- a/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch +++ b/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch @@ -4,10 +4,11 @@ Rebased it to fit ppp-2.4.5. Dongxiao Xu Upstream-Status: Inappropriate [debian/suse patches] -diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c ---- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800 -+++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 16:40:00.478716855 +0800 -@@ -198,6 +198,16 @@ +Index: ppp-2.4.7/pppd/ipcp.c +=================================================================== +--- ppp-2.4.7.orig/pppd/ipcp.c ++++ ppp-2.4.7/pppd/ipcp.c +@@ -198,6 +198,16 @@ static option_t ipcp_option_list[] = { "disable defaultroute option", OPT_ALIAS | OPT_A2CLR, &ipcp_wantoptions[0].default_route }, @@ -24,7 +25,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp, "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp }, { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp, -@@ -271,7 +281,7 @@ +@@ -271,7 +281,7 @@ struct protent ipcp_protent = { ip_active_pkt }; @@ -33,7 +34,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c static void ipcp_script __P((char *, int)); /* Run an up/down script */ static void ipcp_script_done __P((void *)); -@@ -1742,7 +1752,12 @@ +@@ -1761,7 +1771,12 @@ ip_demand_conf(u) if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE)) return 0; if (wo->default_route) @@ -46,7 +47,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c default_route_set[u] = 1; if (wo->proxy_arp) if (sifproxyarp(u, wo->hisaddr)) -@@ -1830,7 +1845,8 @@ +@@ -1849,7 +1864,8 @@ ipcp_up(f) */ if (demand) { if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) { @@ -56,7 +57,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c if (go->ouraddr != wo->ouraddr) { warn("Local IP address changed to %I", go->ouraddr); script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0); -@@ -1855,7 +1871,12 @@ +@@ -1874,7 +1890,12 @@ ipcp_up(f) /* assign a default route through the interface if required */ if (ipcp_wantoptions[f->unit].default_route) @@ -69,7 +70,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c default_route_set[f->unit] = 1; /* Make a proxy ARP entry if requested. */ -@@ -1905,7 +1926,12 @@ +@@ -1924,7 +1945,12 @@ ipcp_up(f) /* assign a default route through the interface if required */ if (ipcp_wantoptions[f->unit].default_route) @@ -82,7 +83,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c default_route_set[f->unit] = 1; /* Make a proxy ARP entry if requested. */ -@@ -1983,7 +2009,7 @@ +@@ -2002,7 +2028,7 @@ ipcp_down(f) sifnpmode(f->unit, PPP_IP, NPMODE_DROP); sifdown(f->unit); ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr, @@ -91,7 +92,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c } /* Execute the ip-down script */ -@@ -1999,12 +2025,21 @@ +@@ -2018,12 +2044,21 @@ ipcp_down(f) * proxy arp entries, etc. */ static void @@ -115,10 +116,11 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c cifproxyarp(unit, hisaddr); proxy_arp_set[unit] = 0; } -diff -urN ppp-2.4.5-orig/pppd/ipcp.h ppp-2.4.5/pppd/ipcp.h ---- ppp-2.4.5-orig/pppd/ipcp.h 2010-06-30 15:51:12.043682063 +0800 -+++ ppp-2.4.5/pppd/ipcp.h 2010-06-30 16:40:49.586203129 +0800 -@@ -70,6 +70,7 @@ +Index: ppp-2.4.7/pppd/ipcp.h +=================================================================== +--- ppp-2.4.7.orig/pppd/ipcp.h ++++ ppp-2.4.7/pppd/ipcp.h +@@ -70,6 +70,7 @@ typedef struct ipcp_options { bool old_addrs; /* Use old (IP-Addresses) option? */ bool req_addr; /* Ask peer to send IP address? */ bool default_route; /* Assign default route through interface? */ @@ -126,10 +128,11 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.h ppp-2.4.5/pppd/ipcp.h bool proxy_arp; /* Make proxy ARP entry for peer? */ bool neg_vj; /* Van Jacobson Compression? */ bool old_vj; /* use old (short) form of VJ option? */ -diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8 ---- ppp-2.4.5-orig/pppd/pppd.8 2010-06-30 15:51:12.043682063 +0800 -+++ ppp-2.4.5/pppd/pppd.8 2010-06-30 16:42:47.102413859 +0800 -@@ -121,6 +121,13 @@ +Index: ppp-2.4.7/pppd/pppd.8 +=================================================================== +--- ppp-2.4.7.orig/pppd/pppd.8 ++++ ppp-2.4.7/pppd/pppd.8 +@@ -121,6 +121,13 @@ the gateway, when IPCP negotiation is su This entry is removed when the PPP connection is broken. This option is privileged if the \fInodefaultroute\fR option has been specified. .TP @@ -143,7 +146,7 @@ diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8 .B disconnect \fIscript Execute the command specified by \fIscript\fR, by passing it to a shell, after -@@ -717,7 +724,12 @@ +@@ -734,7 +741,12 @@ disable both forms of hardware flow cont .TP .B nodefaultroute Disable the \fIdefaultroute\fR option. The system administrator who @@ -157,10 +160,11 @@ diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8 can do so by placing this option in the /etc/ppp/options file. .TP .B nodeflate -diff -urN ppp-2.4.5-orig/pppd/pppd.h ppp-2.4.5/pppd/pppd.h ---- ppp-2.4.5-orig/pppd/pppd.h 2010-06-30 15:51:12.050166398 +0800 -+++ ppp-2.4.5/pppd/pppd.h 2010-06-30 16:43:36.514148327 +0800 -@@ -643,7 +643,11 @@ +Index: ppp-2.4.7/pppd/pppd.h +=================================================================== +--- ppp-2.4.7.orig/pppd/pppd.h ++++ ppp-2.4.7/pppd/pppd.h +@@ -665,7 +665,11 @@ int sif6addr __P((int, eui64_t, eui64_t int cif6addr __P((int, eui64_t, eui64_t)); /* Remove an IPv6 address from i/f */ #endif @@ -172,19 +176,20 @@ diff -urN ppp-2.4.5-orig/pppd/pppd.h ppp-2.4.5/pppd/pppd.h /* Create default route through i/f */ int cifdefaultroute __P((int, u_int32_t, u_int32_t)); /* Delete default route through i/f */ -diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c ---- ppp-2.4.5-orig/pppd/sys-linux.c 2010-06-30 15:51:12.050166398 +0800 -+++ ppp-2.4.5/pppd/sys-linux.c 2010-06-30 16:54:00.362716231 +0800 -@@ -206,6 +206,8 @@ - +Index: ppp-2.4.7/pppd/sys-linux.c +=================================================================== +--- ppp-2.4.7.orig/pppd/sys-linux.c ++++ ppp-2.4.7/pppd/sys-linux.c +@@ -207,6 +207,8 @@ static unsigned char inbuf[512]; /* buff static int if_is_up; /* Interface has been marked up */ + static int if6_is_up; /* Interface has been marked up for IPv6, to help differentiate */ static int have_default_route; /* Gateway for default route added */ +static struct rtentry old_def_rt; /* Old default route */ +static int default_rt_repl_rest; /* replace and restore old default rt */ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ static char proxy_arp_dev[16]; /* Device for proxy arp entry */ static u_int32_t our_old_addr; /* for detecting address changes */ -@@ -1537,6 +1539,9 @@ +@@ -1545,6 +1547,9 @@ static int read_route_table(struct rtent p = NULL; } @@ -194,7 +199,7 @@ diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16); SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); -@@ -1606,20 +1611,51 @@ +@@ -1614,20 +1619,51 @@ int have_route_to(u_int32_t addr) /******************************************************************** * * sifdefaultroute - assign a default route through the address given. @@ -260,7 +265,7 @@ diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c } memset (&rt, 0, sizeof (rt)); -@@ -1638,6 +1674,12 @@ +@@ -1646,6 +1682,12 @@ int sifdefaultroute (int unit, u_int32_t error("default route ioctl(SIOCADDRT): %m"); return 0; } @@ -273,7 +278,7 @@ diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c have_default_route = 1; return 1; -@@ -1673,6 +1715,16 @@ +@@ -1681,6 +1723,16 @@ int cifdefaultroute (int unit, u_int32_t return 0; } } diff --git a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch index d59717ebd3f..8a69396cc71 100644 --- a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch +++ b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch @@ -6,10 +6,11 @@ Signed-off-by: Andreas Oberritter Upstream-Status: Inappropriate [configuration] -diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux ---- ppp-2.4.5-orig/pppd/Makefile.linux 2010-06-30 15:51:12.043682063 +0800 -+++ ppp-2.4.5/pppd/Makefile.linux 2010-06-30 17:08:21.806363042 +0800 -@@ -117,10 +117,10 @@ +Index: ppp-2.4.7/pppd/Makefile.linux +=================================================================== +--- ppp-2.4.7.orig/pppd/Makefile.linux ++++ ppp-2.4.7/pppd/Makefile.linux +@@ -120,10 +120,10 @@ CFLAGS += -DHAS_SHADOW #LIBS += -lshadow $(LIBS) endif @@ -20,9 +21,9 @@ diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux -endif +#endif - ifdef NEEDDES - ifndef USE_CRYPT -@@ -169,10 +169,10 @@ + ifdef USE_LIBUTIL + CFLAGS += -DHAVE_LOGWTMP=1 +@@ -177,10 +177,10 @@ LIBS += -ldl endif ifdef FILTER From patchwork Thu Mar 8 18:17: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: 131067 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54510lja; Thu, 8 Mar 2018 10:29:12 -0800 (PST) X-Google-Smtp-Source: AG47ELszDbfdEKWYw8azZ+dCrIxO4V8QaCYtOiG+1Ef2ZBvTy0HuBGVEcwe4RKUhc2Iw4YibNGY+ X-Received: by 10.98.71.210 with SMTP id p79mr25058995pfi.47.1520533752785; Thu, 08 Mar 2018 10:29:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533752; cv=none; d=google.com; s=arc-20160816; b=fIumquZGOG+58KdfAqYnRj5WRNauH2a86ui9Z9Rpp+UlNaLhu5ZQQpPGpDeE7TQSF1 Fx9C3qea/KMuJbXGgsngyo0npkKR4x9fHM5UITWx4fq0JpH/WLUVo3FqKbN90znINHjl /SDNlStcE3vTJbOK2Sm59OLlIZnjKnA+fd6RUuMJy3DnBne5plG/VLucM+8ikGmbOQPE /e9FzTC2I4QGqNborhSU5IjftDQeWWFdYIzxfwkL62bQdzmcRSp3JcjiSMXdem4fmy+5 /1wA1GdhBRvlwMxZ5Ib7k5yYZtuAuh3gCHHhrLrJkOFPNkAv6ZNLffb2SQPSb97NHGkW Jnnw== 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=1DSwv3tO6KVeYrx70srNtMUdnFdC6Z6SXLDuHlvkCpw=; b=ySsB/7GM+mSNXUpQDTqQDtxUolo2gU+80CNIZjBZnpK0f6w+H/vymcT51hPO55+5D4 VAL0A/q/OvcJM88d+U4Sx5smA9GlwESWoDzY2tTdGeoyOcQR8KMR8zH0kZ3Pa4Ye7UTi j+nku6bZTtiiJ2F49YX2Y8w42mgle95UxMvUTHCtea0TqqQEDIZA4R59dZy0fQrw38ry NuXVL5csJ9hSU5lvJ2IZ2oy42lJ9udGJH5l37eNqIoZGl5NmwIe7kPrb9eE2Wx3y7t7p 5urMkTEs1GfD61fBaqfEkLoqFvJgXc3QJ8sYSp6Ccy4T0JPlnZqxUPnmY+jVc6UbrQDd hVCw== 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 21si16279721pfj.306.2018.03.08.10.29.12; Thu, 08 Mar 2018 10:29:12 -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 349B078A5D; Thu, 8 Mar 2018 18:25:48 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id E33EC78A2B for ; Thu, 8 Mar 2018 18:25:36 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054076" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:37 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:58 +0200 Message-Id: <20180308181804.31261-36-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 36/42] util-linux: 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-core/util-linux/util-linux/configure-sbindir.patch | 10 +++++----- 1 file changed, 5 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-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch index a5b1ff12e53..e475289f65f 100644 --- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch @@ -5,11 +5,11 @@ Signed-off-by: Phil Blundell Signed-off-by: Saul Wold X-Patchwork-Id: 131068 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54609lja; Thu, 8 Mar 2018 10:29:19 -0800 (PST) X-Google-Smtp-Source: AG47ELtYFXSmwCxE+jTht1HKh0LgdWuK9ZlHo3qEHOC2B39N5g7CzAX6O/Xa77sgGOv8hjtWrTNZ X-Received: by 10.98.16.131 with SMTP id 3mr27285030pfq.188.1520533759224; Thu, 08 Mar 2018 10:29:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533759; cv=none; d=google.com; s=arc-20160816; b=oeH96KcN9pzdr42wuKb7j42eD1CTneeKwJG3IzA8jCEV0P8vs3qRxl9r8os9kqKHSb Ol8c95WoN2dzUuUDXVvdcVdCmQ41wu1IXaXXQ7PyIvZ5/H0YYom7PE0bi6NNfZpETfTN CG4P1sKSGm24TKsb5opmkk9SDdT4Z0NP1mrfJkPzF77Jsit8+RGVEMFRH1qySDt1rym9 LE5paQyaAToSvSQHpIvN4dghccTSFU/TFqj3ZjqoHU91gpWv6ReK66MjCFW1VkavZNwS pVyE4Q7JmiuFHi0tj80Q6dVFCGdy0QxSdPcdKIW/M2WezZdDmYhpwJR6OQvXVLLyum1k Q7VA== 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=p5pGHJuKLyANkb+OcreiXsUWHKB41njtZz9dur3vBxs=; b=qR1oicWPpeIOE2/nnMt2D5yV4MIM5b+FHUXf1bloD15nfYNnAbOSosVDORZGaVOyYT LbOCf1A5j8L7RXcedqU4RqYVYa9udWewTcT/M3Sx2wl1iAMEiHAwjFI4exxzmbaUYssw urODIyfD48d0LSfRLbxIfR5l04zPD27xAuUTtOL57kPmM4vo+NMJdOWX9lWe5NZ+zbGb a0IEKDQGrZfxMwU32tR/cLal5i/Yn+hNKeaAQYAx1+dNtJDkxmCX3f7P3eHyuAlm6qyx NTMVUAjC5qsIwfZv4p3YfJW4yznLg1M+EKGMHPOpuVmWRk8OkSMOrzBu7HIH3/tWxnfU nKzw== 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 70-v6si15273961ple.465.2018.03.08.10.29.18; Thu, 08 Mar 2018 10:29: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 496A878A6C; Thu, 8 Mar 2018 18:25:49 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 74B4978A2C for ; Thu, 8 Mar 2018 18:25:38 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054083" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:38 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:59 +0200 Message-Id: <20180308181804.31261-37-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 37/42] zlib: 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 --- .../zlib/zlib-1.2.11/remove.ldconfig.call.patch | 13 +++++++------ 1 file changed, 7 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-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch index 403b4825c9b..7ccbe1f44c6 100644 --- a/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch +++ b/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch @@ -7,14 +7,15 @@ So remove ldconfig call from make install-libs Upstream-Status: Inappropriate [disable feature] -diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in ---- zlib-1.2.6.orig/Makefile.in 2012-01-28 23:48:50.000000000 +0100 -+++ zlib-1.2.6/Makefile.in 2012-02-13 15:38:20.577700723 +0100 -@@ -199,7 +199,6 @@ +Index: zlib-1.2.11/Makefile.in +=================================================================== +--- zlib-1.2.11.orig/Makefile.in ++++ zlib-1.2.11/Makefile.in +@@ -322,7 +322,6 @@ install-libs: $(LIBS) rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ - ($(LDCONFIG) || true) >/dev/null 2>&1; \ fi - cp zlib.3 $(DESTDIR)$(man3dir) - chmod 644 $(DESTDIR)$(man3dir)/zlib.3 + rm -f $(DESTDIR)$(man3dir)/zlib.3 + cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir) From patchwork Thu Mar 8 18:18: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: 131069 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54734lja; Thu, 8 Mar 2018 10:29:26 -0800 (PST) X-Google-Smtp-Source: AG47ELs7njIlHEsnGsNMtu63oOUR9mc/u6tE8Rw0r96c55gcYqLN7mMJ7oYhAiTRebyc6k4ziUR0 X-Received: by 10.99.60.72 with SMTP id i8mr20226565pgn.399.1520533766688; Thu, 08 Mar 2018 10:29:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533766; cv=none; d=google.com; s=arc-20160816; b=o71xo+FccwnjydarhoM16Pip2aINEZ9/iwqMectp0mQlXQM2EocvZv7LzmIMghhjI9 +XeL/78kw5LVeVG04YsLKq2P2BI7hbTnYUwx6nix81gR/NhTf+7Pe8Y+X4/A4ZzbTDNt e92xptTSuqywXfcdDkpUE8pP3wbO8yDkxeSur8C2vCv4UBs+gCU4ZtclEB0QbrV5h85J UNcDF7CsMCWPN6u5FfY6UUW8kr2rJEzpQ7EfTfBtr7dn06TrbUeZO/ze5cQWgQ2E8T4w 1pm7On654dpqA0RIA9Yn1+YfMMMD7QAzMJqN4svAtzdBqTamocZvWVxIsKe3FOH7PBFA xsTA== 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=R/9NdgymJfy0sBSj3TtA9WAuFYnMb7QYtyx5k1XnmMo=; b=a7IW0CC4pcnen3I6OFRqN0DDTV1H27Of9qtAMvWLBpyW6hNGG1kxuqeVolKDG5a6id Z+met9449xDwSd8Drxj+V8/VbdSvEnihF91OYKHXe8EUzQTsz7l1+y/vMdB5d271JHgo X376pCYFyW6tdEtgTtgw6ScSyP1HpdLfBlSH61cgOla7XOUbQiyxy7t5fPDxkP++CP+e XhdmkYq6h/ToM3eYrUf1buxjm/OSzMo0LcL91PaCfgsonTUehG2vhF5DNuC81LMSwO88 pVGPDjyDHtuGx6B8l4BDT19+gA/nw0J9Z3sfCAAJlbINggMZEJj516ctOuWxgbyv20cu ADpA== 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 f33-v6si15239712plb.482.2018.03.08.10.29.26; Thu, 08 Mar 2018 10:29:26 -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 785B978A72; Thu, 8 Mar 2018 18:25:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 0399E789FB for ; Thu, 8 Mar 2018 18:25:39 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054091" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:40 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:18:00 +0200 Message-Id: <20180308181804.31261-38-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 38/42] irda-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 --- .../irda-utils/irda-utils-0.9.18/ldflags.patch | 64 +++++++++++++--------- 1 file changed, 38 insertions(+), 26 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/irda-utils/irda-utils-0.9.18/ldflags.patch b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch index e95fe35f8f8..b246de8f5fd 100644 --- a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch +++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch @@ -3,72 +3,84 @@ Obey LDFLAGS Signed-off-by: Christopher Larson Upstream-Status: Pending +Index: irda-utils-0.9.18/findchip/Makefile +=================================================================== --- irda-utils-0.9.18.orig/findchip/Makefile +++ irda-utils-0.9.18/findchip/Makefile @@ -65,5 +65,5 @@ install: findchip - - gfindchip: gfindchip.c - $(prn_cc) + + gfindchip: gfindchip.c + $(prn_cc) - $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs` + $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs` - + +Index: irda-utils-0.9.18/irattach/Makefile +=================================================================== --- irda-utils-0.9.18.orig/irattach/Makefile +++ irda-utils-0.9.18/irattach/Makefile @@ -49,13 +49,13 @@ all: $(TARGETS) - + irattach: irattach.o util.o - $(prn_cc_o) + $(prn_cc_o) - $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@ + $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@ - - - + + + dongle_attach: dongle_attach.o - $(prn_cc_o) + $(prn_cc_o) - $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@ + $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@ - - + + install: $(TARGETS) +Index: irda-utils-0.9.18/irdadump/Makefile +=================================================================== --- irda-utils-0.9.18.orig/irdadump/Makefile +++ irda-utils-0.9.18/irdadump/Makefile @@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS) - + irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) - $(prn_cc_o) + $(prn_cc_o) - $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) - - + + .c.o: +Index: irda-utils-0.9.18/irdaping/Makefile +=================================================================== --- irda-utils-0.9.18.orig/irdaping/Makefile +++ irda-utils-0.9.18/irdaping/Makefile @@ -56,7 +56,7 @@ all: $(TARGETS) - + irdaping: $(OBJS) - $(prn_cc_o) + $(prn_cc_o) - $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ + $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ - - + + .c.o: +Index: irda-utils-0.9.18/irnetd/Makefile +=================================================================== --- irda-utils-0.9.18.orig/irnetd/Makefile +++ irda-utils-0.9.18/irnetd/Makefile @@ -50,7 +50,7 @@ all: $(TARGETS) - + irnetd: $(OBJS) - $(prn_cc_o) + $(prn_cc_o) - $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ + $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ - - + + install: irnetd +Index: irda-utils-0.9.18/psion/Makefile +=================================================================== --- irda-utils-0.9.18.orig/psion/Makefile +++ irda-utils-0.9.18/psion/Makefile @@ -25,4 +25,4 @@ install: $(PSION_TARGETS) CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) - irpsion5: - $(prn_cc_o) + irpsion5: + $(prn_cc_o) - $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ \ No newline at end of file + $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@ From patchwork Thu Mar 8 18:18: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: 131070 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54921lja; Thu, 8 Mar 2018 10:29:39 -0800 (PST) X-Google-Smtp-Source: AG47ELtqddcFWYKtrWg/58bVJ50CmZsd/cImmwJJTqhu7cjDNQsmLmWWVnEBf4TZuA4zsQoBO/WQ X-Received: by 10.98.217.211 with SMTP id b80mr27597296pfl.107.1520533779022; Thu, 08 Mar 2018 10:29:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533779; cv=none; d=google.com; s=arc-20160816; b=qwlNoGRsjfP+VvIzhjQdTcTseK1jREbaWnAMsplJ/kOdNo+LVRgX4wt1I15FE3BU51 K4bwCPSD8rziXJ198UtBUNzkO3wORlKq5P3aUDMYdvOhjUYeNWu6Ke5g8WPkAMKNLHD+ NPe4UzA+JUpJ5MsXWQG4IJJe5VYq8i4+YmMag7aGtG0oESvz+f5yaTyFmPVD/zV1tiFt uP48XLriXXg4CisVErKv5C5qwU82U3Yul3DXx2Q0ZnoevDsnX+bGFvLdY3LjVS/Z7AfT LYtl+bHA+lPoGoue9TZ/KINkq9xegJ5oIlB83WA5T3SvfUu1kuEVa+heyV50D2hPvyjn DuOA== 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=Cj2Scc6pqYEhNZWn3eWpZpDfzsum3YtY+rRaLLNjJi4=; b=zccxl9cCMOJKN7jQs3awC0qhMVa0vmrgTSc+3moiwllFfXTg+fAveL7tsDxktJfxu/ zGLV6Bmsbb4x43bwsoItZ58zN4LJnmz7f2o+QIKi0Vn8+3WpdOR9a0oy3paQxGlvGr8Y kUv/DBdERNt3qzA//Wjvu35zHy5ZNqFL1m5CFgUk53ptqeosKQST4dgOh+dqpbs7vAXD 4ybIHZz+yqiBYkhw6E70OvZ7rB5IIx8XVM/jBfiy9A7r/r3kAdv8z9JOSnittl01ZYoc sLNi3ZnuutkCsHgDV999aMxIDiTRpzjzitWnNd17KmOEgPm2fOzB3NE4RPMiQ54Ez4dI DjNw== 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 n3-v6si14959650plb.817.2018.03.08.10.29.38; Thu, 08 Mar 2018 10:29:39 -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 9FC0478A42; Thu, 8 Mar 2018 18:25:52 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 2574978A3D for ; Thu, 8 Mar 2018 18:25:43 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054115" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:43 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:18:02 +0200 Message-Id: <20180308181804.31261-40-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 40/42] 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 --- .../add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 10 ++++---- .../python/avoid_warning_about_tkinter.patch | 30 ++++++++-------------- .../avoid_warning_for_sunos_specific_module.patch | 12 ++++----- .../python3/070-dont-clean-ipkg-install.patch | 14 +++++----- .../python3/avoid_warning_about_tkinter.patch | 30 ++++++++-------------- ...-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 17 +++++------- .../sysconfig.py-add-_PYTHON_PROJECT_SRC.patch | 25 ++++++++---------- 7 files changed, 57 insertions(+), 81 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/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch index a97ff6b2506..506debaf761 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,10 +13,10 @@ Signed-off-by: Jackie Huang configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: Python-2.7.11/configure.ac +Index: Python-2.7.13/configure.ac =================================================================== ---- Python-2.7.11.orig/configure.ac -+++ Python-2.7.11/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 AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) fi @@ -24,5 +24,5 @@ Index: Python-2.7.11/configure.ac - 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 - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) + # Used to comment out stuff for rebuilding generated files + GENERATED_COMMENT='#' diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch index 3347321fde6..287095f615c 100644 --- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch +++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch @@ -7,13 +7,16 @@ Upstream-Status: Inappropriate [distribution] Also simply disable the tk module since its not in DEPENDS. Signed-off-by: Andrei Gherzan -Index: Python-2.7.2/setup.py +Index: Python-2.7.13/setup.py =================================================================== ---- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 -+++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 -@@ -1634,8 +1634,10 @@ +--- Python-2.7.13.orig/setup.py ++++ Python-2.7.13/setup.py +@@ -1783,10 +1783,12 @@ class PyBuildExt(build_ext): + self.extensions.extend(exts) + # Call the method for detecting whether _tkinter can be compiled - self.detect_tkinter(inc_dirs, lib_dirs) +- self.detect_tkinter(inc_dirs, lib_dirs) ++ # self.detect_tkinter(inc_dirs, lib_dirs) - if '_tkinter' not in [e.name for e in self.extensions]: - missing.append('_tkinter') @@ -22,18 +25,5 @@ Index: Python-2.7.2/setup.py + #if '_tkinter' not in [e.name for e in self.extensions]: + # missing.append('_tkinter') - return missing - -diff --git Python-3.5.1.orig/setup.py Python-3.5.1/setup.py -index b4633b9..d7588c0 100644 ---- Python-3.5.1.orig/setup.py -+++ Python-3.5.1/setup.py -@@ -1536,7 +1536,7 @@ class PyBuildExt(build_ext): - self.extensions.extend(exts) - - # Call the method for detecting whether _tkinter can be compiled -- self.detect_tkinter(inc_dirs, lib_dirs) -+ # self.detect_tkinter(inc_dirs, lib_dirs) - - # tkinter module will not be avalaible as yocto - # doesn't have tk integrated (yet) + ## # Uncomment these lines if you want to play with xxmodule.c + ## ext = Extension('xx', ['xxmodule.c']) diff --git a/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch b/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch index 337e0e3e29b..8ba58230144 100644 --- a/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch +++ b/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch @@ -5,12 +5,12 @@ Upstream-Status: Inappropriate [distribution] Signed-off-by: Andrei Gherzan -Index: Python-2.7.2/setup.py +Index: Python-2.7.13/setup.py =================================================================== ---- Python-2.7.2.orig/setup.py 2012-04-05 22:29:18.049196608 +0300 -+++ Python-2.7.2/setup.py 2012-04-05 22:29:57.505195453 +0300 -@@ -1522,8 +1522,9 @@ - if platform == 'sunos5': +--- Python-2.7.13.orig/setup.py ++++ Python-2.7.13/setup.py +@@ -1671,8 +1671,9 @@ class PyBuildExt(build_ext): + if host_platform == 'sunos5': # SunOS specific modules exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) ) - else: @@ -19,5 +19,5 @@ Index: Python-2.7.2/setup.py + #else: + # missing.append('sunaudiodev') - if platform == 'darwin': + if host_platform == 'darwin': # _scproxy diff --git a/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch b/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch index 789929b715a..f9971c6bafd 100644 --- a/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch +++ b/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch @@ -8,9 +8,11 @@ Upstream-Status: Inappropriate [OE specific] Makefile.pre.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1306,8 +1306,8 @@ touch: +Index: Python-3.5.3/Makefile.pre.in +=================================================================== +--- Python-3.5.3.orig/Makefile.pre.in ++++ Python-3.5.3/Makefile.pre.in +@@ -1574,8 +1574,8 @@ touch: # Sanitation targets -- clean leaves libraries, executables and tags # files, which clobber removes as well pycremoval: @@ -21,7 +23,7 @@ Upstream-Status: Inappropriate [OE specific] rmtestturds: -rm -f *BAD *GOOD *SKIPPED -@@ -1321,9 +1321,9 @@ docclean: +@@ -1589,9 +1589,9 @@ docclean: -rm -rf Doc/tools/sphinx Doc/tools/pygments Doc/tools/docutils clean: pycremoval @@ -32,5 +34,5 @@ Upstream-Status: Inappropriate [OE specific] + find . ! -path './ipkg-install/*' -name '*.s[ol]' -exec rm -f {} ';' + find . ! -path './ipkg-install/*' -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' find build -name 'fficonfig.h' -exec rm -f {} ';' || true - find build -name 'fficonfig.py' -exec rm -f {} ';' || true - -rm -f Lib/lib2to3/*Grammar*.pickle + find build -name '*.py' -exec rm -f {} ';' || true + find build -name '*.py[co]' -exec rm -f {} ';' || true diff --git a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch index 3347321fde6..a3cc48c9a4d 100644 --- a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch +++ b/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch @@ -7,13 +7,16 @@ Upstream-Status: Inappropriate [distribution] Also simply disable the tk module since its not in DEPENDS. Signed-off-by: Andrei Gherzan -Index: Python-2.7.2/setup.py +Index: Python-3.5.3/setup.py =================================================================== ---- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 -+++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 -@@ -1634,8 +1634,10 @@ +--- Python-3.5.3.orig/setup.py ++++ Python-3.5.3/setup.py +@@ -1558,10 +1558,12 @@ class PyBuildExt(build_ext): + self.extensions.extend(exts) + # Call the method for detecting whether _tkinter can be compiled - self.detect_tkinter(inc_dirs, lib_dirs) +- self.detect_tkinter(inc_dirs, lib_dirs) ++ # self.detect_tkinter(inc_dirs, lib_dirs) - if '_tkinter' not in [e.name for e in self.extensions]: - missing.append('_tkinter') @@ -22,18 +25,5 @@ Index: Python-2.7.2/setup.py + #if '_tkinter' not in [e.name for e in self.extensions]: + # missing.append('_tkinter') - return missing - -diff --git Python-3.5.1.orig/setup.py Python-3.5.1/setup.py -index b4633b9..d7588c0 100644 ---- Python-3.5.1.orig/setup.py -+++ Python-3.5.1/setup.py -@@ -1536,7 +1536,7 @@ class PyBuildExt(build_ext): - self.extensions.extend(exts) - - # Call the method for detecting whether _tkinter can be compiled -- self.detect_tkinter(inc_dirs, lib_dirs) -+ # self.detect_tkinter(inc_dirs, lib_dirs) - - # tkinter module will not be avalaible as yocto - # doesn't have tk integrated (yet) + ## # Uncomment these lines if you want to play with xxmodule.c + ## ext = Extension('xx', ['xxmodule.c']) 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 74490d93a5f..211f9e78890 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,19 +10,16 @@ Signed-off-by: Jackie Huang configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 989baf9..2890c96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -67,7 +67,7 @@ if test "$cross_compiling" = yes; then +Index: Python-3.5.3/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 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 - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) --- -2.0.1 - + # Used to comment out stuff for rebuilding generated files + GENERATED_COMMENT='#' diff --git a/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch b/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch index de07643f2bb..c89d9a3d836 100644 --- a/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch +++ b/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch @@ -17,12 +17,12 @@ Signed-off-by: Robert Yang Lib/sysconfig.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index a545ab9..74317d1 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -554,7 +554,10 @@ def get_config_vars(*args): - _config_vars['exec_prefix'] = EXEC_PREFIX +Index: Python-3.5.3/Lib/distutils/sysconfig.py +=================================================================== +--- Python-3.5.3.orig/Lib/distutils/sysconfig.py ++++ Python-3.5.3/Lib/distutils/sysconfig.py +@@ -498,7 +498,10 @@ def get_config_vars(*args): + _config_vars['SO'] = SO # Always convert srcdir to an absolute path - srcdir = _config_vars.get('srcdir', project_base) @@ -33,11 +33,11 @@ index a545ab9..74317d1 100644 if os.name == 'posix': if python_build: # If srcdir is a relative path (typically '.' or '..') -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 7287f11..cc92998 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -562,7 +562,10 @@ def get_config_vars(*args): +Index: Python-3.5.3/Lib/sysconfig.py +=================================================================== +--- Python-3.5.3.orig/Lib/sysconfig.py ++++ Python-3.5.3/Lib/sysconfig.py +@@ -544,7 +544,10 @@ def get_config_vars(*args): _CONFIG_VARS['userbase'] = _getuserbase() # Always convert srcdir to an absolute path @@ -49,6 +49,3 @@ index 7287f11..cc92998 100644 if os.name == 'posix': if _PYTHON_BUILD: # If srcdir is a relative path (typically '.' or '..') --- -1.7.9.5 - From patchwork Thu Mar 8 18:18: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: 131071 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp55041lja; Thu, 8 Mar 2018 10:29:45 -0800 (PST) X-Google-Smtp-Source: AG47ELvenYT5WULYsdB8R1HCzEaIkMtl6xFF6PvKTDEshS6YYx1b42cGDva5rYElgdF/TX7p5lzZ X-Received: by 10.99.47.132 with SMTP id v126mr22160792pgv.42.1520533785175; Thu, 08 Mar 2018 10:29:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533785; cv=none; d=google.com; s=arc-20160816; b=xtbbcR/fl8ssQryk24eb1JnOm5y8XaQ2BEnVMDSrpXd577rhcTbaVkkMc6qHmu3WO7 5/7d9jVdT41ciXURpBAcoxzV/Z8U0fXOWlm3WiSPQOUInRC5sPSJy6Gznewgpiu9Nkwe 8BxyxQHjPndEVGzHxvoOBicAqNHBIFwmnwIEftCfsy/Lnvz7cNrstmN5M8QKYnSEUduk +Tf7n7+xE19yPiGaRhOBAf6K0uU99MXAR+Ms7UoCIFuW6E3sy9Pb1NhR5RAWRGzKyNSy mekWFO4PAEq5CASNHujkGmlDQIq12bt9lDdHr9T+1ba7+1JdVUDrxJpvdRCBw+PK7JIr UiLA== 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=ufxcObv8Xv1a3gbQaA7cibf273xQ+bziwPVGmvRZxDQ=; b=AKt+F1BPOMT6ibkoUH6N/RdvTe9aKpAbN9bfAeE/ZPWYA8kvVyYY59I0zq4JGtSdTL 8EdcOu58x43+bjp74P0M43vbm8Fz3T43CutsSNRhx5bR3MgVqdJ+UuaHNwnB/m/H2s1t EGv8CsG6acOcer+0DclJzC30GtsLDT/D3HDGuTtPMqW1wHpuXWTWUre2qwoQW2ktSfgT +vG3FtgdlR6hqfabyNKKQqLxdlqHgQZ/a0cxkFZl8w/uqvg67b4mGnUMEzeve4uau5wQ 0lwUSuT7Bvn6lHqz+xGW+0XL3PLqctYT4xNuVWMa3fchlNKfNIy60ZRaWY7NgYgteWTT TYjw== 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 o62si13328098pga.158.2018.03.08.10.29.44; Thu, 08 Mar 2018 10:29: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 BB28578A59; Thu, 8 Mar 2018 18:25:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id AD23A78A55 for ; Thu, 8 Mar 2018 18:25:44 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054129" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:45 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:18:03 +0200 Message-Id: <20180308181804.31261-41-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 41/42] perl: 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/perl/perl/Makefile.SH.patch | 44 +++++++++++----------- .../perl/perl/cross-generate_uudmap.patch | 14 +++---- .../recipes-devtools/perl/perl/fix_bad_rpath.patch | 12 +++--- meta/recipes-devtools/perl/perl/installperl.patch | 12 +++--- ...-fix-regenerate-makefile-failed-while-cc-.patch | 13 +++---- .../perl/perl/perl-archlib-exp.patch | 12 +++--- .../perl/perl/perl-dynloader.patch | 14 +++---- .../perl/perl/perl-enable-gdbm.patch | 10 ++--- 8 files changed, 63 insertions(+), 68 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/perl/perl/Makefile.SH.patch b/meta/recipes-devtools/perl/perl/Makefile.SH.patch index fd8237fe796..c1db335e0d6 100644 --- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch +++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch @@ -12,10 +12,10 @@ Signed-off-by: Hongxu Jia Makefile.SH | 147 ++++++++++++++++++++++++++++-------------------------------- 1 file changed, 68 insertions(+), 79 deletions(-) -diff --git a/Makefile.SH b/Makefile.SH -index 916b332..b143d46 100755 ---- a/Makefile.SH -+++ b/Makefile.SH +Index: perl-5.24.1/Makefile.SH +=================================================================== +--- perl-5.24.1.orig/Makefile.SH ++++ perl-5.24.1/Makefile.SH @@ -48,10 +48,10 @@ case "$useshrplib" in true) # Prefix all runs of 'miniperl' and 'perl' with @@ -74,6 +74,10 @@ index 916b332..b143d46 100755 -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) - @echo " "; - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." +- +-$(MANIFEST_SRT): MANIFEST $(PERL_EXE) +- @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ +- $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true) +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) +# @echo " "; +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." @@ -83,10 +87,7 @@ index 916b332..b143d46 100755 +more: $(generated_pods) $(private) $(public) + +more2: $(dynamic_ext) - --$(MANIFEST_SRT): MANIFEST $(PERL_EXE) -- @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ -- $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true) ++ +more3: $(nonxs_ext) + +more4: extras.make $(MANIFEST_SRT) @@ -151,7 +152,7 @@ index 916b332..b143d46 100755 ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def !NO!SUBS! -@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOADER) $(LIBPERLEXPORT) +@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOA true) $spitshell >>$Makefile <<'!NO!SUBS!' rm -f $@ @@ -160,7 +161,7 @@ index 916b332..b143d46 100755 !NO!SUBS! case "$osname" in aix) -@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl +@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_obj $spitshell >>$Makefile <<'!NO!SUBS!' lib/buildcustomize.pl: $& $(miniperl_objs) $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs) @@ -183,7 +184,7 @@ index 916b332..b143d46 100755 $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! ;; -@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl +@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj -@rm -f miniperl.xok $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ $(miniperl_objs) $(libs) @@ -194,7 +195,7 @@ index 916b332..b143d46 100755 $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! ;; -@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_objs) write_buildcustomize.pl +@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_o -@rm -f miniperl.xok -@rm \$(MINIPERL_EXE) \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) @@ -205,7 +206,7 @@ index 916b332..b143d46 100755 \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" !GROK!THIS! else -@@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl +@@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj -@rm -f miniperl.xok $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ $(miniperl_objs) $(libs) @@ -225,7 +226,7 @@ index 916b332..b143d46 100755 -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ done -@@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) +@@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM *) $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: makeppport @@ -254,7 +255,7 @@ index 916b332..b143d46 100755 $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p # Commented out so always runs, mktables looks at far more files than we # can in this makefile to decide if needs to run or not -@@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) +@@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 # But also this ensures that all extensions are built before we try to scan # them, which picks up Devel::PPPort's documentation. @@ -270,9 +271,9 @@ index 916b332..b143d46 100755 $(MINIPERL) autodoc.pl pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST -@@ -1089,7 +1099,7 @@ pod/perl5240delta.pod: pod/perldelta.pod - $(RMS) pod/perl5240delta.pod - $(LNS) perldelta.pod pod/perl5240delta.pod +@@ -1089,7 +1099,7 @@ pod/perl5241delta.pod: pod/perldelta.pod + $(RMS) pod/perl5241delta.pod + $(LNS) perldelta.pod pod/perl5241delta.pod -extra.pods: $(MINIPERL_EXE) +extra.pods: @@ -345,7 +346,7 @@ index 916b332..b143d46 100755 $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE -@@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) +@@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(n case "$targethost" in '') $spitshell >>$Makefile <<'!NO!SUBS!' @@ -362,7 +363,7 @@ index 916b332..b143d46 100755 \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ \$(generated_pods) $to libperl.* -@@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE +@@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MI esac $spitshell >>$Makefile <<'!NO!SUBS!' @@ -380,6 +381,3 @@ index 916b332..b143d46 100755 - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty) minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep --- -2.1.4 - diff --git a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch index a00ad61d901..33e222259f7 100644 --- a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch +++ b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch @@ -1,15 +1,15 @@ Upstream-Status:Inappropriate [embedded specific] -Index: perl-5.14.2/Makefile.SH +Index: perl-5.24.1/Makefile.SH =================================================================== ---- perl-5.14.2.orig/Makefile.SH -+++ perl-5.14.2/Makefile.SH -@@ -622,7 +622,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX - $(RUN) ./generate_uudmap$(HOST_EXE_EXT) uudmap.h bitcount.h +--- perl-5.24.1.orig/Makefile.SH ++++ perl-5.24.1/Makefile.SH +@@ -710,7 +710,7 @@ bitcount.h: generate_uudmap\$(HOST_EXE_E + $spitshell >>$Makefile <<'!NO!SUBS!' generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT) - $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs) + $(BUILD_CC) -o generate_uudmap$(EXE_EXT) generate_uudmap.c - miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h - $(CCCMD) $(PLDLFLAGS) $*.c + !NO!SUBS! + ;; diff --git a/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch b/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch index 76501283ed4..49efcbeefcd 100644 --- a/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch +++ b/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch @@ -10,15 +10,15 @@ This fixes this warning for perl recipe as well as libxml-parser-perl recipe. It is a fix to MakeMaker within perl, so all such perl recipes will get fixed with this perl fix. -Index: perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm +Index: perl-5.24.1/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm =================================================================== ---- perl-5.14.2.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm -+++ perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm -@@ -55,6 +55,7 @@ sub _unix_os2_ext { - my($found) = 0; +--- perl-5.24.1.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm ++++ perl-5.24.1/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm +@@ -57,6 +57,7 @@ sub _unix_os2_ext { + my ( $found ) = 0; # Debian-specific: don't use LD_RUN_PATH for standard dirs + push(@libpath, "SYSROOTLIB"); $ld_run_path_seen{$_}++ for @libpath; - foreach my $thislib (split ' ', $potential_libs) { + foreach my $thislib ( split ' ', $potential_libs ) { diff --git a/meta/recipes-devtools/perl/perl/installperl.patch b/meta/recipes-devtools/perl/perl/installperl.patch index 456012376e6..7fd1f50144e 100644 --- a/meta/recipes-devtools/perl/perl/installperl.patch +++ b/meta/recipes-devtools/perl/perl/installperl.patch @@ -1,12 +1,12 @@ Upstream-Status:Inappropriate [embedded specific] -Index: perl-5.12.3/installperl +Index: perl-5.24.1/installperl =================================================================== ---- perl-5.12.3.orig/installperl -+++ perl-5.12.3/installperl -@@ -3,8 +3,8 @@ +--- perl-5.24.1.orig/installperl ++++ perl-5.24.1/installperl +@@ -2,8 +2,8 @@ + BEGIN { - require 5.004; chdir '..' if !-d 'lib' and -d '../lib'; - @INC = 'lib'; - $ENV{PERL5LIB} = 'lib'; @@ -14,4 +14,4 @@ Index: perl-5.12.3/installperl +# $ENV{PERL5LIB} = 'lib'; # This needs to be at BEGIN time, before any use of Config - require './install_lib.pl'; + # install_lib itself loads and imports Config into main:: diff --git a/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch b/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch index de6f65294cc..b2c597974e2 100644 --- a/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch +++ b/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch @@ -10,10 +10,10 @@ Signed-off-by: Hongxu Jia make_ext.pl | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/make_ext.pl b/make_ext.pl -index b433762..9fc1a36 100644 ---- a/make_ext.pl -+++ b/make_ext.pl +Index: perl-5.24.1/make_ext.pl +=================================================================== +--- perl-5.24.1.orig/make_ext.pl ++++ perl-5.24.1/make_ext.pl @@ -335,6 +335,10 @@ sub build_extension { print "Deleting non-Cross makefile\n"; close $mfh or die "close $makefile: $!"; @@ -24,7 +24,4 @@ index b433762..9fc1a36 100644 + } } } - } --- -1.8.1.2 - + } else { diff --git a/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch b/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch index d912d0031e4..37bf5233571 100644 --- a/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch +++ b/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch @@ -25,16 +25,16 @@ Upstream-Status:Inappropriate [embedded specific] Signed-off-by: Tom Zanussi -Index: perl-5.14.2/config_h.SH +Index: perl-5.24.1/config_h.SH =================================================================== ---- perl-5.14.2.orig/config_h.SH -+++ perl-5.14.2/config_h.SH -@@ -996,7 +996,7 @@ sed <$CONFIG_H -e 's!^#und +--- perl-5.24.1.orig/config_h.SH ++++ perl-5.24.1/config_h.SH +@@ -1434,7 +1434,7 @@ sed <$CONFIG_H -e 's!^#und * in programs that are not prepared to deal with ~ expansion at run-time. */ #$d_archlib ARCHLIB "$archlib" /**/ -#$d_archlib ARCHLIB_EXP "$archlibexp" /**/ +#$d_archlib ARCHLIB_EXP "$archlib_exp" /**/ - /* ARCHNAME: - * This symbol holds a string representing the architecture name. + /* BIN: + * This symbol holds the path of the bin directory where the package will diff --git a/meta/recipes-devtools/perl/perl/perl-dynloader.patch b/meta/recipes-devtools/perl/perl/perl-dynloader.patch index 035beba66ac..2572067a6e1 100644 --- a/meta/recipes-devtools/perl/perl/perl-dynloader.patch +++ b/meta/recipes-devtools/perl/perl/perl-dynloader.patch @@ -7,13 +7,13 @@ system. Update by Nitin A Kamble 2011/04/21 -Index: perl-5.14.2/dist/XSLoader/XSLoader_pm.PL +Index: perl-5.24.1/dist/XSLoader/XSLoader_pm.PL =================================================================== ---- perl-5.14.2.orig/dist/XSLoader/XSLoader_pm.PL -+++ perl-5.14.2/dist/XSLoader/XSLoader_pm.PL -@@ -28,6 +28,20 @@ sub load { - - my ($module, $modlibname) = caller(); +--- perl-5.24.1.orig/dist/XSLoader/XSLoader_pm.PL ++++ perl-5.24.1/dist/XSLoader/XSLoader_pm.PL +@@ -52,6 +52,20 @@ sub load { + my ($caller, $modlibname) = caller(); + my $module = $caller; + # OE: Allow env to form dynamic loader to look in a different place + # This is so it finds the host .so files, not the targets @@ -30,5 +30,5 @@ Index: perl-5.14.2/dist/XSLoader/XSLoader_pm.PL + } + if (@_) { - $module = $_[0]; + $module = $_[0]; } else { diff --git a/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch b/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch index aa83fca5ae8..bad3373fd40 100644 --- a/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch +++ b/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch @@ -1,12 +1,12 @@ Upstream-Status:Inappropriate [embedded specific] -Index: perl-5.8.8/config_h.SH +Index: perl-5.24.1/config_h.SH =================================================================== ---- perl-5.8.8.orig/config_h.SH 2005-11-01 02:13:05.000000000 +0800 -+++ perl-5.8.8/config_h.SH 2010-11-01 17:06:07.215219738 +0800 -@@ -709,6 +709,12 @@ +--- perl-5.24.1.orig/config_h.SH ++++ perl-5.24.1/config_h.SH +@@ -726,6 +726,12 @@ sed <$CONFIG_H -e 's!^#und */ - #$i_float I_FLOAT /**/ + #$i_gdbm I_GDBM /**/ +/* I_GDBM: + * This symbol, if defined, indicates that exists and should