From patchwork Fri Jul 12 05:09:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3679 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 12 Jul 2024 07:43:44 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f189.google.com (mail-lj1-f189.google.com [209.85.208.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46C5hhKW020525 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jul 2024 07:43:44 +0200 Received: by mail-lj1-f189.google.com with SMTP id 38308e7fff4ca-2ee86eda4e4sf13131211fa.3 for ; Thu, 11 Jul 2024 22:43:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720763018; cv=pass; d=google.com; s=arc-20160816; b=iTM6WkzX5LMyOvLkASw+9EkAFpanNBuFATf3P4zP5MX1pAWeO2l33O6t0Ivc/Ct2fl Nm+8D46/aofjYs3CFX1C9C5e2Ug5uXyQ4TCzvTg2dhxm/NmH+yatt4T+ADQDZhLKIBTi o8zr7O8T1M1Xvzipl/v4mUfRDGG255pjO7dTEGpm1OKTlqcWcSs0FF2F4nxbe2uBwokB lZ6vTBh4gk5dXqtEGX3JBKsdHL/82ZWek5hvUZuvVAVnsPzJCM9m4230iR2Cbek2iBtj Fv1Vx7mehTKndTdqo7z8hQIAcO5aP/MP3/bKQ+a4cXfyWUqWZskggGfC81Rxlqg3EU1y 6/Ug== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=/3f12DiRfYwZjf2zN3X3ZcpQq1Jv1ubVIX0QtFI1lBs=; fh=Xk5cz6vGZQRUJMWTtRD5zGRQxD1OmEs+F7VCf+YdpXs=; b=cqoImHWXCTtnmjHZOx93eGh1mJMgE3IT0rK+mPbNDyEwH/Qha9s+Mauu17oCk10jJb Igdzmtsd8Ir6/Kg/QUKzBQWcV2wgNgVkg+2CPMdX9SEM+Gvwa/HqIwuutqHpEFielJF3 rrzyTKTHxjJ7Z4AhvP+Gmow5yGCrNdAWtTgMgBbbyEot/HySRY8DFkbW0HDW10gAjZYK mlKkY6pXI/lj33pTzN5qT3UGwzSFqHvEj/TpHQOGITlWPwTNk/Sn7P7T7M9WVvBGOf6O SMIUpV8Nl4Y+08eWe8gbMwDQ2sLEMuEvRwDoSQEg+YHI/GDK0e71kNQW+FyGtM8vxeHp cT9w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720763018; x=1721367818; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=/3f12DiRfYwZjf2zN3X3ZcpQq1Jv1ubVIX0QtFI1lBs=; b=YqANdGp87lz/wlJZlAaMrWeZqYhZtdxodAxidiyNBYOz8xy2LNfYbmLK7IpXI982HM Nh8OXaoRiyBC5yZineNymZBlra28UL3y1adj5RAjVPqs7cEjf/K81zDtZImWkRlwCkTc vaimukj6dAQ98zGWIQ7Cx9zNkqwowYRucfRvxrVskqQLFe0BvXGRAN2vWtGfNTLmV4QJ bNPK9exp13DR91HWCtWAhuc+7aTW+b8+9Y+S+yU18g0RPHNbHPvv7DG1O0eCSlG5PGLE P+a5O1eR8ILjK9e+YT/VXZJ2makzYC8JgvUIT4gzIGOs9Rdqq7fo1ZiqVcT8RwzIss31 HZBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720763018; x=1721367818; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=/3f12DiRfYwZjf2zN3X3ZcpQq1Jv1ubVIX0QtFI1lBs=; b=VE7oRD5sqcZ84VMDPS8fzuo5xZewkXZQO13HMsO3BvMkCB9LOoXyoTXoZZ/mzG5BKr v5sFFfaj45jo0HZMupJ9ZgK4nAQVhoWGSAFF8LU5Kgdt38CX2bCP3/Pyy/vhdjytpvkL yekdzpyZ2ok6+0PFo+MAQebO51xNAoW69KDVW3cpoO0mQqAezp779AdT1B/c3Ue6fusp USDXSDUW68Bp17H486JMonSjVTAIeYc+vdBFaSebro8NEZB7x8Xjej2Ui42UX6R7kIA1 3OXwN9V1ldlKapaFAIVWzx7jRmqv35Jxe2Fx3wGwnR0Ns0i2rheSwzFrM7u1pyZ0QmgS yZng== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWCGZq4Gb4GdUMrpew50VufzsGt1xISrVlUtIo8m8H6jcd5LYZYe1JS2G6hMxtKWfLVcHCmHphqQjwiCLBJT5Rho6NcEZ4= X-Gm-Message-State: AOJu0YxlQSXcsfKsKxDEmP0D92MeoNokydjtKIf2SD5VcLTDYehXEaH8 pf4SrLW+aWuWWA7ZPCnjHRGqK/SGON0VcZeg/Lg0E7GWh6H+EwSd X-Google-Smtp-Source: AGHT+IGX4BRJMVDSnPNS2KYRYL4yW81sGRgVYjuZR060Nmlp5TYYX9IQlF2sgzsOKT37V0PeTM0cew== X-Received: by 2002:a05:6512:3e0a:b0:52c:e1cd:39be with SMTP id 2adb3069b0e04-52eb9990eb3mr8355303e87.8.1720763017812; Thu, 11 Jul 2024 22:43:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5a51:0:b0:52e:9923:a1ba with SMTP id 2adb3069b0e04-52ec4521d36ls750221e87.2.-pod-prod-06-eu; Thu, 11 Jul 2024 22:43:35 -0700 (PDT) X-Received: by 2002:a05:6512:3b2c:b0:52e:933c:5a18 with SMTP id 2adb3069b0e04-52eb99d4e3amr7459189e87.56.1720763015432; Thu, 11 Jul 2024 22:43:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720763015; cv=none; d=google.com; s=arc-20160816; b=b9yycXuMbKFpi+j2kyo2BhLtj+1M8y3w3h9hCoc0llxnhWxqqKou3T6t/JOLGAW3e4 GjY/u72kQ9YDxbuddz+elZB91s05DrxPL1d8r7s3vbNMD7SRUsGuBqelce97A/AWErdN hIUY5EPpmJi8UM8bs+qmhkjp4UKqzMi1CV+IgkyuhXs2UlhI1r/JS8pIt1TRq60H47HP r7LECdQeE2pMHJfwfNra37vI5NUxyKpHv4Rmbcfl0Rw65gY08ECmhkYCM2QQ58D7cjSn v/ZBhpU1hxBkH3dqfXnZzLuK/WgLOAqPzlTgVZfXwYMeb2HW62cSLcnkC7Hvin41Ac2w Xjdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=ma7UwOCYj38u/XqqN/vOC64O6We9dstTVPhZuul4vI0=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=oDtXMz/ERilJLX4ommMS0Vsm+6jiVt1SqrwFTakD9xUgbAKHWY8efgnUWEKYtTiO69 IzqeDHeuuUcIQB3QpNviBG1QgR4PFsSW7vs5v/ltBff3xaZ30mSbWpHYn/HUs0aeGCUs uJl9m90Kz+1nR2K6E1oHlJZ5NIDVIPO8jvPWvU+PxOVU9SzNCEYVbegysTPAVaGZOQTX se+yor57h4N2sIKo6XLOZVqxPrkuXl1RAvsK5PakmEuxq3UebC3k3w3u9QABbKvt0qzB Fkut7WL8hN807cPi6JSRAPlKMR8HmcmsrkOY2R6x17xSyIt4KyX61f+qJbCasStfcBbR CdmQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-52eb8e5237bsi280335e87.7.2024.07.11.22.43.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jul 2024 22:43:35 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from hp15.promwad.com (mm-89-47-121-178.gomel.dynamic.pppoe.byfly.by [178.121.47.89]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 46C5hWxu020492 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jul 2024 07:43:34 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 1/3] meta: Fix do_copy_boot_files error for different distros of same machine Date: Fri, 12 Jul 2024 08:09:32 +0300 Message-ID: <20240712054327.9526-2-ubely@ilbers.de> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240712054327.9526-1-ubely@ilbers.de> References: <20240712054327.9526-1-ubely@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Ilia Skochilov When building different distros with the same machine (e.g., phyboard-mira-bullseye and phyboard-mira-bookworm) it happens that some files with the same name (e.g, DTB files) are deployed to the same location and this causes build error. Use DISTRO-dependent deploy directory. Signed-off-by: Ilia Skochilov Signed-off-by: Uladzimir Bely Signed-off-by: Ilia Skochilov Signed-off-by: Uladzimir Bely --- RECIPE-API-CHANGELOG.md | 8 ++++++++ meta/conf/bitbake.conf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 12ea93ec..15337a63 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -629,3 +629,11 @@ into kernel kbuild package. Only the "host" specific package is built automatically at cross builds. * Support emulated module build with cross-compiled kernel for linux-module + +### Change DEPLOY_DIR_IMAGE +Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to +${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}. When building different distros +with the same machine the following error occurs: +do_copy_boot_files: The recipe isar-image-base is trying to install files +into a shared area when those files already exists. It happens when some +files have the same names (e.g., dtb files) for different distros. diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4cfa8b10..1087ca0f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -56,7 +56,7 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" GIT_DL_LINK_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}"