From patchwork Wed Jun 19 09:53:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "alexander.heinisch" X-Patchwork-Id: 3623 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 19 Jun 2024 11:56:12 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f61.google.com (mail-qv1-f61.google.com [209.85.219.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 45J9uAWb028054 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 19 Jun 2024 11:56:11 +0200 Received: by mail-qv1-f61.google.com with SMTP id 6a1803df08f44-6b4fdcf92d9sf16688866d6.3 for ; Wed, 19 Jun 2024 02:56:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718790965; cv=pass; d=google.com; s=arc-20160816; b=uibIQ675NAVzdvZnfU+y8859G4XEEbZoCaCMnhoD7Z42f1hx7iT32nJ99OYguPn1R6 wtHEO9JguxlTv6FVVdx/oOs6gg4s4EqcwzWkmfqIKm1bdlBkHQrvxMf8kuHwNkHfdKZI K4PJCljIBfu3wDO40sYI06fy5DlFQA7tA7SjwZBVXaQKiaKlclcXWaMTUZpSaTjH9CaT hNABCBkSIVPi3uIG2t+ouDK5SKnNNWlwaXpeTDmbqyewfW1ZY9IetlcyiXC1V5lR+HNF opEoTM1jvpPh7OLCo46kMDtDqbMqh0QqO8disM0vbAvGPDjjbZdGkKCgqQExlez/Od6a BBEw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=c38XsWDBSQZrantjqQe4y4dDo2faPDQKSaZFzoPG26I=; fh=y+GdApdbGz61KQ2HlyAvoFWu7rYsDk/BnwKtYTmSglc=; b=0H9AZDS1qoRlN3zBrTcbvO+zY/v4sV1ClEWzCXm22Lvyuu0nUAQlNHEwJPk+tleWI+ /+1+d+PBUXcpaJNSqIwVEMwWHT3t5GPaJbDCHPWsksDzwDCi3mnTYFISlQVXXBzXtK3U kXdBuiXcTVIrdgg9O3CWBkVfp2Wyj5ou/xgPQzYzNNDqd+NyBiNdAWTi/8m4/SpmavbJ s3e1QoJl8Ba9a0fkf6xom8OEjgFaUf1CMmTkaVAi4aWHDTiNZnaZnTBqoLmrc/LFSFEp spHxbZXw1O0oFPHTf9QsWCeKUnNjEorwNYaPxDKiNfjJ7TE5Q4emwzax3LNU2t25dvgw qhLA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=cImbB5jJ; spf=pass (google.com: domain of fm-1326448-2024061909550449f64a86cc2af3fd93-yofp12@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1326448-2024061909550449f64a86cc2af3fd93-yOFP12@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1718790965; x=1719395765; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=c38XsWDBSQZrantjqQe4y4dDo2faPDQKSaZFzoPG26I=; b=vPUEj2Jq8PCgWPr9VdKAYcBmecNVUgja1uLctgfAU/PVHtvDSzCQVzHn9TiEhWf3wQ PxuqoilCKQo9PXO/N/owdUeQP5rr1X7tBGEGV6v4/huB08v3h2p/i9pqZKV03eZVxV3x OEdIqKfoUwBT4ItpQM2ZtJTc+jFL4eVZmvVV9MwvokwFmesmUHOi2uLURI555O3cf3rD rD7fXAiH8Yl5udRLlLxuy3niD/WDa6CCOYaQCX+gbQDJ4E/0Md+iJ3llTQ26kCdjhk/P U8LY7ItWEbqnNKKUWiXawTu1O9RhtHwgtRBwjxioFi6GUlbjMuBdSgytK1EuZthE867E UshA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718790965; x=1719395765; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=c38XsWDBSQZrantjqQe4y4dDo2faPDQKSaZFzoPG26I=; b=wZXnCzKtPJU4OsiUHtyaJk2Z8PCFTtcewXkgU9tTXCNGjnbBYk9RQuK6b5ZOvknPdt DeEmMmdqQ10nYQ8OqLRhKfOecS+a+BOLkFJC9MIcab8JdJmcw1g4Sszr1jeC6mBqgxR7 bAsSmdGolKj3qREmqnDQPnZS5maij64jrzDtf712ZS8CdjbS98M0vyW7R4MuR6VUtLSw ziNKz7eeB7yK2smMM5T8SfIkZKg4xDWREhhGks9mUbi7Nxmw4BmuW22L64qcHP6H2pDQ qOQ8o6pHJVTOrejlbgqNJ023cTEWjju4iAlyBM3HzyKz1ZHcLO+iG5hs5D0Ho9ODp2+X Bdfg== X-Forwarded-Encrypted: i=2; AJvYcCUaFR1bXcerylw//Js3W9rnQ5Wo/a0mvoMm02pY+Fn7kovggxmrFHynHa2sTrxQbBUR0+bB1HjzhQQuBdKFC0yFd0W5ZdA= X-Gm-Message-State: AOJu0Yx5nj/BDqfPTjJPJM7b9TXAPB9FOjDgLpZcXcJ7nXXIpY3v1jYf FvdI5HocqPMTxlbkfrft7/wSS4guUkfL07+B424zexSlVCNCWrro X-Google-Smtp-Source: AGHT+IFkQvAjP7z9XCggAfUZA5y0AnqX5B+xS+T7kCrx/pNQOu1s94nqopBTehxWNvpOcmWC781Ovw== X-Received: by 2002:a05:6214:da9:b0:6b5:7c8:8336 with SMTP id 6a1803df08f44-6b507c883afmr9660576d6.56.1718790965194; Wed, 19 Jun 2024 02:56:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:2d43:b0:6ad:7b3c:b7c7 with SMTP id 6a1803df08f44-6b2a3507c5fls88757896d6.1.-pod-prod-03-us; Wed, 19 Jun 2024 02:56:05 -0700 (PDT) X-Received: by 2002:a05:6214:320a:b0:6b0:9330:5b5b with SMTP id 6a1803df08f44-6b501e9dc0fmr180606d6.9.1718790964893; Wed, 19 Jun 2024 02:56:04 -0700 (PDT) Received: by 2002:ae9:ec12:0:b0:795:5d5b:11d3 with SMTP id af79cd13be357-79bb3e87392ms85a; Wed, 19 Jun 2024 02:55:06 -0700 (PDT) X-Received: by 2002:a7b:cc19:0:b0:424:7871:2e9e with SMTP id 5b1f17b1804b1-42478712f14mr10714095e9.6.1718790905093; Wed, 19 Jun 2024 02:55:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718790905; cv=none; d=google.com; s=arc-20160816; b=cFpkLL7mQzwTJhD6GDF/V6lyrhs4/7YQAQ+EyE5CLSHvUyVnhws85X190W1YSCHIjo dI2r42BIppyijiwHR9QwDTa3uTwK2N/UZmse7sj0bZL4+HK/D/togxxDzruClOuNYUf4 Ay+Yy2KtPX4Xgd0nAHn5tTdjM4DSAcbWp14Lap8uR76ssKryN5YWKbHbAgB8Jqc8TbHD l9Y5g2jrc3dQR0rVNYzwp4aXuc82v4uHU8a7PZUupGTM48lJ79cy6E6kKAFCIDoLHwvF xczfVRTxDzpiZENJnAorcyGbp41MvpV2Dc3yqRJATTwYlMvvpGgI8MBQVoQhZewQmHds sjug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=WnHKCiWGMV/EEmd69TqCgszTtPx/AHWvQQgCqJvyy3w=; fh=6XDLnaLIWVVjTMydLt0zFFdHKraAC7KNhuWITZyiMgk=; b=RVBg80AqkjF88GV+DZpU4tJKsB3PEWs9tXDef0vh9bCKIoQTXTo11iqHsoRdBD0VL6 1sA4ZrBIFrC87sqF4W51efcEm0HrjoHdfjz3tFYibHe01gYrN2DRtO8GPu/IFEf7lL9G j/CEgej+f72o7NdADc2D1fyKNINBEcAXPo2JUwPB25yMKtDXATw/EP3uF8ruxbEYeqMW CNUiLRudDxtL9M4yXrB2xlYTsfSSQ121zHHj9VP6jKA9tdRe/AhuI8Y8qS7+ixr7SWbp MAiI9lHaQ373XXgspFQpUnTbRySBIgGZ77+0HvnuwQEjgiA8PGb1TdRM3AEXeDii/oW1 dl8g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=cImbB5jJ; spf=pass (google.com: domain of fm-1326448-2024061909550449f64a86cc2af3fd93-yofp12@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1326448-2024061909550449f64a86cc2af3fd93-yOFP12@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42471e660dcsi1569705e9.1.2024.06.19.02.55.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jun 2024 02:55:05 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1326448-2024061909550449f64a86cc2af3fd93-yofp12@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2024061909550449f64a86cc2af3fd93 for ; Wed, 19 Jun 2024 11:55:04 +0200 X-Patchwork-Original-From: "alexander.heinisch via isar-users" From: "alexander.heinisch" To: isar-users@googlegroups.com, quirin.gylstorff@siemens.com, jan.kiszka@siemens.com Cc: Alexander Heinisch Subject: [PATCH] meta-isar: Fixing isar-image-installer to bundle correct target disk image. Date: Wed, 19 Jun 2024 11:53:51 +0200 Message-ID: <20240619095351.192990-1-alexander.heinisch@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1326448:519-21489:flowmailer X-Original-Sender: alexander.heinisch@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=cImbB5jJ; spf=pass (google.com: domain of fm-1326448-2024061909550449f64a86cc2af3fd93-yofp12@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1326448-2024061909550449f64a86cc2af3fd93-yOFP12@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: alexander.heinisch@siemens.com Reply-To: alexander.heinisch@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE, SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Alexander Heinisch When using multiconfig setups with differing machine configs the deploy dir of the target to be installed differs from the deploy dir of the installer. Signed-off-by: Alexander Heinisch --- meta-isar/classes/installer-add-rootfs.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-isar/classes/installer-add-rootfs.bbclass b/meta-isar/classes/installer-add-rootfs.bbclass index 7767d96e..c738f690 100644 --- a/meta-isar/classes/installer-add-rootfs.bbclass +++ b/meta-isar/classes/installer-add-rootfs.bbclass @@ -12,6 +12,7 @@ INSTALLER_TARGET_IMAGE ??= "isar-image-base" INSTALLER_TARGET_MC ??= "installer-target" INSTALLER_TARGET_DISTRO ??= "${DISTRO}" INSTALLER_TARGET_MACHINE ??= "${MACHINE}" +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}" IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_IMAGE}-${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_MACHINE}" IMAGE_DATA_POSTFIX ??= "wic.zst" @@ -24,9 +25,9 @@ def get_installer_source(d, suffix): installer_target_image = d.getVar('INSTALLER_TARGET_IMAGE') or "" if not installer_target_image: return "" - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') + target_deploy_dir = d.getVar('INSTALLER_TARGET_DEPLOY_DIR_IMAGE') image_data = d.getVar('IMAGE_DATA_FILE') - return f"{deploy_dir}/{image_data}.{suffix}" + return f"{target_deploy_dir}/{image_data}.{suffix}" def get_installer_destination(d, suffix): installer_target_image = d.getVar('INSTALLER_TARGET_IMAGE') or ""