Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2023-01-07 17:16:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Sat Jan 7 17:16:02 2023 rev:280 rq:1056307 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2023-01-04
17:51:23.905755719 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.1563/grub2.changes 2023-01-07
17:16:18.516936867 +0100
@@ -1,0 +2,6 @@
+Tue Jan 3 02:48:05 UTC 2023 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Move unsupported zfs modules into 'extras' packages
+ (bsc#1205554) (PED-2947)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.KXoXqI/_old 2023-01-07 17:16:21.444954335 +0100
+++ /var/tmp/diff_new_pack.KXoXqI/_new 2023-01-07 17:16:21.460954430 +0100
@@ -1,7 +1,7 @@
#
# spec file for package grub2
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -550,6 +550,18 @@
file systems, computer architectures and hardware devices. This subpackage
provides support for %{platform} systems.
+%package %{grubarch}-extras
+Summary: Unsupported modules for %{grubarch}
+Group: System/Boot
+BuildArch: noarch
+Requires: %{name}-%{grubarch} = %{version}
+Provides: %{name}-%{grubarch}:%{_datadir}/%{name}/%{grubarch}/zfs.mod
+Provides:
%{name}-%{grubarch}:%{_datadir}/%{name}/%{grubarch}/zfscrypt.mod
+Provides: %{name}-%{grubarch}:%{_datadir}/%{name}/%{grubarch}/zfsinfo.mod
+
+%description %{grubarch}-extras
+Unsupported modules for %{name}-%{grubarch}
+
%package %{grubarch}-debug
Summary: Debug symbols for %{grubarch}
Group: System/Boot
@@ -594,6 +606,19 @@
file systems, computer architectures and hardware devices. This subpackage
provides support for EFI systems.
+%package %{grubefiarch}-extras
+
+Summary: Unsupported modules for %{grubefiarch}
+Group: System/Boot
+BuildArch: noarch
+Requires: %{name}-%{grubefiarch} = %{version}
+Provides:
%{name}-%{grubefiarch}:%{_datadir}/%{name}/%{grubefiarch}/zfs.mod
+Provides:
%{name}-%{grubefiarch}:%{_datadir}/%{name}/%{grubefiarch}/zfscrypt.mod
+Provides:
%{name}-%{grubefiarch}:%{_datadir}/%{name}/%{grubefiarch}/zfsinfo.mod
+
+%description %{grubefiarch}-extras
+Unsupported modules for %{name}-%{grubefiarch}
+
%package %{grubefiarch}-debug
Summary: Debug symbols for %{grubefiarch}
Group: System/Boot
@@ -626,6 +651,18 @@
file systems, computer architectures and hardware devices. This subpackage
provides support for XEN systems.
+%package %{grubxenarch}-extras
+Summary: Unsupported modules for %{grubxenarch}
+Group: System/Boot
+BuildArch: noarch
+Requires: %{name}-%{grubxenarch} = %{version}
+Provides:
%{name}-%{grubxenarch}:%{_datadir}/%{name}/%{grubxenarch}/zfs.mod
+Provides:
%{name}-%{grubxenarch}:%{_datadir}/%{name}/%{grubxenarch}/zfscrypt.mod
+Provides:
%{name}-%{grubxenarch}:%{_datadir}/%{name}/%{grubxenarch}/zfsinfo.mod
+
+%description %{grubxenarch}-extras
+Unsupported modules for %{name}-%{grubxenarch}
+
%endif
%package snapper-plugin
@@ -1102,6 +1139,25 @@
%else
%endif
+# bsc#1205554 move the zfs modules into extras packages
+# 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
+grep -v -E ${EXTRA_PATTERN} %{grubxenarch}-all.lst > %{grubxenarch}.lst
+grep -E ${EXTRA_PATTERN} %{grubxenarch}-all.lst > %{grubxenarch}-extras.lst
+%endif
+
+%ifarch %{efi}
+find %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/ -name '*.mod' | sed
's,%{buildroot},,' > %{grubefiarch}-mod-all.lst
+grep -v -E ${EXTRA_PATTERN} %{grubefiarch}-mod-all.lst > %{grubefiarch}-mod.lst
+grep -E ${EXTRA_PATTERN} %{grubefiarch}-mod-all.lst >
%{grubefiarch}-mod-extras.lst
+%endif
+
+find %{buildroot}/%{_datadir}/%{name}/%{grubarch}/ -name '*.mod' | sed
's,%{buildroot},,' > %{grubarch}-mod-all.lst
+grep -v -E ${EXTRA_PATTERN} %{grubarch}-mod-all.lst > %{grubarch}-mod.lst
+grep -E ${EXTRA_PATTERN} %{grubarch}-mod-all.lst > %{grubarch}-mod-extras.lst
+
%find_lang %{name}
%fdupes %buildroot%{_bindir}
%fdupes %buildroot%{_libdir}
@@ -1373,7 +1429,7 @@
%if ! 0%{?only_efi:1}
-%files %{grubarch}
+%files %{grubarch} -f %{grubarch}-mod.lst
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}/%{grubarch}
%ifarch ppc ppc64 ppc64le
@@ -1388,7 +1444,6 @@
%endif
%{_datadir}/%{name}/%{grubarch}/*.img
%{_datadir}/%{name}/%{grubarch}/*.lst
-%{_datadir}/%{name}/%{grubarch}/*.mod
%ifarch x86_64
%{_datadir}/%{name}/%{grubarch}/efiemu*.o
%endif
@@ -1398,6 +1453,10 @@
%{_libexecdir}/%{name}-instdev-fixup.pl
%endif
+%files %{grubarch}-extras -f %{grubarch}-mod-extras.lst
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}/%{grubarch}
+
%files %{grubarch}-debug
%defattr(-,root,root,-)
%{_datadir}/%{name}/%{grubarch}/gdb_grub
@@ -1408,7 +1467,7 @@
%ifarch %{efi}
-%files %{grubefiarch}
+%files %{grubefiarch} -f %{grubefiarch}-mod.lst
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}/%{grubefiarch}
%{_datadir}/%{name}/%{grubefiarch}/grub.efi
@@ -1417,7 +1476,6 @@
%endif
%{_datadir}/%{name}/%{grubefiarch}/*.img
%{_datadir}/%{name}/%{grubefiarch}/*.lst
-%{_datadir}/%{name}/%{grubefiarch}/*.mod
%{_datadir}/%{name}/%{grubefiarch}/kernel.exec
%{_datadir}/%{name}/%{grubefiarch}/modinfo.sh
%dir %{sysefibasedir}
@@ -1436,6 +1494,10 @@
%{sysefidir}/grub.der
%endif
+%files %{grubefiarch}-extras -f %{grubefiarch}-mod-extras.lst
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}/%{grubefiarch}
+
%files %{grubefiarch}-debug
%defattr(-,root,root,-)
%{_datadir}/%{name}/%{grubefiarch}/gdb_grub
@@ -1452,13 +1514,16 @@
%{_libdir}/snapper/plugins/grub
%ifarch %{ix86} x86_64
-%files %{grubxenarch}
+%files %{grubxenarch} -f %{grubxenarch}.lst
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}/%{grubxenarch}
-%{_datadir}/%{name}/%{grubxenarch}/*
# provide compatibility sym-link for VM definitions pointing to old location
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/%{grubxenarch}
+
+%files %{grubxenarch}-extras -f %{grubxenarch}-extras.lst
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}/%{grubxenarch}
%endif
%if 0%{?has_systemd:1}
