From patchwork Fri Mar 9 18:56:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131239 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345357lja; Fri, 9 Mar 2018 11:06:45 -0800 (PST) X-Google-Smtp-Source: AG47ELsdFvleHtgS2usygTQB8RnA4pcHmyT1irNwYe9hKCqC5ciH6oX2H7VDhBGoktm3qpOn2HfY X-Received: by 10.99.55.11 with SMTP id e11mr25178756pga.237.1520622405284; Fri, 09 Mar 2018 11:06:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622405; cv=none; d=google.com; s=arc-20160816; b=LTwNsROUZHL1qSeo/J6XWE5VcBDxPD/e3HI8d8NDJUA8eQ+mzLNYyb0JueYw0e/njt gFCGig4ayx/57THtasKHtrcPUC1JpJO9UWo4qLrsopEgton8cfmCpuY6PvxUsPITbk52 GKgDa6RieqbEulNRxCUlOtyLw6ySWgqdc4WQXYwDqi/ozlqtnyE2X37Kkfz0ShFX3Vde VNaUcbd9ShWPRDt+N+AckQZ/hEqh5g/mi5g9fhux0RMbVFBtuD7wMpjvO+bz3rPw+A0R wsLIN7NaunVZ+1OM7taZpoCigVTJjuVIp1QebQWHwyKiRx+NvYBMXw2IBxA832nEJJNj r9rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=JZ0TQ6HNpMmmTbu0EeZ8uDmTpbRItM7jr+r9egwGj3Q=; b=BE4zcycFTEBF0pBVbliPRGRmzEvXDotUcH8TeHNKG1Ggjmtg0rKjMd2QnM9Sb4Ln4r DRaz3HXT3BMXWOETdw76ZesbJC1ATKb4Y+KeikK8U7/oocqQ3XnCJqX1U2D0ytOfFc7O v8IaFQ/IpxLcGyWaO1LvwkNDHvxah0ikN4oBBozzahq7J9wfuRNQtHDtpNeK9B6fUU+h qDybzgT/0dd9nXb/8hCmSr9nVmFaMk5lpMXiz4/VQY+jCz/n7Jo2w3a1bZr1Qs2W53qA PKUEpcdLfXMrK7Z9+ihuJB0RHb7XKuqlvM8Ke3LImRDt554JbU0eP2ZLrlXevunvxIjr dcCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q7si1123525pgc.69.2018.03.09.11.06.45; Fri, 09 Mar 2018 11:06:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5B7B7789FF; Fri, 9 Mar 2018 19:03:46 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id 7464A789A0 for ; Fri, 9 Mar 2018 19:03:35 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2018 11:03:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652058" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:36 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:09 +0200 Message-Id: <20180309185614.31113-31-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> References: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 31/36] blktrace: refresh patches X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin --- meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch index 29eb0f2728a..ab905cf0da3 100644 --- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch @@ -10,6 +10,8 @@ aed463414e2e2bf8ca44ba54ee5973e7ed599e57 Signed-off-by: Fahad Usman +Index: git/Makefile +=================================================================== --- git.orig/Makefile +++ git/Makefile @@ -1,5 +1,6 @@ @@ -19,7 +21,7 @@ Signed-off-by: Fahad Usman ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon LIBS = -lpthread -@@ -23,19 +24,19 @@ btreplay/btreplay: +@@ -26,19 +27,19 @@ btreplay/btreplay: $(CC) -o $*.o -c $(ALL_CFLAGS) $< blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o @@ -44,6 +46,8 @@ Signed-off-by: Fahad Usman $(PROGS): | depend +Index: git/btreplay/Makefile +=================================================================== --- git.orig/btreplay/Makefile +++ git/btreplay/Makefile @@ -7,6 +7,7 @@ @@ -55,8 +59,8 @@ Signed-off-by: Fahad Usman OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 @@ -32,10 +33,10 @@ clean: docsclean - $(CC) $(CFLAGS) -c -o $*.o $< - + $(CC) $(CFLAGS) -c -o $*.o $< + btrecord: btrecord.o - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) @@ -67,6 +71,8 @@ Signed-off-by: Fahad Usman depend: @$(CC) -MM $(CFLAGS) *.c 1> .depend +Index: git/btt/Makefile +=================================================================== --- git.orig/btt/Makefile +++ git/btt/Makefile @@ -7,6 +7,7 @@ @@ -86,10 +92,12 @@ Signed-off-by: Fahad Usman ifneq ($(wildcard .depend),) include .depend +Index: git/iowatcher/Makefile +=================================================================== --- git.orig/iowatcher/Makefile +++ git/iowatcher/Makefile @@ -1,5 +1,6 @@ - C = gcc + CC = gcc CFLAGS = -Wall -O2 -g -W -Wunused-result +LDFLAGS = ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64