From 1d7b95dbfc556f3ff7804cbc90c763661274fb27 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Tue, 7 Mar 2023 11:05:53 +0100
Subject: [PATCH] Bundle signed grub+shim in grub2-efi package (#136)

---
 packages/system/grub2-efi/build.yaml | 31 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/packages/system/grub2-efi/build.yaml b/packages/system/grub2-efi/build.yaml
index 24d114e..731a46a 100644
--- a/packages/system/grub2-efi/build.yaml
+++ b/packages/system/grub2-efi/build.yaml
@@ -1,13 +1,22 @@
-{{ if ne .Values.arch "arm" }}
-image: registry.opensuse.org/opensuse/leap:15.3
-prelude:
-- zypper in -y wget cpio
+image: registry.opensuse.org/opensuse/leap:15.4
 
+prelude:
+- zypper ref
+
+{{ if .Values.arch }}
+  {{ if eq .Values.arch "arm64" }}
 steps:
-- mkdir -p /data
-- wget  https://download.opensuse.org/repositories/isv:/Rancher:/Elemental/15.4/noarch/grub2-{{.Values.arch}}-efi-{{.Values.pversion}}.noarch.rpm -O /package.rpm
-- cd /data && rpm2cpio /package.rpm | cpio -idmv
-package_dir: "/data"
-excludes:
-- usr/lib64
-{{end}}
+- zypper in grub2-arm64-efi shim-susesigned
+includes:
+- usr/share/grub2/arm64-efi/
+- usr/share/efi/.*/*.efi
+- usr/share/efi/.*/*.der
+  {{else}}
+steps:
+- zypper in grub2-x86_64-efi shim-susesigned
+includes:
+- usr/share/grub2/x86_64-efi/
+- usr/share/efi/.*/*.efi
+- usr/share/efi/.*/*.der
+  {{end}}
+{{end}}
\ No newline at end of file