From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 74E1A77078 for ; Fri, 23 Oct 2015 20:18:39 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id t9NKIcpJ005666 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Fri, 23 Oct 2015 13:18:38 -0700 (PDT) Received: from yow-bashfiel-d4.wrs.com (128.224.56.94) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.248.2; Fri, 23 Oct 2015 13:18:38 -0700 From: Bruce Ashfield To: Date: Fri, 23 Oct 2015 16:18:31 -0400 Message-ID: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: MIME-Version: 1.0 Cc: saul.wold@intel.com, openembedded-core@lists.openembedded.org Subject: [PATCH 4/6] kern-tools: avoid duplicate .scc file processing 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: , X-List-Received-Date: Fri, 23 Oct 2015 20:18:39 -0000 Content-Type: text/plain With the recent changes to improve patch processing times, the ability to skip already applied patches is not active by default. The automatic detection and resume was hiding issues with the include files generated by scripts like yocto-bsp. If a .scc file that contains a patch is included twice, the patch is applied twice, and the second appliation fails for obvious reasons. We can partially fix this by ensuring that already included configuration fragments are not forced into the meta-series. .scc files that are explicitly listed twice will continue to fail, and recipes must be modified to avoid this. [YOCTO: #8486] Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 18be4ad61598..445d03a876b4 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c DEPENDS = "git-native" -SRCREV = "1fb91c2965193df894089fbcbcafe3bf775c21fd" +SRCREV = "17d89d1861b532bbf1a81c1f024953e440db8de7" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.1.0