From 2f46a264a79934f0fda838ceb3f653f6e4b8d0f0 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Fri, 19 May 2023 22:55:18 +0200 Subject: [PATCH] Fix arches in several packages Signed-off-by: Itxaka --- packages/kernels/linux-tegra/definition.yaml | 1 - packages/livecd/grub2/build.yaml | 6 +++--- packages/livecd/grub2/collection.yaml | 2 -- packages/static/grub-efi/build.yaml | 6 +++--- packages/static/grub-efi/definition.yaml | 1 - packages/system/grub2-efi/definition.yaml | 1 - packages/system/shim/build.yaml | 2 +- packages/utils/operator-sdk/build.yaml | 2 +- 8 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/kernels/linux-tegra/definition.yaml b/packages/kernels/linux-tegra/definition.yaml index c382f6e..9cb9cc3 100644 --- a/packages/kernels/linux-tegra/definition.yaml +++ b/packages/kernels/linux-tegra/definition.yaml @@ -1,4 +1,3 @@ category: "kernels" name: "linux-tegra" version: "5.15" -arch: "x86_64" diff --git a/packages/livecd/grub2/build.yaml b/packages/livecd/grub2/build.yaml index 3c8549d..23c0c27 100644 --- a/packages/livecd/grub2/build.yaml +++ b/packages/livecd/grub2/build.yaml @@ -3,7 +3,7 @@ image: "opensuse/leap:15.3" prelude: - zypper in -y git {{if .Values.arch }} - {{if eq .Values.arch "x86_64"}} + {{if eq .Values.arch "amd64"}} - zypper in -y --no-recommends syslinux {{end}} {{end}} @@ -17,7 +17,7 @@ steps: {{if eq .Values.name "grub2"}} - mkdir -p /boot/x86_64/loader {{if .Values.arch }} - {{if eq .Values.arch "x86_64"}} + {{if eq .Values.arch "amd64"}} - mkdir -p /boot/x86_64/loader/grub2/fonts && cp -p /usr/share/grub2/unicode.pf2 /boot/x86_64/loader/grub2/fonts - mkdir -p /boot/grub2/x86_64-efi/ && cp -p /usr/share/grub2/x86_64-efi/* /boot/grub2/x86_64-efi/ - mkdir -p /boot/arm64/loader/grub2/fonts && cp -p /usr/share/grub2/unicode.pf2 /boot/arm64/loader/grub2/fonts @@ -33,7 +33,7 @@ steps: {{end}} {{if eq .Values.name "grub2-efi-image"}} {{if .Values.arch }} - {{if eq .Values.arch "x86_64"}} + {{if eq .Values.arch "amd64"}} - mkdir -p /EFI/BOOT # For removable drives the name of the efi needs to be bootx64.efi - cp /usr/share/efi/x86_64/shim.efi /EFI/BOOT/bootx64.efi diff --git a/packages/livecd/grub2/collection.yaml b/packages/livecd/grub2/collection.yaml index 48615d4..8028642 100644 --- a/packages/livecd/grub2/collection.yaml +++ b/packages/livecd/grub2/collection.yaml @@ -2,12 +2,10 @@ packages: - name: "grub2" category: "livecd" version: "0.0.8" - arch: x86_64 description: "Grub2 booloader for live systems" kairos_tag: "1.6.0" - name: "grub2-efi-image" category: "livecd" version: "0.0.8" - arch: x86_64 kairos_tag: "1.6.0" description: "Grub2 booloader EFI image for live systems" diff --git a/packages/static/grub-efi/build.yaml b/packages/static/grub-efi/build.yaml index 29ecf31..170396d 100644 --- a/packages/static/grub-efi/build.yaml +++ b/packages/static/grub-efi/build.yaml @@ -21,7 +21,7 @@ steps: {{if .Values.distribution}} {{if eq .Values.distribution "opensuse"}} {{if .Values.arch }} - {{if eq .Values.arch "x86_64"}} + {{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"}} @@ -29,7 +29,7 @@ steps: {{end}} {{end}} {{else if eq .Values.distribution "fedora"}} - {{if eq .Values.arch "x86_64"}} + {{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 @@ -37,7 +37,7 @@ steps: - cp -r /boot/efi/EFI/BOOT/* /output/EFI/BOOT/ {{end}} {{else if eq .Values.distribution "ubuntu"}} - {{if eq .Values.arch "x86_64"}} + {{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}} diff --git a/packages/static/grub-efi/definition.yaml b/packages/static/grub-efi/definition.yaml index 96e4084..02b0ca0 100644 --- a/packages/static/grub-efi/definition.yaml +++ b/packages/static/grub-efi/definition.yaml @@ -3,6 +3,5 @@ category: "static" version: "0.1" distribution: opensuse image: opensuse/leap:15.3 -arch: "x86_64" 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 \ No newline at end of file diff --git a/packages/system/grub2-efi/definition.yaml b/packages/system/grub2-efi/definition.yaml index b42ea6b..46294d4 100644 --- a/packages/system/grub2-efi/definition.yaml +++ b/packages/system/grub2-efi/definition.yaml @@ -3,4 +3,3 @@ category: "system" version: "2.06-150403" pversion: "2.06-150400.12.2" license: "GPL-3.0-or-later" -arch: "x86_64" diff --git a/packages/system/shim/build.yaml b/packages/system/shim/build.yaml index 6929b59..b5f169d 100644 --- a/packages/system/shim/build.yaml +++ b/packages/system/shim/build.yaml @@ -1,6 +1,6 @@ # This is only for amd64 {{ if .Values.arch }} - {{ if eq .Values.arch "" }} + {{ if eq .Values.arch "amd64" }} image: registry.opensuse.org/opensuse/leap:15.3 prelude: diff --git a/packages/utils/operator-sdk/build.yaml b/packages/utils/operator-sdk/build.yaml index eab25df..7afd48b 100644 --- a/packages/utils/operator-sdk/build.yaml +++ b/packages/utils/operator-sdk/build.yaml @@ -1,6 +1,6 @@ # This is only for amd64 {{ if .Values.arch }} - {{ if eq .Values.arch "" }} + {{ if eq .Values.arch "amd64" }} requires: - name: "toolchain-go" category: "development"