From patchwork Fri May 24 08:43:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3580 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 24 May 2024 10:43:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44O8hhp6018360 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 24 May 2024 10:43:44 +0200 Received: by mail-lj1-f187.google.com with SMTP id 38308e7fff4ca-2e95a1ed268sf4654761fa.0 for ; Fri, 24 May 2024 01:43:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716540218; cv=pass; d=google.com; s=arc-20160816; b=U7DLgWAPYxMKSRrC38jUV6DzIiBLiY9denzDykUVZX2yLPViYVpIAleOTfXxQCY2vZ YljEbGUJ68dtT6xWcbmLTuhqHJd2gTK7AKmnmjj8zHWtV+N2Islby3JakaBWSe06xO/s 7Cz/gmL3RbRtwXZUfZ9+4yO+PD1K9PP3/k7vuQ9yPwCGXkluC8pp5zdtUJ491EnhISZ1 P65UkLjMM3p5tlmDuHTZYtFZRhr3/+mWfOwRyBw+I365lWYPzFuSLovhWOY5SSHIFFIh b7YQ2WKp3CUQizBv6M2hc4dRhRsI15UM3u3CZgClKxgUDX8nFa9vNnM9GwYvuqp7k+Gg BC2g== 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:to:from:dkim-signature; bh=nqzuhu4Lpvs6h/gk7mQDkxzfr5dhZfH1lHBdQYoFT00=; fh=oXVDE5ISLdyOv9YeQWsr6bz1T44RXur7QZAc2sBLI1g=; b=0RBl/OaI+WtAG/yZldtZw+OMdA/LtXDNSnP8pHcTU4tRtuFqlRJBrEMlYoIB74Wcq3 6rX9g0l5OVxtnhArqnqyRpelxYwMn7eIu6qdCeaheDtGex7P2JybUXqHW5SNx6IgFJ6B D0e6eS8fIw3Eh2frVZo2VUyRk1vQGc3WcaLQHMEM7YEOpsGZIruDaenPjwLLqXDrGXTV 7qlUbaZkfGpOo8sNizmwkc9Cku+9nPY9ND1DKQvgH/IkAe7v0rlVpVpZmZTiAd/ajX7U sbafGmZxumE0Jj5+SD8VmBz16eyN/ulkY6KqrRhrgWN8iEI2bijKiRL7EG6domHvvRsw hkUw==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1716540218; x=1717145018; 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:to:from:from:to:cc:subject :date:message-id:reply-to; bh=nqzuhu4Lpvs6h/gk7mQDkxzfr5dhZfH1lHBdQYoFT00=; b=mdrrqSjJBAhFZ9KETmXcZPNLuS+ls5B5U/KUkb8bVYJPvhO96fwcUGl1mX8L+rmLTc vkhQ4fXRkKFvQNlWfa0HG6G5P5gkQgNnVcWuauWscQRJCn/1QsQm+6OgvAHO7PakpWRa hieCjoDT+cVNvncFVbt2dXc+qgb0DVooSW6nBxVa77hpLKV5V98xX/PWHofxyDooe+f2 FU3WkUiscwj8hxViFYAw1VE61iUvcO1L2RX3izP1NrrglaUNbC4ZgcgQb9A7vEgqmp3k ZM9kZ10ulnsBx7tUjwOr12phU8CLu+TYqYZ9Z8mGm/3wmbIud9joqTPtRZisTLcRZdqA iLkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716540218; x=1717145018; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nqzuhu4Lpvs6h/gk7mQDkxzfr5dhZfH1lHBdQYoFT00=; b=Sd947Rkd41Xtsls0Wmyp9S2QG21JShMzVOE7l7PmstM6rHmwZ0y+ykzUdOjoZzo00i Qg+Fvs7EPwkTFwrsVCrZIp1Cj77ZefLIzba/yyaf0daApgw4M3i8Xg/U6l2GtSwHPnbI rcgLqnos5z6Yf9l+rdzREUJKsgkHUI7w4/VQp/bkrO3nIAiOpQPt3M5/p52ewcuSgPFh s28fsLR6zDPS22ZxkcS9Cj7cVY/zFCzdh/zhm1I6t2lBXGJ9TX3HV0wOfmKcP5Yo5O0p IuI1A9PkyhLWKRG6WkIAYJPR0KlnKJJkazzKHzkuHuYrjhtxObeu17+wLecPTW7bpB01 6kcg== X-Forwarded-Encrypted: i=2; AJvYcCWDNqX0UPY8Q/mYgQbG5MeK/7j4qo0lrOpRa1bKig2RNuC9Puh/5s1AtVOzrEokgsfP/RL6Ca8PW5KMCq7dP/UNHEVURvk= X-Gm-Message-State: AOJu0Yz1YE74PMT412Ec9Eqff8xWBO3Ld0JbVOv7XB/mPWNV5LC0xITr ID/pkKPHwyDmIMp2VvMt1KnFCxMRFi1snzlILjCX4lkbFvsHgSEE X-Google-Smtp-Source: AGHT+IET+rzirEVbadTpudBBDdNbn2amY/cBfbKysBizauzMCQRk3KpL0Eege8/AVL86C54SpWLegw== X-Received: by 2002:a2e:9845:0:b0:2e5:46c:7233 with SMTP id 38308e7fff4ca-2e95b2566f9mr10257181fa.40.1716540218199; 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-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 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; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2024052408433577b6e88a3339bfa5a3 for ; Fri, 24 May 2024 10:43:35 +0200 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-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 X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com 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: 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")}"