From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032205572624613376 X-Received: by 2002:a19:c50f:: with SMTP id w15mr31526415lfe.479.1637312949989; Fri, 19 Nov 2021 01:09:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:2610:: with SMTP id bt16ls54270lfb.2.gmail; Fri, 19 Nov 2021 01:09:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHwTTi8RV3Dqu+zbH/oVSau7uNzGp6/d+5RsRnEwJYW4M2IgXYckNysKwzUO3xapTHZu09 X-Received: by 2002:a05:6512:b02:: with SMTP id w2mr31484983lfu.508.1637312948701; Fri, 19 Nov 2021 01:09:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637312948; cv=none; d=google.com; s=arc-20160816; b=JKjKCb6DuoKBX20RsvqdfMQ2ZJlSG9Mj0UBzt2mLeq7ndhZ0dkTTGnuEVxmYOGJffa 3701jxSV4tlpcZeHhjfB50rfTo5PicchbqqhM2i9f/WuV9/cHdJardS/fP2p22hkyV7M xEJzuhjfCTFCFKsDajog1l0MbhJPrfH07QwhmSO4wNw8zE0ujiQ9Iq6KXTdlerlttic4 2SSPp5i/87gNs89hrkwb6wvumMt/2UQaWngsdCuoMXALHIKg331vxPd9/bJ6FMCKKNdj obDxBHUDEQIdgUgKyItMf48Mr/ndcJVoTBCizDBnk075jsKteIwQI81eqhlfFo2aO6ff dXHA== 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=3UZ3bGofbO73xHkNvR6N2l07yk81OSOyYoVZEGC/euY=; b=cMMSG/SX0xgyul2fOyoZhS3baF7CqkLXQktyINrHgkdkPrh0n7X+euQbEFzSB/2EPD 2PM7gm2iKqYQXnzH9gc0JPKIX4FRugcXKaNDZIejlbKcu9/c2a0CfYiVyBNDOk672mJ8 D1YbiovmIJpTOIOhceltM5yrmcD1JwW46ho1hp5jyUUetx6BtIbttGO8h3yUR7L4CHGp /+9okMI9h/MydvVm5j7x8pOtK0TQ6/Sp4l5zo8mvyejqPV8Y6kkmBngRPE6AoNNWE77+ TLUUiMGZS4CjDLE8PFDeru1Kt36wk0ttGc0Xbd0zoqhgPyZ9NW3HNvboRxXpxZWVlkvi jNvA== 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 b29si153154ljf.6.2021.11.19.01.09.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 01:09:08 -0800 (PST) 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 1AJ996ZD020180 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 10:09:07 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 1/6] image: Support multiple image types in WORKDIR and STAMPS Date: Fri, 19 Nov 2021 10:09:01 +0100 Message-Id: <20211119090906.31305-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119090906.31305-1-ubely@ilbers.de> References: <20211119090906.31305-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: jvTaOkVIiWqm If we want to support several image types listed in IMAGE_TYPE, we should consider this part in WORKDIR, STAMP and STAMPCLEAN. The solution is to replace spaces with underscores Signed-off-by: Uladzimir Bely --- meta/classes/image.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 5a0f32e4..2d060704 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -1,10 +1,12 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH +# Replace possible multiple spaces with single underscores +IMAGE_SUFFIX = "${@'_'.join(d.getVar("IMAGE_TYPE", True).split())}" # 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}-${IMAGE_SUFFIX}/${PV}-${PR}" +STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}" +STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/*-*" IMAGE_INSTALL ?= "" IMAGE_TYPE ?= "ext4-img" -- 2.20.1