From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7012879449257410560 X-Received: by 2002:a5d:460a:: with SMTP id t10mr4685702wrq.145.1632813238562; Tue, 28 Sep 2021 00:13:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c4c3:: with SMTP id g3ls841195wmk.0.gmail; Tue, 28 Sep 2021 00:13:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzUwxHoFh2fEo/sf97eAOdUvA6iN3FLBlXYluHcApyY52Z9m8+Hr9anKqng3DVPv/RenFy X-Received: by 2002:a1c:e915:: with SMTP id q21mr3156508wmc.180.1632813237566; Tue, 28 Sep 2021 00:13:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632813237; cv=none; d=google.com; s=arc-20160816; b=RSK9exSjZFAc5ml9U6se4ES2GaXLaUQYSskAZ3Fua1sJCu8QFHYJSluVwVR4jKLPCg EKvDKcN8KfpG7AKUKG1senpsCKJ/SlFezBb2nepeSUdrIsvq6wakQH9/vsZKpfqraElX yTfXU9mr8GZ1XLgItzL2lD4y/q3Izh/kujciL8aY+lW7B29T+XUfnyCTN0DOj9PqC1Lg cJcrCUy5V863ZzH/EHkGVuuPzwYTc9rSNTDD4dxmZdnOhPc3GQ/bc3HjXc0vvlbpy5Gh j/NvIm9colYbEdDJbVwrhFtiVH6FzRdxdQGTdf2+yJ5ht6EICHvqTZaa2dWI/MwMiMw3 l62g== 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=h2GuPpx3RVlcWLdzM5qJKIJbPXhu2xOMVY6A4bE9/Wc=; b=SUDc5F9g2X2nW0bwzapSpu1BHybxEkgmibCEfAWBeWCJ9eZP4iih8U0lGEzNK5CbIZ uaabJlPO4y03xC4ViLbxgruMMCdEezeTIMJqsfA+zB6BudDt3dCMU5HibptdCGPXWyDX aaN/5q2D/N5LrrB5nUrsoHhniVUEVysX+kpr66A2HgU9aNR3g3ZOSSIPFkhChAZWdwoe kF0miybV5DKOXWXjnxjuDW262ujopvdqYrN7teucfvG56H4f3xtDtjrgng1SOuhytV04 P6SGMfm1wca6XN/JxXx4XSleJb7gY19wgyiffFjmnUZpRrA7ITLMVFFrOgQGPWtJ5tqe JvZg== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e2si1498077wrj.4.2021.09.28.00.13.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Sep 2021 00:13:57 -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; 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 Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18S7Dqmg008903 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 28 Sep 2021 09:13:55 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 1/5] image: Make WORKDIR and STAMPs unrelated to IMAGE_TYPE Date: Tue, 28 Sep 2021 09:13:48 +0200 Message-Id: <20210928071352.31382-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210928071352.31382-1-ubely@ilbers.de> References: <20210928071352.31382-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 5pshr0GyC5dp If we want to support several image types listed in IMAGE_TYPE, we should remove this part from WORKDIR and STAMP and STAMPCLEAN. This leads to sharing the same directories by parallel builds like mc:qemuamd64-buster and mc:qemuamd64-buster-tgz that differs only in used image type. Technically, this commit reverts the commit 6374a763c988 (image: Make WORKDIR and STAMPs IMAGE_TYPE-specific). Signed-off-by: Uladzimir Bely --- meta/classes/image.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ec93cab..eecada3 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -2,9 +2,9 @@ # Copyright (C) 2015-2017 ilbers GmbH # Make workdir and stamps machine-specific without changing common PN target -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/${PV}-${PR}" -STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/${PV}-${PR}" -STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/*-*" +WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" IMAGE_INSTALL ?= "" IMAGE_TYPE ?= "ext4-img" -- 2.20.1