From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7382150987442552832 X-Forwarded-Encrypted: i=2; AJvYcCX4IIWt5uJuPYrcRes0KHjngEPkx1mZGOR1mavNBv9oF0jGT12JRiEu6yqUHsZQoI9lf5zmzAhq7O1fuXsQm3qXu+0vIjkJ1lLfGSc= X-Received: by 2002:adf:f0c6:0:b0:35f:cc8:1a81 with SMTP id ffacd0b85a97d-366e7a1003cmr5955384f8f.33.1719383446624; Tue, 25 Jun 2024 23:30:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1144:b0:362:606d:1028 with SMTP id ffacd0b85a97d-36480a44913ls1749785f8f.1.-pod-prod-02-eu; Tue, 25 Jun 2024 23:30:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWH8tw/nfTf2OQaDdWqJnZbZA7Rr05Oo8QABCtYJXolfF6cRlUAHx6YmrQ5PNvAQrebpsh3EdEMu407lqU2DFrZS1q8+/09vJWrZN4= X-Google-Smtp-Source: AGHT+IG/GEVhReP1uqj4UFkldH6PDQIVYchJvDTafNrBRnXzDlEaUVXtMA4AbmzdvfnsMfDRWHk6 X-Received: by 2002:a5d:64c6:0:b0:366:e935:61cb with SMTP id ffacd0b85a97d-366e93562ebmr8231296f8f.56.1719383444394; Tue, 25 Jun 2024 23:30:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719383444; cv=none; d=google.com; s=arc-20160816; b=xwZnOgjJ2gl9ruQto1s3/EMatVBjExcH7kZZO1pNnPFXKWBzXypEue7F6yWHDwQUEh D4npJ+BvYrvkf4dtz9NYmRGJ+dh0AAn7wdK/A1HZglASu7xrDSGJNgYMMPMShQV/Ds58 8qtpXtUmBjXmf+5Z71YNJg6m3xBoakXTpseZIzdbzw8tRoNMcEB5ZT9uYM9jg3FIrLKE glCUZQZIYPFhUawk1imMJLH+6d7yUGqmrJ8m2BpEBpr8eldcqL4Pv/wMbzKJqfCwYLEc AmFT5IyeryRPV4lpI8+tTrZLk/8M7JMxT+pAgJK6BVpWSbKH9iyESZ+bHGdvQ79zWdPf gm6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=tk7cr17RwSGt3p+i4+81MzU7iAOrnk4sWFdQ0z/dRfc=; fh=BSPqGArB6tTDqZiGP6bWbwR/OT+7QmHvthjvMivxaWQ=; b=D8MXcaTaCwiqORGFQ1+jrHCylaxpbktA0wEcHshHOB+Xtz3Ht9exrOLjTQ6TB5V04G LH1hXbNfBkBeYxwZ59jDWB8qAMLQzroHEh5zXxm52xJhE73hrC8RigNpovRZT+lHqHeZ jBv6a9c6dXnwInRYeIeU+F2MkU/AusMPGqgQ2rrx2YQtI2HqMBGDN+Zr5txY3AHUire3 8AfE20xzxM8F4V1zjBqmP8tjv1perUIxuKe8M3ZC3eqa6Aw7RG9IkgfHlP6G3OKr3PME K89pgFHD6ilQOiUMc2WMYVw4oZNCFoaqzVAaus8HIX1eMMVYUs/jvSJeeuRZ/ZPXowHd WlKA==; dara=google.com 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 ffacd0b85a97d-3663a9c0f68si401252f8f.7.2024.06.25.23.30.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jun 2024 23:30:44 -0700 (PDT) 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 [127.0.0.1] (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+deb9u1) with ESMTPSA id 45Q6UfSV029574 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Jun 2024 08:30:43 +0200 Message-ID: <3ed5c2c630d645acc9033460912dc0ae7a917d9b.camel@ilbers.de> Subject: Re: [PATCH] meta-isar: Fixing isar-image-installer to bundle correct target disk image. From: Uladzimir Bely To: alexander.heinisch@siemens.com, isar-users@googlegroups.com Date: Wed, 26 Jun 2024 09:30:41 +0300 In-Reply-To: <20240619095351.192990-1-alexander.heinisch@siemens.com> References: <20240619095351.192990-1-alexander.heinisch@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.2 (by Flathub.org) MIME-Version: 1.0 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: fZ39/RMH6Y9Y On Wed, 2024-06-19 at 11:53 +0200, alexander.heinisch via isar-users wrote: > From: Alexander Heinisch >=20 > 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. >=20 > Signed-off-by: Alexander Heinisch > --- > =C2=A0meta-isar/classes/installer-add-rootfs.bbclass | 5 +++-- > =C2=A01 file changed, 3 insertions(+), 2 deletions(-) >=20 > 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 ??=3D "isar-image-base" > =C2=A0INSTALLER_TARGET_MC ??=3D "installer-target" > =C2=A0INSTALLER_TARGET_DISTRO ??=3D "${DISTRO}" > =C2=A0INSTALLER_TARGET_MACHINE ??=3D "${MACHINE}" > +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??=3D > "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}" > =C2=A0 > =C2=A0IMAGE_DATA_FILE ??=3D "${INSTALLER_TARGET_IMAGE}- > ${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_MACHINE}" > =C2=A0IMAGE_DATA_POSTFIX ??=3D "wic.zst" > @@ -24,9 +25,9 @@ def get_installer_source(d, suffix): > =C2=A0=C2=A0=C2=A0=C2=A0 installer_target_image =3D d.getVar('INSTALLER_T= ARGET_IMAGE') or > "" > =C2=A0=C2=A0=C2=A0=C2=A0 if not installer_target_image: > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return "" > -=C2=A0=C2=A0=C2=A0 deploy_dir =3D d.getVar('DEPLOY_DIR_IMAGE') > +=C2=A0=C2=A0=C2=A0 target_deploy_dir =3D > d.getVar('INSTALLER_TARGET_DEPLOY_DIR_IMAGE') > =C2=A0=C2=A0=C2=A0=C2=A0 image_data =3D d.getVar('IMAGE_DATA_FILE') > -=C2=A0=C2=A0=C2=A0 return f"{deploy_dir}/{image_data}.{suffix}" > +=C2=A0=C2=A0=C2=A0 return f"{target_deploy_dir}/{image_data}.{suffix}" > =C2=A0 > =C2=A0def get_installer_destination(d, suffix): > =C2=A0=C2=A0=C2=A0=C2=A0 installer_target_image =3D d.getVar('INSTALLER_T= ARGET_IMAGE') or > "" > --=20 > 2.43.0 >=20 Applied to next, thanks. --=20 Best regards, Uladzimir.