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}" From patchwork Fri Jul 12 05:09:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3680 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f62.google.com (mail-lf1-f62.google.com [209.85.167.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46C5hiYC020538 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jul 2024 07:43:45 +0200 Received: by mail-lf1-f62.google.com with SMTP id 2adb3069b0e04-52ea1a947aesf1578677e87.1 for ; Thu, 11 Jul 2024 22:43:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720763018; cv=pass; d=google.com; s=arc-20160816; b=Vyqm6KXSDGfbCDguLt9Uo3efhYsgu/TUfhCb54y62AwOwW5Dw92Arz0VLjGGZfW3ke GXU9Uznugj++LNk1jlh04LnDNt7XZ9ZLEMfbu/X4A3QJU4n1hzBoDk65TGq1wxaNFbft KpjU/FTIkLe+VCq70X2uvXO/+cZ1RRkgaWQqy9O8bif2fwYi3hqC87uJXpVZOdobfGU5 +h6q/Q7id1RIbUn557pDMbvvkaT2blixHOODMCeb1f/Nadohe9q2XVXaHRsNx3JBaHNP H7z9YLgqIugx2IwB52rl1T4V/VWhIDaDTdJygf/GlBanPJX8l3sFcpu93xaFya9kcQ9n DtPA== 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=tet6u8HwGWhGGAPIjn3bMcxj0Gmac3DO50eHONVFf3U=; fh=0hY7f/ln4EqG82vJcl/7i9jxbu92h/p1U6C090zCnvs=; b=GCZOX2s1XxOIEV8vwZ8MX8bAm8GJkcy0uLll0/l1vnXe9k4JHYt99WrVuHbKiI4tav YhvclZxgEnYnrLEy3x4KYFhnjZZDJ9h3ypqd7qXrfx8VDlSmbaR+CfHs4k2slkE/i5Wk 1aTBcedFYB6aP1XUUDxdjKqY9OskmuDQ81iJU3b4b4BiJuJZjPtgFQjGDEu/M7DvtWhT hE9AknGubeSP77kqh6VuLylAhFsGY8hGf3PQO5WcjDCcnBp10O2e7XJgGZIaIZ/I5/Qe HFmnF8xernsZtLtTsozdxDxeYqcNnx0T8xertcPdHp/1RK1Ynxtxhw8mDcScq+wI8z+u 7Y1w==; 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=tet6u8HwGWhGGAPIjn3bMcxj0Gmac3DO50eHONVFf3U=; b=PEBpiAdwl7EbFBvCyAUpqDzk6JyX/3n0WwyvfClWe6pYzTbg/Ak0vzUoHRfAW4WScm hqVwZ6l0QcnL3uaEZHESQgwcIwE0nzggPsb3KGxK95aZD2Po/XVwHTGgYCRxVFHPGh1e JdI5eDVSpLoMaH6QP8y5gR5ogWzIH1MQpsnmI1xelBn9pZtU13r9S+Sb/FV6C90LsM4o clbhRy1P37XSPxzmPeuImAOsumM85WAx/tznjt2DHt2WSfXTXmfm/qe5UPFJjt08CPwv o18Tiwq4UAGtT6ljoZtrerZ5qRwmFPQ9tVRUhsrSfUQ6oKR7MOhbPSskQ7os9VBB7cnu SbWw== 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=tet6u8HwGWhGGAPIjn3bMcxj0Gmac3DO50eHONVFf3U=; b=MzYRfAMcpCrDCX3XW4WKTYsAjpfhB+F1QjE3uvP4FiwX/kC8HuBJtY3AjDUGMP36df s9uO2ev2A+aFyAeRsv25Ne+gGU0GUefwsUFJQwzXBwD5IM5LNhCNfd51XQGafW7RjboQ oVaxs+A7evZfIBrKeH7UGVg4f80oHRF+GhTe4jq65lC2zYkuUvg2LPA90wkiFfNpvTA+ FAo21pPXwDMlGCr+yWoDS27TkmgxsVH8G8pnfCbWWssKIvI2uvK0ETWWokKAchU5pp76 mkyM+pJP8nOV3pjkIUkPQcYP7gt/HblcoE1P7Ogr5Ud2IW5MoHijzN9tfhBi4PH0STsv uyEg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXHoMExm9Tqhzeg3G+8lJJN4bhVOJ7jSYSksPNfzRBiBWLhchDxc3mLsIsVTpP75e0y6fnTIaaEJAJ7GON4UkqzFyaZbEE= X-Gm-Message-State: AOJu0Yxq3oOYbSlzttDwuRLhh5Hvp8ozQTo3Ydz+RrpdOpWtj7Ao8XF6 M5He/jKLIBmpNVeDRt7Up+r/BLASpdKmvsJtQcBcuewO/8UQHF9k X-Google-Smtp-Source: AGHT+IEd3bsuAqTssSoIPbMMnBbbqRw22009nIGt/Jfglk4zbpcuD1PuhE7zIsj715IxtbOgpEV3Ug== X-Received: by 2002:a05:6512:31d0:b0:52e:bf53:1c2b with SMTP id 2adb3069b0e04-52ebf532621mr5072460e87.12.1720763017813; Thu, 11 Jul 2024 22:43:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:57c3:0:b0:52c:e4ec:ad52 with SMTP id 2adb3069b0e04-52ec44ffad8ls756884e87.1.-pod-prod-02-eu; Thu, 11 Jul 2024 22:43:35 -0700 (PDT) X-Received: by 2002:ac2:544e:0:b0:52c:c032:538d with SMTP id 2adb3069b0e04-52eb999a765mr5428900e87.27.1720763015455; 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=s7hGsj32nlFtSnJuIo2nLLP4+X9EisG9xXXxoGwXOeS3NMGn35XJf/sIaiZgE15XwT jISVI3BjIBXmIfDuRrW8OFqvvXH4U1NP0YDNy9HCvXkHFx6VSTnRpgy1lfz8HqK7g2JQ yd9tEI65ezw/iLMrrYv5tI7hN+HFM2wQRB3Rl9PXtlREteqKs6VzD8jdFWapUZvAio5A wJHIHGnXwrWjXCNiq7Bb1pBIXTv6XOEX0TItkiHKzFjXjpeZ/d1tJd2AIy7CkmPqAlJ6 ZwLlA7UeOKz9MaUpmbrYq1dPicjx47sVsfMH3VqMGaLKQxW4nPSafX8p/EGJFxayz9Oc 3DtA== 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=F6WyIYde0j9tYj7n3y8DBIDTLyWDU73OFKQJMz697hI=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=Y87z5bDkfSIx4HkiSvgg1gIP82sAwcTjTuMP5yH/y2dlggpCn9x/8IVAlRs8xwRJDq 2B5MCLDPJREm39pCbUcejP9MyGLuixWPJa+Zr2qPteozzPuoM6LnduTkWNp+dBwZEdVd 5uOr7LsWzu80BTv0jZnIlNEOnpY3OS/xjhoRxy5wxbVbPV1Diupf5Mnr4T1QcmPnLVzP 8uZ8RSSMW1ywUaFoM0jckZ1ZklGNRqaoA/aTaO8Fzo3WJjA92cSlrMnEepUVloZ7+sr8 D6mfIIsOMgFFbyfK31I9y+ViOewI/AGrlhMOha++qD38vuOL/eliYtLvPfyI39jqGaWL fIkg==; 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 5b1f17b1804b1-426725594b6si4921925e9.0.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 46C5hWxv020492 (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 2/3] testsuite: Build also debug images for some targets Date: Fri, 12 Jul 2024 08:09:33 +0300 Message-ID: <20240712054327.9526-3-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?= Activate building "-debug" images for the targets using DTB_FILES. This helps to detect potential "multiple execution" conflicts when different images for the same machine/distro are built in parallel. Signed-off-by: Uladzimir Bely --- testsuite/citest.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testsuite/citest.py b/testsuite/citest.py index 8dd907d0..39e06bbd 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -192,7 +192,9 @@ class NoCrossTest(CIBaseTest): 'mc:qemuamd64-bullseye:isar-initramfs', 'mc:qemumipsel-bullseye:isar-image-base', 'mc:imx6-sabrelite-bullseye:isar-image-base', + 'mc:imx6-sabrelite-bullseye:isar-image-debug', 'mc:phyboard-mira-bullseye:isar-image-base', + 'mc:phyboard-mira-bullseye:isar-image-debug', 'mc:hikey-bullseye:isar-image-base', 'mc:virtualbox-bullseye:isar-image-base', 'mc:virtualbox-bookworm:isar-image-base', @@ -252,6 +254,7 @@ class NoCrossTest(CIBaseTest): 'mc:qemuriscv64-sid:isar-image-base', 'mc:sifive-fu540-sid:isar-image-base', 'mc:starfive-visionfive2-sid:isar-image-base', + 'mc:starfive-visionfive2-sid:isar-image-debug', ] self.init() From patchwork Fri Jul 12 05:09:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3678 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-wm1-f58.google.com (mail-wm1-f58.google.com [209.85.128.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46C5hhF7020532 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jul 2024 07:43:43 +0200 Received: by mail-wm1-f58.google.com with SMTP id 5b1f17b1804b1-426724679f0sf13496895e9.0 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=l2b4WSsIndvJylozUbKRsr0S1ZHc7UVG2S9rQmwyr/jCE2n7wILSyxad0qqlp3Yz+e GU99SKi+6L8FpfvrFnspScK/+JqRufw24AqgZ92Cl1XIgBUXxjcC6syqesj5rr/+zNps tmpAVOSZBc4gEiqRWUXOZCX6qWs16/fmOXH5VCwy3CagBcDx/kQCmF0woUWdgWDTUh1L sJRe8wCvmPJEjbeZ8l5yW6I9kCpsgQuew/Uv9CNAktVsWYHyH2ebErhFi0SL+iItDFN/ r+CAJUTtsLYDXI2L7GJjnCYmaWdtUqc2wAiiYC/9uzsWb304BgQyEpKOkL4+uyPmGLJ+ JdGw== 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=KyI+INZKz66Zgtf3OyOOwbFkz56JAiJm6A8veMeZCV4=; fh=g31F5OX17WriiFRevppDJeoh/SshLQrA0uqWyfTFR2U=; b=BDXap0/VslMm76CtsFDpInLkCyoI/m28XgSp0FBNVKSrRGjz0SznA6CFoQX3Fik/SD hdglpXgBhHb8XFBZP5VEbrTBzgml6uFlAuIsq34bajpgusIpFl9v0W+ONoXIi3ETs1Cc hm6S1U2kBBWkMZqPVdKA3xLoArYzL+nZfTNjK1U+LYlWSAa2MFDeRTSTRdOFJ5CPsuPn +DXodiRsOMqK9b/IKPNbFuJLha9apYkHIUYpP8PZRvhb1tRIHk+KCVYSS8FqEkFV10rV eGWurkLJh/hNcGNcp7/7wxEPbsqQgKtacEoHrnvN1QEcbKBGF9ZLFUyKvx12CH8X3zNS ybqA==; 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=KyI+INZKz66Zgtf3OyOOwbFkz56JAiJm6A8veMeZCV4=; b=AcXnpVvqfUZKZw/qcpDIzcy5TE5YhmBCVsvq1E8hJCXuROwbIbP0+sfL7u8BbbEAd/ iOVJwmToaEfhZxo0zajF1WTFyfFCT/0MFOq6JVoy151K/bhNcIRM3XUEWTnipRbSUjpq LavbBvFdRQX6Wz0T3wIfV6w+njqSO4Bw9IBi6g1WINnRACKi3zCusw5J/QhW6z6VkasO mrBn7YtnxkmvQu6AByvBO9L74l7euW7yeITL6eebog3pQ8zrX3aeIPQvADu1L9iWMwFn jm2qkymJsVf69eokaEtsOJ+HnxtCb2uzoYteHHpBrxX5mlo5D2HXrGrE8rsj3I8JSTQD ZYRA== 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=KyI+INZKz66Zgtf3OyOOwbFkz56JAiJm6A8veMeZCV4=; b=k1G34kuGp2PygkwEOtUDKz5qN8tL5G9CmN76FS0WYUBoQq5Ocy9v3fgS2xEul++2Fa Ythi4fR66Ebz/XEdXTfEvNb+L/Opx9L+vR0x6E/Tx0W685g8KIC/UvYEEzqt8PqAFCtb 1NvGtjxg8R/jD9Zr563P3sRxUIKztp78zACDRBDc4fZX/3UmwzwTuvdyIudg/63ygo4u bp5Y5R+9r37JXAZMU6qKl2Io7LSjKZ/t6d2wmqyRAgbPY0JhwAeQ1mBTOCgMZQztV919 tg0ADYSxXsCF/XC53cMXPMKJyayPHT2C7fVNhBYaAEjhVjXvzD2n57C6qM0KZih4fffJ eZ7w== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWk/bAx1ktLk56rVbb9cjieGu83e+mbM/0GiBo6UGqxjEKZgNm16QyaGhRmwXzOlc9rQdstfzoH8B4zovppr+XHVN+rxnU= X-Gm-Message-State: AOJu0YwegUw5zYsl8RsGoJJ9YiYOzp22HZYMjNeJeTTseN2vyzqKG2az 1eSKMk0ZtHBs5jGNmoYpjvVMWJ2vJdKHjteVg+ns6Q/zv49iwUA2 X-Google-Smtp-Source: AGHT+IGOlXGCJdQ1biqglQdmzHQHbdxEEaYoYzbsYao7dw7ZpXtJ7/gfskkaC0q4Pl53FC6jT5BBFQ== X-Received: by 2002:a05:600c:1c1c:b0:424:8be4:f2c with SMTP id 5b1f17b1804b1-4279dabdfa1mr13873115e9.2.1720763018004; Thu, 11 Jul 2024 22:43:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5118:b0:426:ab3f:fafd with SMTP id 5b1f17b1804b1-427989fd568ls6928535e9.0.-pod-prod-00-eu; Thu, 11 Jul 2024 22:43:36 -0700 (PDT) X-Received: by 2002:a05:600c:33a5:b0:426:6fb1:6b64 with SMTP id 5b1f17b1804b1-4279da024e6mr12998185e9.7.1720763015833; 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=Y4FA9OcEzLmG/OeUke4laWdnpx9nzx8Xw28iTE01HHdrT40OcbAOigFQ0Sm3XhoZs+ 8qNcVU2BUxI4jdT5lxFSCEiRpS7PZ6w9yOr0SxS2pGSQzdLzKqbpQTSLMXCl+Jc7Z9G1 BwFglDJcMa+jMMSvS0G2ej/XTcxZJadatFwP8+StSkFTeARI3wekNz16gcQweO2609UV WLayWt5mjR9qs6N3rHp2f9GN/SxUe2S2eOheH3GsM2YaLkbmkd2B+egKG5jEf/TFNeyx 6NKBBQ2InZo5wxUIjwFceC3Mr1xRdtSGoKiKhAUtCyylQxikgq4zWrayZ5/9/Yi3Eact oQlw== 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=IyGH6Pl1zOahJo1VivY/FOyEaagrViJOppPLbyhSZrw=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=h5IeSYm4C4kvorDkM5BrVjPEl1L6a8NzFvbBYCQyobZUe14Xnw21MP9T8kyTUZwG6R pjCTmD07KSGLMhlx3DOzxLQfw1zoLXwDXoZ9+TnZScsepzYpNYBNFcEvFhKhvLXB/iRr yDAMwG0ND/HNe6NiumyAweU/t9G4ZICDjJTlM/SsZ0cKAvvTfBpwp/FvgJlAMHheFqOl NGMqUzhSRN1z74Zhi5l34iZiIu8eyJREg/TVyQ4iNoziqPRDNsL5OEfXA4u2ip0PlzrA vBXlkXylKsLuYAt0WszpMATIE7kvCYe4Y9FWOdZNmcdMEEPpTWbzSoh1zCkeGg0K4QHw 4W9Q==; 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 5b1f17b1804b1-426725585f2si3636045e9.0.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 46C5hWxw020492 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jul 2024 07:43:35 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 3/3] meta: Move DTB deployment to a separate dtb-files recipe Date: Fri, 12 Jul 2024 08:09:34 +0300 Message-ID: <20240712054327.9526-4-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?= Task do_copy_boot_files deploys DTB files into the same location for different images (e.g. -base or -debug). This causes build issue. Introduce `dtb-files` recipe responcible for extraction DTBs from linux-image package (distro or self-built) and their deployment. Different images for the same machine now depend on this recipe and don't cause parallell execution issue. Signed-off-by: Uladzimir Bely --- meta/classes/image.bbclass | 16 +++----- meta/recipes-kernel/dtb-files/dtb-files.bb | 45 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 meta/recipes-kernel/dtb-files/dtb-files.bb diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c29d9e26..3644183e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -328,6 +328,11 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" +python() { + if d.getVar('DTB_FILES'): + d.appendVarFlag("do_copy_boot_files", "depends", "dtb-files-${MACHINE}:do_deploy") +} + do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" do_copy_boot_files[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" @@ -351,17 +356,6 @@ do_copy_boot_files() { cp -f "$initrd" '${DEPLOYDIR}/${INITRD_DEPLOY_FILE}' fi fi - - for file in ${DTB_FILES}; do - dtb="$(find '${IMAGE_ROOTFS}/usr/lib' -type f \ - -iwholename '*linux-image-*/'${file} | head -1)" - - if [ -z "$dtb" -o ! -e "$dtb" ]; then - die "${file} not found" - fi - - cp -f "$dtb" "${DEPLOYDIR}/" - done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install diff --git a/meta/recipes-kernel/dtb-files/dtb-files.bb b/meta/recipes-kernel/dtb-files/dtb-files.bb new file mode 100644 index 00000000..49f0d584 --- /dev/null +++ b/meta/recipes-kernel/dtb-files/dtb-files.bb @@ -0,0 +1,45 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +inherit dpkg-raw + +PN:append = "-${MACHINE}" + +KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" + +DEPENDS = "${KERNEL_IMAGE_PKG}" +DEBIAN_BUILD_DEPENDS = "${KERNEL_IMAGE_PKG}" + +do_prepare_build:prepend() { + mkdir -p ${D}/usr/lib/${PN} +} + +do_prepare_build:append() { + cat <> ${S}/debian/rules + +override_dh_auto_build: +EOF + for dtb in ${DTB_FILES}; do + mkdir -p ${D}/usr/lib/${PN}/$(dirname ${dtb}) + ppdir=${PP}/image/usr/lib/${PN}/$(dirname ${dtb}) + cat <> ${S}/debian/rules + find /usr/lib/linux-image* -path "*${dtb}" -print -exec cp {} ${ppdir} \; +EOF + done +} + +DTB_PACKAGE ??= "${PN}_${CHANGELOG_V}_${DISTRO_ARCH}.deb" + +do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" +do_deploy[cleandirs] = "${WORKDIR}/deploy" +do_deploy() { + dpkg --fsys-tarfile ${WORKDIR}/${DTB_PACKAGE} | \ + tar --wildcards --extract --directory ${WORKDIR}/deploy ./usr/lib/${PN} + for dtb in ${DTB_FILES}; do + mkdir -p ${DEPLOY_DIR_IMAGE}/$(dirname ${dtb}) + find ${WORKDIR}/deploy/usr/lib/${PN} -path "*${dtb}" -print \ + -exec cp {} ${DEPLOY_DIR_IMAGE}/${dtb} \; + done +} + +addtask deploy before do_deploy_deb after do_dpkg_build