From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7334970209359364096 X-Received: by 2002:a2e:be28:0:b0:2d1:69:c9df with SMTP id z40-20020a2ebe28000000b002d10069c9dfmr2649425ljq.44.1707805835092; Mon, 12 Feb 2024 22:30:35 -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-Google-Smtp-Source: AGHT+IGMpQEUe9i3ktCWEnUKiYsb0fE2IyFtP6v9Cv5+FN8XF9zWzBTKWpjmJxa3DAssNi20x6YN 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit 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: P/d1FSDNJo5X 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" -- 2.43.0