From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7012879449257410560 X-Received: by 2002:a05:6512:22c3:: with SMTP id g3mr31522597lfu.528.1637313303963; Fri, 19 Nov 2021 01:15:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a222:: with SMTP id i2ls408356ljm.9.gmail; Fri, 19 Nov 2021 01:15:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZR9e3ZpsOtbHN7EAr8IotGWgAEAEwS3nfhzte7mX6CPvCrkiZ7AxCkKkQiT4ZR6CBM+d6 X-Received: by 2002:a2e:9787:: with SMTP id y7mr23488806lji.228.1637313302658; Fri, 19 Nov 2021 01:15:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637313302; cv=none; d=google.com; s=arc-20160816; b=w3oQFvMFLcN/2i1WwPUcokFMrPIjyhtC6z3bDdYu1ofaoxwReqMbpQ+CHbNJFp+0gu c18KxKhkyjn+h3d+q6xram1ESCBMwoJxq8MH53ZxsSiMUZSUyMYjbOF7tqnhoaKlKs05 cRkWutIGhxEtWWie3QzJ/mx+A1RoLap6oNomTyibDzqXRF8+YB/JwNrCs0DSIb6M7o/J LHIO3SumWWtvuoOObvrtI2zgak3zGuJhvqtAZCVu2Kqr02p1IOFUVoSrMGtEVxqP+IXr 5dryKwrC5Oxnw40l+lxOFG8Q/zd4LbHwvceYJkSFWvNOenRabYn4PnvoQDpEFUKM/9U0 +tGA== 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=mQ7UnO8Eopj6IUrRyY6Kyb85iDDb0prMW1aPvS0VvOTQ7v9WO2k//6fYN0+ffkf5E+ QrgZYcOn0e0+EQfHrMKho/dfUbJQcTzWYqTUISYLGtlXFL4M3ArHuSidphczX6Pr14EN K0qffJJNl35d2gndylIWkzOe9Kjzwjfqcxwgy2ry8bcOi3Zdc4XA4dqelyG1JhE+7dSk Gf9jg3V1rqaFWqSbPWAXsuLZcHdHfJzsFrQTB/wV3H9Sptlp/64sDs0BlgGRNjpTDK35 c+G8YVcaa5dE4aLcKu7Tw9q44ELwFYdorhxQBFkL4W2HKxzv1jMtzS7Meg0DgR5SO8UM ETkQ== 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 i12si154009lfr.7.2021.11.19.01.15.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 01:15:02 -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 1AJ9F0uo020418 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 10:15:01 +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:14:55 +0100 Message-Id: <20211119091500.12341-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119091500.12341-1-ubely@ilbers.de> References: <20211119091500.12341-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: 8stpzikwj9gU 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