From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7007432827793833984 X-Received: by 2002:adf:f08d:: with SMTP id n13mr13199606wro.339.1631545096914; Mon, 13 Sep 2021 07:58:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:c789:: with SMTP id l9ls3391279wrg.1.gmail; Mon, 13 Sep 2021 07:58:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxL86jF9MQTcq53+prjkbXU/7t9+upS8oMs+59H++auM7QDYk413E53Mzqp3QtZ0YQykYmy X-Received: by 2002:adf:f24a:: with SMTP id b10mr13274752wrp.281.1631545095868; Mon, 13 Sep 2021 07:58:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631545095; cv=none; d=google.com; s=arc-20160816; b=VYkPQdEGIFSRuVUGB4gi/NrDejahhzCXjuwDTX41EQfxHOQL0566vac69QEhsp6Ys6 hN1hBQlyGQ/LD76BV74h5PgxnNPBNv4ic/LPOUIpUZS0HYzHNyyiBeblTSgp+UwTsXA5 fyFpv8LfNJ9qxmjezh3cucl3ThZfXqmUxv26RH5PbHz4HhMwzhUIwTvw4rg7wVIZfuXR jCLtGNevfgsguICPmSn/U4XywixLjuB8Yo7TgNoll1Qf+4xJb9/hQkEQSw7bFbpx2OhX BFNI5n9SlPKmEwvLgm/CC4Cf99y9Wpxm47mXHkEoeWVDCk7W5wBuMalnbmN6bXuDBnTy mnCQ== 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=rDLCzD25Bb7QzaCBBSaTHXULM4+hRB/YQ06OD1Dkk95qeAFLKZ/SBIPOf4iCgRmEwx eZ+qT0Gk50KJ9pn1iOM+QMh+lIy3Bv6kA3oDCGuQmwG+WjBXX9SAmuUL9k5Vklw/r/dh k9fAIHiAXCJrjU5DdJTlHP54q15XEiAT2QA0SowmpgYMbnMe4Gi09Ko+sqIZLWMWAF5y /aTiOm2a3ipZ+bOERCmAYgQBknnzfCIl/mxHeckyLG5IawEfyrWWX6mfh6PWEWQOujGN AwRzgsQJCFFINhazYrEXHTLDZwoOdl69sV283cnyqAGDI7pxYH4kxQQHmLFNaRKq5jD/ 8YDg== 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 g8si902750wrh.0.2021.09.13.07.58.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Sep 2021 07:58:15 -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 18DEwA9j009612 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 13 Sep 2021 16:58:13 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 1/5] image: Make WORKDIR and STAMPs unrelated to IMAGE_TYPE Date: Mon, 13 Sep 2021 16:58:06 +0200 Message-Id: <20210913145810.26394-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210913145810.26394-1-ubely@ilbers.de> References: <20210913145810.26394-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Fh8O4CD9YIip 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