From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7372484099040083968 X-Forwarded-Encrypted: i=2; AJvYcCVJfL2iASiI3bieiP8Sm5fKl2+Wt7UwPxcwx7dPVSc/BwI97A0PnY+6QNmpMfvnrJoIz60iyH+jDgWgkOul/rRlVaiewoFTF/kZ3eQ= X-Received: by 2002:a50:f695:0:b0:57a:2f7c:c779 with SMTP id 4fb4d7f45d1cf-57a3658628fmr6571092a12.37.1717396573189; Sun, 02 Jun 2024 23:36:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1d0f:b0:57a:6429:7f39 with SMTP id 4fb4d7f45d1cf-57a64298063ls168211a12.2.-pod-prod-09-eu; Sun, 02 Jun 2024 23:36:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX9VjNJrRsP2DKp1kVhNg6tHrFlE4iApERZoyc2th3H6KAXdgwBa0J50/r7rizq4SMeZwUszbveoN1qhtYBN1EYmkjgS/d6lkxtVy4= X-Google-Smtp-Source: AGHT+IHQ6QVluHF8BRdksL59hJzrZlwv9ln2wKcmoSzc/FzjOjDtQEDLR0UDO1NRhtufFuCIQti2 X-Received: by 2002:a50:9fe2:0:b0:57a:4c22:c0 with SMTP id 4fb4d7f45d1cf-57a4c22037amr3598653a12.10.1717396569850; Sun, 02 Jun 2024 23:36:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717396569; cv=none; d=google.com; s=arc-20160816; b=hVFfPuF8IYhpHiyPRX976QrEk4AFobCB4AcZUQMW9TtRkb0Y7qGVQynJN4avlAYEKv 4PGdoUDRPsTul7YRfFwSYDLWWTLXGUuTSSBYoK34SUEHsiw1GQaWAZcI3e2iDRRWM5/m PfkbFrx2GurWYO4lJ8e5Z7ETHjXQrqRtZCELfMRYQGIkJX3pEyG+342ULxdwI+qVRfVZ Fkf6iQ5ed1MVh/Nf6OgP/EoCy6jDYSDMIOY+Ia8rTwHgRj2YKt1l3Gjy9ITmAjHIzttc 9qQ6YRL1TImAemaNnisqyFrKh6uf/jQC0/Wr1lzDFTuvu7yOHbTeLMltM4EEvxsjFge+ xlOA== 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:autocrypt :references:in-reply-to:date:to:from:subject:message-id; bh=PjG4kLFvYaeCs7aJeiO+svwDnEC2RjXQUk+hHcLAxiM=; fh=7U9bt5EkCry67sG+Cc4EVPhGY4cTcCSQUazzVQY1X7A=; b=KKg+M1AJnjGbJrJNDHzv0hthgPsKiNEPMGAQOGgnLmCjXFC/s9kWUduc6JPJDQiMln AM7s65qrutU7Qp8HTGsNHzMkXLLE924LHwxdhfS4GUfVPS202WiB8Zp7DQrvxp7+jRZa ROoTgJI7NSqTDoI90w+TJVqXczxUuuYnhtTM9men/FqCbMsyCuoGIFERucxoI/UEfukx zuhLkdYemKRORh+yn2eKISYiOvhV8unOC3wiB1BCROKUCFRVe1VzO7JwoFfXrUXJtZpO R2O2uH9dP8UUJHTA3DgZO8UYHOkxCu9tYj57Hh5oQ3xZGhwivJuGOJNIp5F5qiVyICIg btag==; 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 4fb4d7f45d1cf-57a31b77c45si186490a12.1.2024.06.02.23.36.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 02 Jun 2024 23:36:09 -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 [IPv6:::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 4536a7XO007102 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 3 Jun 2024 08:36:08 +0200 Message-ID: <5b13746c9a80463be326d6c9f2855eca8e15bb67.camel@ilbers.de> Subject: Re: [PATCH] installer-add-rootfs: check if installer image is not empty before add mcdepends From: Uladzimir Bely To: Quirin Gylstorff , isar-users@googlegroups.com Date: Mon, 03 Jun 2024 09:36:07 +0300 In-Reply-To: <20240524084334.2114305-1-Quirin.Gylstorff@siemens.com> References: <20240524084334.2114305-1-Quirin.Gylstorff@siemens.com> Autocrypt: addr=ubely@ilbers.de; prefer-encrypt=mutual; keydata=mQENBGO2eUkBCACtT+T3OrPVSExBmqfgXT3lp9XcdxRzjYp26wezkgYjjBXaf36bxtaAf S471VoQtpar0RVeFfW7WDDdfX9ZclSj36zBQe+RVSJzoNoNQfjOXWuSHb5Z+cpAFtqBY4muxK4+ia IlLJd6CN3ejOsLHATtCeHHq8wi0z2T+KdLQO+wQRgo2hjj0Lp9pGTrKJry50HP/o7Vbdu14dOx2xq r8+wPc6SQbBIrcqaa4MqCQC00vQG7eXvo+k2MOw59FDdpMH0KR9mHgp3u/s4I+4YRBArukt9G9xz/ rsEFmxAIBC6N/a6Hzwg4puc91n7ABDsPg8Vp+X3MDraujN0dvR6OKVNtABEBAAG0IFVsYWR6aW1pc iBCZWx5IDx1YmVseUBpbGJlcnMuZGU+iQFOBBMBCAA4FiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAm O2eUkCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQAUQYBM/2FkprlAgAmuna8Hm9EyoEtTl DBGDg6Zm4ZLp5ffvZBE946h92jepDrteoxsJ7pSzJVC2HmDLa4iZUao7lLLbDsUj5x45/iLJcqBZK k3YnAxP2r6a+kI+1VVQY1pxdG1nlJAbdNzoojm/qmezNPSrqni61KVMQKsXBCWhIjSXDSM9CsBj21 a+9qaVqfxovJGTn9lgrZO+xzKQNMKZeOouJlscVuFj21P0ww3/YENiU/nMeTSuYypO76mDtAd08Jo nc3yuHa9MJGei5ixN3wT+IrGR2aL2hdw2M6NgH7sYbL2Zi4ugD6RXHJai1Bh2yvFSVqSQ+M6QOInT 4ud7wslm1XRB065dXtA== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.1 (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: GiL+po1sFYcs On Fri, 2024-05-24 at 10:43 +0200, 'Quirin Gylstorff' via isar-users wrote: > From: Quirin Gylstorff >=20 > This fixes the following error in case of a empty installer image: > ``` > NOTE: Resolving any missing task queue dependencies > NOTE: Resolving any missing task queue dependencies > NOTE: Resolving any missing task queue dependencies > ERROR: Nothing PROVIDES '' > ``` >=20 > This fixes issue #104 >=20 > Signed-off-by: Quirin Gylstorff > --- > =C2=A0meta-isar/classes/installer-add-rootfs.bbclass | 10 +++++++++- > =C2=A01 file changed, 9 insertions(+), 1 deletion(-) >=20 > diff --git a/meta-isar/classes/installer-add-rootfs.bbclass b/meta- > isar/classes/installer-add-rootfs.bbclass > index 656761e7..7767d96e 100644 > --- a/meta-isar/classes/installer-add-rootfs.bbclass > +++ b/meta-isar/classes/installer-add-rootfs.bbclass > @@ -35,9 +35,17 @@ def get_installer_destination(d, suffix): > =C2=A0=C2=A0=C2=A0=C2=A0 image_data =3D d.getVar('IMAGE_DATA_FILE') > =C2=A0=C2=A0=C2=A0=C2=A0 return f"/install/{image_data}.{suffix}" > =C2=A0 > +def get_mc_depends(d, task): > +=C2=A0=C2=A0=C2=A0 installer_target_image =3D d.getVar('INSTALLER_TARGET= _IMAGE') or > "" > +=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 return "" > +=C2=A0=C2=A0=C2=A0 installer_mc =3D d.getVar('INSTALLER_MC') or "" > +=C2=A0=C2=A0=C2=A0 installer_target_mc =3D d.getVar('INSTALLER_TARGET_MC= ') or "" > +=C2=A0=C2=A0=C2=A0 return > f"mc:{installer_mc}:{installer_target_mc}:{installer_target_image}:{t > ask}" > + > =C2=A0ROOTFS_ADDITIONAL_FILE_installer-target[source] =3D "${@ > get_installer_source(d, d.getVar('IMAGE_DATA_POSTFIX'))}" > =C2=A0ROOTFS_ADDITIONAL_FILE_installer-target[destination] =3D "${@ > get_installer_destination(d, d.getVar('IMAGE_DATA_POSTFIX'))}" > =C2=A0ROOTFS_ADDITIONAL_FILE_installer-target-bmap[source] =3D "${@ > get_installer_source(d, "wic.bmap")}" > =C2=A0ROOTFS_ADDITIONAL_FILE_installer-target-bmap[destination] =3D "${@ > get_installer_destination(d, "wic.bmap")}" > =C2=A0 > -do_rootfs_install[mcdepends] +=3D > "mc:${INSTALLER_MC}:${INSTALLER_TARGET_MC}:${INSTALLER_TARGET_IMAGE}: > do_image_wic" > +do_rootfs_install[mcdepends] +=3D "${@ get_mc_depends(d, > "do_image_wic")}" > --=20 > 2.43.0 >=20 Applied to next, thanks. --=20 Best regards, Uladzimir.