Bump grub artifacts and bundle them up (#1289)

packages/static/grub-artifacts/build.yaml

@@ -1,26 +1,27 @@
-
 image: {{.Values.image}}
 
-{{if eq .Values.distribution "opensuse"}}
+{{ if .Values.arch }}
-  {{ if .Values.arch }}
   {{ if eq .Values.arch "arm64" }}
 prelude:
 - zypper in -y grub2-arm64-efi grub2
-    {{ else if eq .Values.arch "arm" }}
-
   {{ else }}
 prelude:
 - zypper in -y grub2-i386-pc grub2-x86_64-efi grub2
   {{ end }}
-  {{end}}
 {{end}}
 
 steps:
 - mkdir /grub-artifacts
-{{if eq .Values.distribution "opensuse"}}
+- mkdir -p /grub-artifacts/EFI/BOOT
 - cp -rf /usr/share/grub2/* /grub-artifacts
-{{else}}
+{{ if .Values.arch }}
-- cp -rfL /usr/lib/grub/* /grub-artifacts
+  {{ if eq .Values.arch "arm64" }}
+- cp /usr/share/grub2/arm64-efi/grub.efi /grub-artifacts/EFI/BOOT/grub.efi
+- cp /usr/share/grub2/arm64-efi/grub.efi /grub-artifacts/EFI/BOOT/BOOTAA64.EFI
+  {{ else }}
+- cp /usr/share/grub2/x86_64-efi/grub.efi /grub-artifacts/EFI/BOOT/grub.efi
+- cp /usr/share/grub2/x86_64-efi/grub.efi /grub-artifacts/EFI/BOOT/BOOTX64.EFI
+  {{ end }}
 {{end}}
 
 package_dir: /grub-artifacts

packages/static/grub-artifacts/definition.yaml

@@ -1,5 +1,5 @@
 name: "grub-artifacts"
 category: "static"
-version: "0.2"
+version: "0.3"
 distribution: opensuse
 image: opensuse/tumbleweed

packages/static/grub-efi/build.yaml

@@ -1,48 +0,0 @@
-
-
-image: {{.Values.image}}
-
-{{if eq .Values.distribution "opensuse"}}
-{{ if .Values.arch }}
-{{ if eq .Values.arch "arm64" }}
-prelude:
-- zypper in -y grub2-arm64-efi grub2
-{{ else if eq .Values.arch "arm" }}
-
-{{ else }}
-prelude:
-- zypper in -y grub2-i386-pc grub2-x86_64-efi grub2
-{{ end }}
-{{end}}
-{{end}}
-
-package_dir: "/output"
-steps:
-- mkdir -p /output/EFI/BOOT
-- cp config/grub_live_efi.cfg /output/EFI/BOOT/grub.cfg
-  {{if .Values.distribution}}
-    {{if eq .Values.distribution "opensuse"}}
-      {{if .Values.arch }}
-        {{if eq .Values.arch "amd64"}}
-- cp /usr/share/grub2/x86_64-efi/grub.efi /output/EFI/BOOT/bootx64.efi
-        {{end}}
-       {{if eq .Values.arch "arm64"}}
-- cp /usr/share/grub2/arm64-efi/grub.efi /output/EFI/BOOT/bootaa64.efi
-       {{end}}
-     {{end}}
-    {{else if eq .Values.distribution "fedora"}}
-      {{if eq .Values.arch "amd64"}}
-- grub2-mkimage -O x86_64-efi -o /output/EFI/BOOT/bootx64.efi -c /output/EFI/BOOT/grub.cfg -p /grub2 -d /usr/lib/grub/x86_64-efi {{.Values.efi_modules}}
-    {{else if eq .Values.arch "arm64"}}
-- mkdir -p /output/EFI/fedora
-- cp -r /boot/efi/EFI/fedora/* /output/EFI/fedora/
-- cp -r /boot/efi/EFI/BOOT/* /output/EFI/BOOT/
-  {{end}}
-  {{else if eq .Values.distribution "ubuntu"}}
-    {{if eq .Values.arch "amd64"}}
-- grub-mkimage -O x86_64-efi -o /output/EFI/BOOT/bootx64.efi -c /output/EFI/BOOT/grub.cfg -p /grub2 -d /usr/lib/grub/x86_64-efi {{.Values.efi_modules}} linuxefi
-      {{else if eq .Values.arch "arm64"}}
-- grub-mkimage -O arm64-efi -o /output/EFI/BOOT/bootaa64.efi -c /output/EFI/BOOT/grub.cfg -p /grub2 -d /usr/lib/grub/arm64-efi {{.Values.efi_modules_arm64}}
-      {{end}}
-    {{end}}
-  {{end}}

packages/static/grub-efi/config/grub_live_efi.cfg

@@ -1,4 +0,0 @@
-search --no-floppy --label --set=root COS_RECOVERY
-set root=($root)
-set prefix=($root)/grub2
-configfile ($root)/etc/cos/grub.cfg

packages/static/grub-efi/definition.yaml

@@ -1,7 +0,0 @@
-name: "grub-efi"
-category: "static"
-version: "0.2"
-distribution: opensuse
-image: opensuse/tumbleweed
-efi_modules: ext2 iso9660 linux echo configfile search_label search_fs_file search search_fs_uuid ls normal gzio png fat gettext font minicmd gfxterm gfxmenu all_video xfs gcry_rijndael gcry_sha256 gcry_sha512 test true loadenv part_gpt part_msdos efi_gop efi_uga
-efi_modules_arm64: ext2 iso9660 linux echo configfile search_label search_fs_file search search_fs_uuid ls normal gzio png fat gettext font minicmd gfxterm gfxmenu all_video xfs gcry_rijndael gcry_sha256 gcry_sha512 test true loadenv part_gpt part_msdos efi_gop