From patchwork Thu Dec 19 18:59:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182181 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp875654iln; Thu, 19 Dec 2019 10:59:48 -0800 (PST) X-Google-Smtp-Source: APXvYqxJ0SnZA521tF67aK1PPWrQifr/HZIS6aafiLPg648yX0pQynukakbUdLNMRvfR8kPVPQhr X-Received: by 2002:aa7:86d4:: with SMTP id h20mr8598048pfo.232.1576781988267; Thu, 19 Dec 2019 10:59:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576781988; cv=none; d=google.com; s=arc-20160816; b=zo5Eomom0QQfWFRAO0u5nQGm+UbYGQFRLkXZGUHJVOta1SjzNAjojk1BpfbAycjPFI vSRTZivehV8/6l2XRDjKS0l4xBLmGtT7ka98qXwhnGRIno9dxJ5qERZaj1EYXj7FaiFn fKdhcIoo4yvd23DUaTcK1ocElxnuCr5B7+i6JPtxtO+d7wQNK/1G8jp8dx8aHV7sO/Eo QonwOJbYypVKFxQ6u9LsDPZ3/9kxs4YF+dd/hinivjDQmwuRXK+Bd5kxP34QFV0TmFAE 190m3W36OnD9231skGo477ZVRb5qkWWQJqU4TkW9w9YKJoOFZeC3lR6VpLqwoPMdXB6w 9F0Q== 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:message-id:date:to:from:dkim-signature:delivered-to; bh=9gc1FMurv3N6bqcgxwWgujJYUdso8RmEuPuU4JQ3NrQ=; b=NewHsWPDIklU6s5ehfVUmBSIkfdZVz4WAUTlQVf7klOUT1OInVXQPhjfWQwe36jK9n lmwl3nhp0O36opdozvdn5s+EaolkFuLINwRaiGBlcAb7blJbK3MB6OEw7Hg5Y+ckMiT9 0Wdshtq7BId4BJzdH9Fx1ILPe2tupNkxGoqEgSBQOY1LASuLlXPgGuQrOUSJWUGERa2A h+jPqDafgBb4FrqFUSUd/F+Q+FMfTZRXhbjToHiMU5HIXH5YSDD+sAATMUx4r6hVc8eX YGgzBYoSDqMGCaAZxvORajrs3MMe+EmZfkrOUacTP0aHSsOKUQ0dPSAJ3kvIEI99CinX +P6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=T4GIkRZs; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y11si6102582pjp.69.2019.12.19.10.59.47; Thu, 19 Dec 2019 10:59:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=T4GIkRZs; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5935D7FDA9; Thu, 19 Dec 2019 18:59:41 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mail.openembedded.org (Postfix) with ESMTP id 680D77FD6B for ; Thu, 19 Dec 2019 18:59:39 +0000 (UTC) Received: by mail-pl1-f180.google.com with SMTP id az3so2962046plb.11 for ; Thu, 19 Dec 2019 10:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5L2GNRlvCsuf7Wuql/DPYhaZXE82+7PJS6BEVcKqL/8=; b=T4GIkRZsZpXNhvhfYDsV7n6eEmggAaPXaeeC3sYK+2xg4IFaiMUsUn9Zya/S6Px5U1 whsSTak5JJT+O61PzD+fKVLP6B4rq9I75B0U2uF0dM2aeMvnp9JB5r4pUjaTQo2TaNE6 KFplF8YJZIBuRWD6spZYifFlQPqx2aFc9n4SAwnya9RnB7Gh4H/wAyn9L/8asCDwpqS8 M1PGqGrSEp9EfPV2TAfXOkQmlV6U9yj9pQg3iWmBkqBKAE6ze+j/BXIdOScfDANNLRwf cufTdLnTluBMyey1m2U0bwBaR6jVb2bAtkHuKCeUIN8lxdgYq8ebCvaDAH+3glqCznzL UWSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5L2GNRlvCsuf7Wuql/DPYhaZXE82+7PJS6BEVcKqL/8=; b=O8QhMZgay/5lF5rfjSO4QUof98DL4QV68NkTkAg9bSEOuVDZuCk0R/PVv9v38yjYFW eRmIvSJhSCi4zq4QdGheX5t6X740YMKIxmdtstxR3ct/3iP0AZcsemqlYWIAIR5CjQ4N QhdEHaRLQ9owolC0qwfYG5aGYz9tHdN0FXLAfDH4vEOSBuOR8DFkMJXvOT7XCcbzyvHk 23Jr4ikLnmrMAZ/WacRFjG36TE0MtqCU5yzQhxvwzns1MaUOgoDyIGVibT4QWPwxgGa/ yh2XaUsFWaU6rnW0RV5oUhAjAI+UKkU8rgjnhZCySPyjkxY+75rb19F3VBGWHUZMB3Bl TSjw== X-Gm-Message-State: APjAAAUUeKbnrVmwKys70nJoH7IWsuDY7CKE6sYMch4JlHb60rY859/x Nlg9zGVEy2rgp6Pn4PbL7JbzBx/bgYg= X-Received: by 2002:a17:90b:4391:: with SMTP id in17mr11255321pjb.33.1576781979856; Thu, 19 Dec 2019 10:59:39 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::4b]) by smtp.gmail.com with ESMTPSA id o184sm8129200pgo.62.2019.12.19.10.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 10:59:39 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 19 Dec 2019 10:59:31 -0800 Message-Id: <20191219185931.1325337-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH] dfu-util-native, sjf2410-linux-native: Fix Deploy in multimachine builds X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org When more than two machine are built using same tmpdir and happen to use these tools the builds fail Fixes ERROR: The recipe dfu-util-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are: TOPDIR/build/tmp/deploy/tools/dfu-util-0.9 (matched in manifest-qemumips-dfu-util-native.deploy) Please verify which recipe should provide the above files. Signed-off-by: Khem Raj --- meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb | 9 ++++++++- .../samsung-soc-utils/sjf2410-linux-native_svn.bb | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb index 76faefefbb..feb16fa730 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb @@ -8,7 +8,6 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[static] = "CFLAGS='${CFLAGS} -pthread -static',," -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" do_deploy() { install -m 0755 src/dfu-util ${DEPLOYDIR}/dfu-util-${PV} rm -f ${DEPLOYDIR}/dfu-util @@ -16,3 +15,11 @@ do_deploy() { } addtask deploy before do_package after do_install + +do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" +# cleandirs should possibly be in deploy.bbclass but we need it +do_deploy[cleandirs] = "${DEPLOYDIR}" +# clear stamp-extra-info since MACHINE_ARCH is normally put there by +# deploy.bbclass +do_deploy[stamp-extra-info] = "" + diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb index 9e609c4dd8..3a5172eecc 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb @@ -13,7 +13,6 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol= S = "${WORKDIR}/sjf2410-linux" inherit native deploy -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" CFLAGS += "-DLINUX_PPDEV" @@ -31,3 +30,11 @@ do_deploy() { } addtask deploy before do_build after do_install + +do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" +# cleandirs should possibly be in deploy.bbclass but we need it +do_deploy[cleandirs] = "${DEPLOYDIR}" +# clear stamp-extra-info since MACHINE_ARCH is normally put there by +# deploy.bbclass +do_deploy[stamp-extra-info] = "" +