From patchwork Thu Mar 8 18:17:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 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)