From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7382150987442552832 X-Received: by 2002:a0d:d48d:0:b0:622:c901:950b with SMTP id 00721157ae682-63a8fddc9d9mr23391567b3.43.1718790965301; 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-Google-Smtp-Source: AGHT+IEj5YZQz//a+yFiU7abL6m6YAGLeZ+JBtd6Oh246sI5PGq4bCKss6xk5Ru+dY3SESQvaIFE 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 Return-Path: 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; 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 Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2024061909550449f64a86cc2af3fd93 for ; Wed, 19 Jun 2024 11:55:04 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=alexander.heinisch@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=WnHKCiWGMV/EEmd69TqCgszTtPx/AHWvQQgCqJvyy3w=; b=cImbB5jJkghXTFiDrbDTwGeGcLBKvxMBgeo2vMl5VSIDi/Xeyce3/z/UxyVwLjq89Km5bs dzMiVQrR3JkxnWS3TQNC5QsLynlzDqyuiD6GDUi3+mezJQrwy0sWmHgo2hAzi8KOm25R5QYN 5TAxhsv2nQGSW1dD4q+KFTtalTSDQ=; From: alexander.heinisch@siemens.com 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1326448:519-21489:flowmailer X-TUID: H+4ONu5vR5TF 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 "" -- 2.43.0