From 2ff65d512e33b3206c9429963f8f8515c456a988 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Tue, 25 May 2021 23:32:16 -0500 Subject: [PATCH] Do not uninstall non-installed packages The bootloader element uses the grub-efi-$arch package to remove already installed packages (for redhat). The uninstall of a non-installed package fails with a non-zero exit code on gentoo. The gentoo base tarball does not include a bootloader and the grub-efi-$arch package is only used for uninstalls, so zero out the variable to allow bootable images to be generated. Change-Id: If8572abd6e19a02f2f63b33d4f83a7054774d7e6 Signed-off-by: Matthew Thode --- diskimage_builder/elements/bootloader/pkg-map | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diskimage_builder/elements/bootloader/pkg-map b/diskimage_builder/elements/bootloader/pkg-map index 2df593f4..2c3a6cef 100644 --- a/diskimage_builder/elements/bootloader/pkg-map +++ b/diskimage_builder/elements/bootloader/pkg-map @@ -5,9 +5,9 @@ "extlinux": "syslinux", "grub-pc": "grub", "grub-efi": "grub", - "grub-efi-amd64": "grub", - "grub-efi-arm64": "grub", - "grub-efi-aarch64": "grub" + "grub-efi-amd64": "", + "grub-efi-arm64": "", + "grub-efi-aarch64": "" }, "suse": { "dkms_package": "",