From patchwork Fri Mar 9 18:55:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131227 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343957lja; Fri, 9 Mar 2018 11:05:20 -0800 (PST) X-Google-Smtp-Source: AG47ELsSH+er3oZPlxqklrfrshRvFFRPbgBgGjjGNUjXrZFpiT7VkCdM/uSFyN+7OI/CByyEW0Am X-Received: by 2002:a17:902:8b85:: with SMTP id ay5-v6mr29314712plb.329.1520622320727; Fri, 09 Mar 2018 11:05:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622320; cv=none; d=google.com; s=arc-20160816; b=UeXVeAFkSHMn99kvCHjjX+D1tHTuCVi9QkrJv2CKVSaGWM7RcAHY+RadTz8Bc2JO8H ffaZNDT/TWYdMURK9nyAB26iiTDGJEx4ffXQyjyZk2DW9s9FxvrtNeAx8ErUyC83VW2m eqUhyZ0yTwLyGVESalcISj2cTcPzvTXILnK+adA4XpmfCMfq5w2EJ0Nrx/lXHdcal+dv q0R1uXfZSLYiIzTLmqhV1EOx2gP6LiB+gkIbWPRh5Gdzmpzr5GHeWe8Ll1crNYnC6wfu 7hVmhYLTrmpR2Cb4WGCnvzBu80Srjs1R/FsqD7hZwQBeQ76Zp4ne60K5PeGiuvZvGQhO Iv8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=9KwIME4rhnugPfrK6WYnf3uX5xILYz4C1gtAtWEPNCA=; b=yWX/aAlzSnUVM5HZaynmDP5yGyhF6tw+VvfYsUGwCt+O23OMEZZORXl6SsIakm13DK 0epMXMfyXr0qkgkdhknOIONRY2cgsPwsD619yTHcGoEOjK0J4oM2Mz5NgPUu78ORR6Hf z2oqcAzKSGtNw1Fao1UTM7VUoMgjCwdwm3/1k89ttQ9ncOP+CngRBTjXn+IF4zLz5AfW eANp4ur5Goglif25+blkqFsl8Bld9YKQ5FXRp+zjJDVY0fJZRPqWo/eTeUFX9x8hNLJo /0hjwHXjruaWRiW8APQPQH8LD6LhwOPOFIKgM5YMliYmD5k/BDMeQdet5VMqqK1UXy7K 3QYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g61-v6si1296751plb.291.2018.03.09.11.05.20; Fri, 09 Mar 2018 11:05:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2C034789B2; Fri, 9 Mar 2018 19:03:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id BA9A678958 for ; Fri, 9 Mar 2018 19:03:16 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2018 11:03:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651977" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:17 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:56 +0200 Message-Id: <20180309185614.31113-18-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> References: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 18/36] cups: refresh patches X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin --- .../0001-don-t-try-to-run-generated-binaries.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch index 5379eb6aa2b..db013cf08c4 100644 --- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch @@ -10,12 +10,12 @@ Signed-off-by: Koen Kooi ppdc/Makefile | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) -Index: cups-2.0.0/ppdc/Makefile +Index: cups-2.2.6/ppdc/Makefile =================================================================== ---- cups-2.0.0.orig/ppdc/Makefile -+++ cups-2.0.0/ppdc/Makefile -@@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ +--- cups-2.2.6.orig/ppdc/Makefile ++++ cups-2.2.6/ppdc/Makefile +@@ -228,8 +228,8 @@ genstrings: genstrings.o libcupsppdc.a + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - echo Generating localization strings... @@ -25,8 +25,8 @@ Index: cups-2.0.0/ppdc/Makefile # -@@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ +@@ -246,9 +246,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD compiler... @@ -38,8 +38,8 @@ Index: cups-2.0.0/ppdc/Makefile # -@@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ +@@ -274,17 +274,17 @@ ppdi-static: ppdc-static ppdi.o libcups + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD importer...