From a8635d3a3be91f359ab7f271d4e7cc181d720374 Mon Sep 17 00:00:00 2001 From: Zhangfei Gao Date: Fri, 13 Oct 2017 13:13:50 +0800 Subject: [PATCH] Fix grub2 dependency on arm64 Unable to locate package reported when DIB_RELEASE=jessie disk-image-create debian ironic-agent \ grub2 devuser -a arm64 -o deploy-jessie E: Unable to locate package grub-pc-bin E: Unable to locate package shim-signed E: Unable to locate package grub-efi-amd64-signed Fix the issue via adding arch dependency and arm64 packages Change-Id: I40650a887b575a9c2b00a8c5036c35354d548673 Signed-off-by: Zhangfei Gao --- diskimage_builder/elements/grub2/package-installs.yaml | 7 +++++++ diskimage_builder/elements/grub2/pkg-map | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/diskimage_builder/elements/grub2/package-installs.yaml b/diskimage_builder/elements/grub2/package-installs.yaml index 283e4dc32..f8653a85b 100644 --- a/diskimage_builder/elements/grub2/package-installs.yaml +++ b/diskimage_builder/elements/grub2/package-installs.yaml @@ -1,3 +1,10 @@ signed_grub_efi: + arch: amd64 signed_shim_efi: + arch: amd64 grub_bios: + arch: amd64 +signed_grub_efi_arm64: + arch: arm64 +grub_bios_arm64: + arch: arm64 diff --git a/diskimage_builder/elements/grub2/pkg-map b/diskimage_builder/elements/grub2/pkg-map index 7a462fdeb..c3fcb90c3 100644 --- a/diskimage_builder/elements/grub2/pkg-map +++ b/diskimage_builder/elements/grub2/pkg-map @@ -3,7 +3,9 @@ "debian":{ "signed_grub_efi": "grub-efi-amd64-signed", "signed_shim_efi": "shim-signed", - "grub_bios": "grub-pc-bin" + "grub_bios": "grub-pc-bin", + "signed_grub_efi_arm64": "grub-efi-arm64", + "grub_bios_arm64": "grub-efi-arm64-bin" }, "redhat":{ "signed_grub_efi": "efibootmgr grub2-efi-modules grub2-efi",