From ab003ddfdc3d37e4b5b846f11604638db979f366d6b3961b2744de3ddfffa2b9 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 26 Sep 2023 09:00:31 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/patterns-aeon?expand=0&rev=11 --- patterns-aeon.spec | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/patterns-aeon.spec b/patterns-aeon.spec index b47dd8b..cb6e3f7 100644 --- a/patterns-aeon.spec +++ b/patterns-aeon.spec @@ -52,37 +52,37 @@ Requires: build-key Requires: distribution-release Requires: filesystem -#### Packages formerly provided by bootloader -#Requires: (grub2-snapper-plugin if snapper) -#Requires: grub2 -#%ifarch x86_64 -## XXX: not sure this really belongs here. More like a kernel -## rather than bootloader related thing? -#Requires: biosdevname -#%endif -#%ifnarch s390x ppc64 ppc64le -#%if 0%{?is_opensuse} -#Requires: (grub2-branding-openSUSE if branding-openSUSE) -#%else -#%if 0%{?sle_version} -#Requires: (grub2-branding-SLE if branding-SLE) -#%endif -#%endif -#%endif -#%ifarch x86_64 -#Requires: grub2-x86_64-efi -#%endif -#%ifarch aarch64 -#Requires: grub2-arm64-efi -#%endif -#%ifarch armv7l armv7hl -#Requires: grub2-arm-efi -#Requires: grub2-arm-uboot -#%endif -#%ifarch aarch64 x86_64 -#Requires: mokutil -#Requires: shim -#%endif +### Packages formerly provided by bootloader +Requires: (grub2-snapper-plugin if snapper) +Requires: grub2 +%ifarch x86_64 +# XXX: not sure this really belongs here. More like a kernel +# rather than bootloader related thing? +Requires: biosdevname +%endif +%ifnarch s390x ppc64 ppc64le +%if 0%{?is_opensuse} +Requires: (grub2-branding-openSUSE if branding-openSUSE) +%else +%if 0%{?sle_version} +Requires: (grub2-branding-SLE if branding-SLE) +%endif +%endif +%endif +%ifarch x86_64 +Requires: grub2-x86_64-efi +%endif +%ifarch aarch64 +Requires: grub2-arm64-efi +%endif +%ifarch armv7l armv7hl +Requires: grub2-arm-efi +Requires: grub2-arm-uboot +%endif +%ifarch aarch64 x86_64 +Requires: mokutil +Requires: shim +%endif ### Packages formerly provided by base/basesystem Requires: /usr/bin/hostname From 6cc47233bcd5e8128b5dcaa54b851f1aa715b1226933b6f1b885272d46b11f5b Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 26 Sep 2023 09:04:12 +0000 Subject: [PATCH 2/2] - Uncomment grub-less experiment that shouldn't have been committed OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/patterns-aeon?expand=0&rev=12 --- patterns-aeon.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/patterns-aeon.changes b/patterns-aeon.changes index 5a0b0be..dc63720 100644 --- a/patterns-aeon.changes +++ b/patterns-aeon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 26 09:03:51 UTC 2023 - Richard Brown + +- Uncomment grub-less experiment that shouldn't have been committed + ------------------------------------------------------------------- Thu Sep 21 13:33:04 UTC 2023 - Richard Brown