Accepting request 1222848 from Base:System

- Fix previous change as the variable has to be set earlier 
  * 0001-10_linux-Do-not-enable-BLSCFG-on-s390-emu.patch

- Do not enable blscfg on s390-emu 
  * 0001-10_linux-Do-not-enable-BLSCFG-on-s390-emu.patch

- Fix xen package contains debug_info files with the .module suffix by moving
  them to a separate xen-debug subpackage (bsc#1232573)

OBS-URL: https://build.opensuse.org/request/show/1222848
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=340

0001-10_linux-Do-not-enable-BLSCFG-on-s390-emu.patch

@@ -0,0 +1,42 @@
+From f8f7e36b75905254d9ee613bc7eaf7104189df02 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Fri, 8 Nov 2024 13:01:07 +0800
+Subject: [PATCH] 10_linux: Do not enable BLSCFG on s390-emu
+
+GRUB_ENABLE_BLSCFG may be enabled by some image builders for some reason
+without knowing it is not ready for a given platform. Here we force it
+to be disabled on s390-emu as it is not ready and has reported issues.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+---
+ util/grub.d/10_linux.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index f5c80798e..5163b492b 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -108,6 +108,12 @@ cat <<EOF
+ EOF
+ }
+ 
++machine=`uname -m`
++# Workaround KIWI sets GRUB_ENABLE_BLSCFG=true in s390-emu
++case "x$machine" in
++    xs390 | xs390x) GRUB_ENABLE_BLSCFG=false ;;
++esac
++
+ if [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then
+   if [ x$dirname = x/ ]; then
+     if [ -z "${prepare_root_cache}" ]; then
+@@ -247,7 +253,6 @@ EOF
+ EOF
+ }
+ 
+-machine=`uname -m`
+ case "x$machine" in
+     xi?86 | xx86_64) klist="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*" ;;
+     xaarch64) klist="/boot/Image-* /Image-* /boot/kernel-*" ;;
+-- 
+2.47.0
+

grub2.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Nov  8 14:42:12 UTC 2024 - Michael Chang <mchang@suse.com>
+
+- Fix previous change as the variable has to be set earlier 
+  * 0001-10_linux-Do-not-enable-BLSCFG-on-s390-emu.patch
+
+-------------------------------------------------------------------
+Fri Nov  8 05:21:47 UTC 2024 - Michael Chang <mchang@suse.com>
+
+- Do not enable blscfg on s390-emu 
+  * 0001-10_linux-Do-not-enable-BLSCFG-on-s390-emu.patch
+
+-------------------------------------------------------------------
+Wed Nov  6 07:45:21 UTC 2024 - Michael Chang <mchang@suse.com>
+
+- Fix xen package contains debug_info files with the .module suffix by moving
+  them to a separate xen-debug subpackage (bsc#1232573)
+
 -------------------------------------------------------------------
 Fri Nov  1 08:46:36 UTC 2024 - Michael Chang <mchang@suse.com>
 

grub2.spec

@@ -420,6 +420,7 @@ Patch233:       0001-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch
 Patch234:       0001-cli_lock-Add-build-option-to-block-command-line-inte.patch
 Patch235:       0002-Requiring-authentication-after-tpm-unlock-for-CLI-ac.patch
 Patch236:       0001-kern-main-Fix-cmdpath-in-root-directory.patch
+Patch237:       0001-10_linux-Do-not-enable-BLSCFG-on-s390-emu.patch
 
 %if 0%{?suse_version} > 1600
 # Always requires a default cpu-platform package
@@ -639,6 +640,18 @@ Provides:       %{name}-%{grubxenarch}:%{_datadir}/%{name}/%{grubxenarch}/zfsinf
 %description %{grubxenarch}-extras
 Unsupported modules for %{name}-%{grubxenarch}
 
+%package %{grubxenarch}-debug
+Summary:        Debug symbols for %{grubxenarch}
+Group:          System/Boot
+BuildArch:      noarch
+Requires:       %{name}-%{grubxenarch} = %{version}
+
+%description %{grubxenarch}-debug
+Debug symbols for %{name}-%{grubxenarch}
+
+Information on how to debug grub can be found online:
+https://www.cnblogs.com/coryxie/archive/2013/03/12/2956807.html
+
 %endif
 
 %package snapper-plugin
@@ -1221,9 +1234,9 @@ perl -ni -e '
 # EXTRA_PATTERN='pattern1|pattern2|pattern3|...'
 EXTRA_PATTERN="zfs"
 %ifarch %{ix86} x86_64
-find %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/ -type f | sed 's,%{buildroot},,' > %{grubxenarch}-all.lst
+find %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/ -name '*.mod' | sed 's,%{buildroot},,' > %{grubxenarch}-mod-all.lst
-grep -v -E ${EXTRA_PATTERN} %{grubxenarch}-all.lst > %{grubxenarch}.lst
+grep -v -E ${EXTRA_PATTERN} %{grubxenarch}-mod-all.lst > %{grubxenarch}-mod.lst
-grep -E ${EXTRA_PATTERN} %{grubxenarch}-all.lst > %{grubxenarch}-extras.lst
+grep -E ${EXTRA_PATTERN} %{grubxenarch}-mod-all.lst > %{grubxenarch}-mod-extras.lst
 %endif
 
 %ifarch %{efi}
@@ -1536,16 +1549,27 @@ grep -E ${EXTRA_PATTERN} %{grubarch}-mod-all.lst > %{grubarch}-mod-extras.lst
 %{_libdir}/snapper/plugins/grub
 
 %ifarch %{ix86} x86_64
-%files %{grubxenarch} -f %{grubxenarch}.lst
+%files %{grubxenarch} -f %{grubxenarch}-mod.lst
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/%{grubxenarch}
 # provide compatibility sym-link for VM definitions pointing to old location
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/%{grubxenarch}
+%{_datadir}/%{name}/%{grubxenarch}/grub.xen
+%{_datadir}/%{name}/%{grubxenarch}/*.img
+%{_datadir}/%{name}/%{grubxenarch}/*.lst
+%{_datadir}/%{name}/%{grubxenarch}/kernel.exec
+%{_datadir}/%{name}/%{grubxenarch}/modinfo.sh
 
-%files %{grubxenarch}-extras -f %{grubxenarch}-extras.lst
+%files %{grubxenarch}-extras -f %{grubxenarch}-mod-extras.lst
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/%{grubxenarch}
+
+%files %{grubxenarch}-debug
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/%{grubxenarch}/gdb_grub
+%{_datadir}/%{name}/%{grubxenarch}/gdb_helper.py
+%{_datadir}/%{name}/%{grubxenarch}/*.module
 %endif
 
 %if 0%{?has_systemd:1}