From patchwork Tue Feb 13 06:29:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3342 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 13 Feb 2024 07:30:50 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f189.google.com (mail-lj1-f189.google.com [209.85.208.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 41D6UfnL009834 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 13 Feb 2024 07:30:42 +0100 Received: by mail-lj1-f189.google.com with SMTP id 38308e7fff4ca-2d0ed64f06fsf19817781fa.1 for ; Mon, 12 Feb 2024 22:30:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707805836; cv=pass; d=google.com; s=arc-20160816; b=WIzPNSi0AFx0LO5b7W/xzjllVKBUaVcLFJaTyXbyazi3z1RvGyZRjXYF8JaWoLwluH 6H26CWP1wnRG1808EWX0n7gO3/uia68j1/rpzBXVlMyQuaSp18YfFPeyqwI/h++ybm6w eSvHLiIfbjTYpjS9EVe6uwGgalgjL+0VR8oqVXEVoK2L53raTeAongQO/cOLSAoasl2c rTE70qxWQNRAywEGlSh38PZ0InPS+3yL3FK8GOUdo5L52qJvxqrOl6ojQ6jqTrwnL29J WOfhgVYqksgtHsgdoRDfTCW4TujBP4tBqyZM/3utth5wSr9FNrMeZcpsxf5gm8OFQeiv G+dQ== 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:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=1j/ThI6ZV+ku6FgOILu98qKYO+++nzUO0bhMeFyfubE=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=ijt4Aj5sL+EmyuPm3JTbaxWuAiBsUw2gBvyqpUyjcad7aqixRC1mIu96SecIwGvcj9 ALov4Qev+dYfmyAWh5gL0LKIvtBE1zedu1maMMKwPsuomiTGqZjR94nRgtDTPXd5yE0Z rFrZrYWOnFFa66AlENrGd5gzu+i0Sdk5qQdfOImD0grea2w5t64Og0ddmrQttEuxLZbj kruLnOokjZ1GJmvkRRWR3eNy4dBRlg599kcEyD4hgTBUlfDLZJ0QF75ufUZ4AO4PpIYi 6WZTocAmcNYHiYgEuoyWDKEldAiaesPp2cKR/78E/gdCaS1MVeRYJozSrFQ2XHEQLuJ1 egww== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1707805836; x=1708410636; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=1j/ThI6ZV+ku6FgOILu98qKYO+++nzUO0bhMeFyfubE=; b=GbTUsPzqmCx3duQkRyjYJG3raBSpI/qXQSaN3xK9mGt0ZxmMbmBbuhFvcwMY0ahr7r Tj5Bz67kwBDOOrioQcJmOrUU7YXI2JuXnBSiSib6mjTtHHh5xwgKewasvm4IHEzJtE/V Fn5PwtUZEKfTYHOcgcAdjoRq8JzWCrki16/5kfsh9uDkRopU/ghG7cBpJ9QS0QUbdkir 7ctq9DIqJ0kWwKVbOs2AzOWN9EyjYx7od2I0OTyJyzuCuXuIujkIPLSu+yxWAuZC7N2E HKOMcW4hGUpLvvCRXTCZO1AKvZ0rIBYh4SGy3RItnIOXLVW7rab78vRDTkRG+otZJRdj Cwkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707805836; x=1708410636; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=1j/ThI6ZV+ku6FgOILu98qKYO+++nzUO0bhMeFyfubE=; b=nyg5nerKt90E8qkbRgqiSit8lxXKQS2VWM1gdyfe73MC3/PtX2IyPINxc3rntye4G8 x9mt7HBSR/WqANVWvK2cgOEH4Lz9W+ZeSC3Sw7XCA4HPZ+XmFoGnKhLTqK24x49qeINI op6AqJ0FHGsZlmcOnFCt7V+Cx6EqBdTqN5BANrhBtEVqw2WhnzZYyrfFjahZszh1YWiN 9fG1mEuiQCm/Wg/iltDnussAGDn4ScWBoyPiRStZPw7TfwGfiKdQ12r1FBrelDWcNCv7 DGR+hQQzNJpef5ta3xAQktueZJpnUn2I67nLmIxEnUaLAHc+vQRqwZUFbCEIXbwNMmT5 uAug== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YwajFjGPKhkqxvnxu9FIp5ut2chG8wFDOHS3g+PcDTA0tSQEhLI hE371btcWCH9fmYbO7Q/OmW0t5Jg5EFw/qfP6qScsaZ5n2Uc/Ncz X-Google-Smtp-Source: AGHT+IETgMYGtR970hbAi1nkLWabLeoFDbZT93DM/dadeKu9ncK0Vzp3vYKXYWAyJDUGeUQ2ZV+1wg== X-Received: by 2002:a2e:8784:0:b0:2d0:acba:302c with SMTP id n4-20020a2e8784000000b002d0acba302cmr4593575lji.38.1707805834998; Mon, 12 Feb 2024 22:30:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:49e:b0:2d0:a1d8:58e5 with SMTP id s30-20020a05651c049e00b002d0a1d858e5ls504826ljc.2.-pod-prod-03-eu; Mon, 12 Feb 2024 22:30:33 -0800 (PST) X-Received: by 2002:a2e:9a9a:0:b0:2d0:cd50:2a7a with SMTP id p26-20020a2e9a9a000000b002d0cd502a7amr4683565lji.45.1707805832625; Mon, 12 Feb 2024 22:30:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707805832; cv=none; d=google.com; s=arc-20160816; b=ejoeNm2Zm2wLbV7cjbWckhPpZSiLHq9ALy6vkwV8CZNlQYdLn2C0aNNnNFW1NzXoof f0gnnjGlBsBzFvwwjK3m/yPapIamGi18AZnQFlUN3VfV7a8ubLm9fCqcOTHVK/sWRse1 rvRPlSiMQzJxTePZty1fPHmmHNZGpe2V08ZMaSUXs/0+mnwehzgXGi+SQSnZcvjLuk8O 6ckDA24FMMLNWFFMOaOsLieQkx4NDKNflVOU0CxPO++QtvFL+D2v+M8GNHN1IoKLl/V7 /3hea2zFzKqUlg3WYMsdc8fA1TauV4vmtnjjnCdQCfcbgbi3bD6w8iv56CgGDO55baQ0 FABQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=VYGDeODV9zCSGRD7+CZEaFE/jeVoHnME6QofQMzTKPY=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=DbHkeh66EqOSyY3M4SQZA32ur/QySaz4J6opVHpgSDU6JTu4OItHOwFw9AgYIecLyd 06Qgbi2iv6Jvf1zFsvY2P1Wgr4nNjRtrgbygUKshAKg7el0Io99u1luzCUNQL/O/nXu5 Temf0GYk+Xf2+AYu57KRUkqed33lDYY4FZJlGIN7p2Vlto80jSErQO6P0IcapmKgsOE/ WWqoUvqi1jyqEe5AgaZLTLmQnXGexRpXWI2FcM1L89zpz/ZiR75JERE4PvsL4yB72ynG Ad0rS8k+zaWJRvvq7khBhQDAUB3EV/5RrAW98/7MmmMavlHsfmmWtJ3G3Vrb7mbilTIF 44sw==; 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b15-20020a2ebc0f000000b002d0afeedd11si155297ljf.8.2024.02.12.22.30.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2024 22:30:32 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.localdomain (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 41D6UM0H009829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 13 Feb 2024 07:30:27 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] meta-test: Fix wic imager deps for qemuamd64-bullseye Date: Tue, 13 Feb 2024 09:29:37 +0300 Message-ID: <20240213062937.26489-1-ubely@ilbers.de> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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-Original-Sender: ubely@ilbers.de X-Original-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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Since we explicitly switch to systemd bootloader for testing qemuamd64-bullseye image and remove grub package dependency for target rootfs, we should do same for wic imager also. Without the patch, wic imager can fail in case of using base-apt, since it tries to install grub-efi-amd64-bin that is unavailable in the local base-apt repo. Signed-off-by: Uladzimir Bely --- meta-test/recipes-ci/images/isar-image-ci.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index 6d6c49c8..e5d51e6e 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -24,6 +24,8 @@ IMAGE_INSTALL:append:qemuamd64:debian-bullseye = " expand-on-first-boot" IMAGER_INSTALL:remove:qemuamd64:debian-bullseye ?= "${GRUB_BOOTLOADER_INSTALL}" IMAGER_INSTALL:append:qemuamd64:debian-bullseye ?= " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs" IMAGE_PREINSTALL:append:qemuamd64:debian-bullseye ?= " btrfs-progs" +# Explicitly remove from wic since it is set in qemuamd64.conf: +IMAGER_INSTALL:wic:remove:qemuamd64:debian-bullseye ?= "${GRUB_BOOTLOADER_INSTALL}" # qemuamd64-buster IMAGE_FSTYPES:qemuamd64:debian-buster ?= "wic ext4"