| Message ID | 20240213062937.26489-1-ubely@ilbers.de |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | meta-test: Fix wic imager deps for qemuamd64-bullseye | expand |
On Tue, 2024-02-13 at 09:29 +0300, Uladzimir Bely wrote: > 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 > Applied to next.
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"
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(+)