From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7372484099040083968 X-Received: by 2002:a05:600c:5813:b0:420:309a:fe63 with SMTP id 5b1f17b1804b1-42108a79ceamr11919305e9.22.1716540218351; Fri, 24 May 2024 01:43:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c09:b0:416:7e7e:98bd with SMTP id 5b1f17b1804b1-421093df67als2285875e9.1.-pod-prod-02-eu; Fri, 24 May 2024 01:43:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGc8Ace51Fff+znOvHzVqeDae7gx7bO2m0fwJEKGu6TYtjjAf7oros6I953gQA2SRl150Ii X-Received: by 2002:a05:600c:55da:b0:420:2961:4898 with SMTP id 5b1f17b1804b1-42108a79bf8mr9808625e9.20.1716540216058; Fri, 24 May 2024 01:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716540216; cv=none; d=google.com; s=arc-20160816; b=gSgcJDwyHT2+uoveMnPI/+0v6Vnqe06+vsirN0Q7Can8bZx/YSihSrEifk497BkERU LHMq02sRylz7vaNqjPqdhN8+04KEQFN/+JzbfhQqRv5Iz+DXdRapEH2QllaDsSfgLTLC EPl0PBpjelFNEx5tMGyBwkBL59Jwb+vJMTKAzEsbyR4mTz24f2fCIPwA9E1l0cxM3w7Z 0vHtAlq6L7f8KURxohgd/MBMlrFpiWqUstLE2J5w+AkRj+OmCr7UKFmKXmlHJr30/4Lw J1+c7TGUnAW9b1HMDvieKPXWVCTiSBTi6o5f9tCQsozIWmmgvOgvc3BW/Xvzy61i93+w KrFg== 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:to:from:dkim-signature; bh=1StR+Lg+sbc5CsEa70ZhWlyGdfVkf+9tg9x3hv2kTAc=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=pqI6lObJtS0j0HKhaVHyMhi4aD5APQ7PVLK7VjVFxysU3ydutJ3b5mOiLwlA8WeTkw 5KgsOrzv94/6sAbWol2oBggMKdMexCTqQ0OL6gaLDOv49T5iaINPWKRfBfv902mzP9un +6lVvjVFT96GzkfknlTPSEwdfOuom93eAZSbhU5tL1srjVqpJj/H29DPJGCSbRr+2fEw 4KZ0OBmpyDj6Zkgq336ecLSjUy6qx1vUZjtjv+LxJBCG6AyPuz5MZS7PR7Kl4E0xC4SS 6ROxvAalqLMIqWpag/mvLebhDVYYtTjPPb4UCgBYQLM4YLZJQ9ai59aghKkGmM32dOlT vdMw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bY61adG4; spf=pass (google.com: domain of fm-51332-2024052408433577b6e88a3339bfa5a3-fvbdst@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-51332-2024052408433577b6e88a3339bfa5a3-FVbdsT@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-4210895b0b0si211525e9.2.2024.05.24.01.43.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2024 01:43:36 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-51332-2024052408433577b6e88a3339bfa5a3-fvbdst@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bY61adG4; spf=pass (google.com: domain of fm-51332-2024052408433577b6e88a3339bfa5a3-fvbdst@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-51332-2024052408433577b6e88a3339bfa5a3-FVbdsT@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2024052408433577b6e88a3339bfa5a3 for ; Fri, 24 May 2024 10:43:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=1StR+Lg+sbc5CsEa70ZhWlyGdfVkf+9tg9x3hv2kTAc=; b=bY61adG4ca79RCdC9E5EqnLiH8vC6ZAEIV8ucdqKlucn8+w46UKi9ehXUo9REMQDVv1zRu YqkBpatnQz1Hi+tcZqt+q06ucH2cGF5mu01Ng9SBdGqSPmD7ZPvD863r3Munw+36dPl0687t QYo2c0mgNIb7hQnEVqrIi0A+HV2oo=; From: Quirin Gylstorff To: isar-users@googlegroups.com Subject: [PATCH] installer-add-rootfs: check if installer image is not empty before add mcdepends Date: Fri, 24 May 2024 10:43:15 +0200 Message-ID: <20240524084334.2114305-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: YXF4/dcyruX5 From: Quirin Gylstorff 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 '' ``` This fixes issue #104 Signed-off-by: Quirin Gylstorff --- meta-isar/classes/installer-add-rootfs.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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): image_data = d.getVar('IMAGE_DATA_FILE') return f"/install/{image_data}.{suffix}" +def get_mc_depends(d, task): + installer_target_image = d.getVar('INSTALLER_TARGET_IMAGE') or "" + if not installer_target_image: + return "" + installer_mc = d.getVar('INSTALLER_MC') or "" + installer_target_mc = d.getVar('INSTALLER_TARGET_MC') or "" + return f"mc:{installer_mc}:{installer_target_mc}:{installer_target_image}:{task}" + ROOTFS_ADDITIONAL_FILE_installer-target[source] = "${@ get_installer_source(d, d.getVar('IMAGE_DATA_POSTFIX'))}" ROOTFS_ADDITIONAL_FILE_installer-target[destination] = "${@ get_installer_destination(d, d.getVar('IMAGE_DATA_POSTFIX'))}" ROOTFS_ADDITIONAL_FILE_installer-target-bmap[source] = "${@ get_installer_source(d, "wic.bmap")}" ROOTFS_ADDITIONAL_FILE_installer-target-bmap[destination] = "${@ get_installer_destination(d, "wic.bmap")}" -do_rootfs_install[mcdepends] += "mc:${INSTALLER_MC}:${INSTALLER_TARGET_MC}:${INSTALLER_TARGET_IMAGE}:do_image_wic" +do_rootfs_install[mcdepends] += "${@ get_mc_depends(d, "do_image_wic")}" -- 2.43.0