public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Uladzimir Bely <ubely@ilbers.de>
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	[thread overview]
Message-ID: <20240213062937.26489-1-ubely@ilbers.de> (raw)

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 <ubely@ilbers.de>
---
 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


             reply	other threads:[~2024-02-13  6:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-13  6:29 Uladzimir Bely [this message]
2024-02-16  6:18 ` Uladzimir Bely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240213062937.26489-1-ubely@ilbers.de \
    --to=ubely@ilbers.de \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox