From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6739560601010307072 X-Received: by 2002:adf:f1c3:: with SMTP id z3mr9395302wro.147.1569415675694; Wed, 25 Sep 2019 05:47:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c0d9:: with SMTP id s25ls1323711wmh.4.gmail; Wed, 25 Sep 2019 05:47:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXR5D1C2Tx6mYkq4v6cN0oMaDaJNoPOAPR4DlzuIuU/ZhciNsmjdX3PRd6OUNIDxZ7luey X-Received: by 2002:a05:600c:2308:: with SMTP id 8mr7995930wmo.67.1569415675068; Wed, 25 Sep 2019 05:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569415675; cv=none; d=google.com; s=arc-20160816; b=WM3mPJ3T1mYUehapitkxHTCTMXElh5OxSqAVNr+UuL0L6O8SCEnvU4XEWBzgvparrD a69moCrNONA5vUr6cqWa+dxDrtqzXoGc6ddkPEUQqvzh/Wd0L669PI0EJaA4bf449PRi YrAh8JAxSqbFCLVEAybLeKes9SW33GoN/Bq8gDxWPaBlXnLpCxydBZqswhsCN6YUp7TU wKP+GSo77/CwnSw1OLDGdZi81dVSujYx+Gk2+HHRLeHVLyFiVETT9ShjKyTrEBMKZkqY masFdVlCO+U4pH0G2VB2OK9i9R/1oc32AmefeX7sJrMmBMrvqEWyPXjRBmvQ1g31Q+qZ ikEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:cc:references:to:from:subject; bh=TvYGofvBWFaViFz0Y5aklJs9/poHnEezBuhzXfkl99c=; b=AKug82C847izRiY/aQIZtQb36rDISfMY/4B/suBRch0RqqmCH9WZ89jurlL+bqL0Np 4pClbKvznns3K5HKLvdAz4TiMNcJHU0WRF1Nm0XoqAHE1FR5AAygx2JVDrqpMFtW+16X cHFg86tT+FkCR95RxTVo+5Oi3ewazDN1mOGvVZfkfXOxqdzUvth/mxOHGc9wxuxbgF5k YBLbac70Cd3AEk22+DtkPYMInxrGPbll5F7Ma867IJOC2uQbXmHYgyAAsoVD9CCuL5Cj 7luh+hX7mA1sUsviKILT8wD0Y2m9W5BaPVnoPnkmsspFqzh3t1L8PnD83hS53bSWC9qH qABg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id y11si344900edq.1.2019.09.25.05.47.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Sep 2019 05:47:55 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x8PClsmJ026468 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 25 Sep 2019 14:47:54 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x8PClsHo032106; Wed, 25 Sep 2019 14:47:54 +0200 Subject: [PATCH v6 05/27] image: Stop changing PF, tune WORKDIR and STAMP directly From: Jan Kiszka To: isar-users References: <60d0f6c3500565250112e1bc6359e2f39ac98f8a.1569176231.git.jan.kiszka@siemens.com> Cc: Henning Schild Message-ID: <4b1046f4-16f8-0d96-fc88-b9c35dd64dde@siemens.com> Date: Wed, 25 Sep 2019 14:47:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <60d0f6c3500565250112e1bc6359e2f39ac98f8a.1569176231.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 8pFxinMMEptP From: Jan Kiszka This removes the last fiddling with PF, addressing the issue - a common image PN name for multiconfig targets while the results are actually machine-specific - by tuning the critical paths directly. This are just WORKDIR as well as STAMP and STAMPCLEAN. For keeping the deployment filenames stable, set (and use consistently) IMAGE_FULLNAME to the former PF value. Signed-off-by: Jan Kiszka --- Changes in v6: - avoid kernel/initrd filename changes meta/classes/image.bbclass | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ec6bd39..2dad348 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -1,7 +1,10 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -PF = "${PN}-${DISTRO}-${MACHINE}" +# Make workdir and stamps machine-specific without changing common PN target +WORKDIR .= "-${MACHINE}" +STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" IMAGE_INSTALL ?= "" IMAGE_TYPE ?= "ext4-img" @@ -10,12 +13,12 @@ IMAGE_ROOTFS ?= "${WORKDIR}/rootfs" IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" # Name of the image including distro&machine names -IMAGE_FULLNAME = "${PF}" +IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" # These variables are used by wic and start_vm KERNEL_FILE ?= "vmlinuz" -KERNEL_IMAGE ?= "${PF}-${KERNEL_FILE}" -INITRD_IMAGE ?= "${PF}-initrd.img" +KERNEL_IMAGE ?= "${IMAGE_FULLNAME}-${KERNEL_FILE}" +INITRD_IMAGE ?= "${IMAGE_FULLNAME}-initrd.img" # Useful variables for imager implementations: PP = "/home/builder/${PN}" -- 2.16.4