Sync from SUSE:SLFO:1.1 suse-module-tools revision cb8bfed2de8aba4cfd7f95ecc6a7fbf3

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
-              <param name="changesrevision">db5c2837fc8f80349f9d29880158814feebbe52a</param></service></servicedata>
+              <param name="changesrevision">2e7447774e720050841ea03eb9f8447191eeffde</param></service></servicedata>

suse-module-tools.changes

@@ -1,119 +1,3 @@
--------------------------------------------------------------------
-Thu May 15 09:06:40 UTC 2025 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.60:
-  * spec file: add missing util-linux requirement (bsc#1241465)
-  * kernel-scriptlets: enable tracing with KERNEL_PACKAGE_SCRIPT_TRACE=1
-
--------------------------------------------------------------------
-Thu Mar 13 19:43:57 UTC 2025 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.59:
-  * inkmp-script: fix "bad array subscript" error (bsc#1239550)
-
--------------------------------------------------------------------
-Thu Mar 13 10:05:12 UTC 2025 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.58:
-  * mkosi-initrd: build initrds directly to /boot
-  (gh#openSUSE/suse-module-tools#115)
-
--------------------------------------------------------------------
-Tue Jan 21 17:07:24 UTC 2025 - Martin Wilck <mwilck@suse.com>
-
-  * Fix "initrd: file not found" error in sd-boot setup
-    (gh#openSUSE/suse-module-tools#113, gh#openSUSE/sdbootutil#122)
-
--------------------------------------------------------------------
-Fri Jan 17 15:49:05 UTC 2025 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.56:
-  * rpm-script: create /boot/vmlinuz and /boot/initrd in kiwi environment
-    (bsc#1234275, bsc#1234759)
-
--------------------------------------------------------------------
-Mon Jan 13 15:50:23 UTC 2025 - Martin Wilck <mwilck@suse.com>
-
-  * regenerate-initrd-posttrans: return error if regenerating all
-    initrds fails (bsc#1234308)
-
--------------------------------------------------------------------
-Tue Dec 10 10:08:41 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-  * rpm-script: create dangling symlinks in kiwi environments
-    (bsc#1234275)
-
--------------------------------------------------------------------
-Mon Nov  4 16:21:34 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.53:
-  * udevrules: Add rule to set maximum readahead window
-    (jsc#PED-11154)
-
--------------------------------------------------------------------
-Mon Sep 30 13:54:11 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.52:
-  * rpm-script: create vmlinuz and initrd also in image build environments
-    (bsc#1231040, bsc#1230858)
-  * regenerate-initrd-posttrans: Fix SKIP_REGENERATE_INITRD_ALL
-    (bsc#1228929)
-
--------------------------------------------------------------------
-Thu Sep  5 10:01:04 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.51:
-  * Improve handling of /boot/vmlinuz and /boot/initrd symlinks
-    (boo#1207703)
-  * Add preliminary support for mkosi-initrd
-  * spec file: remove redundant dependency on sdbootutil
-
--------------------------------------------------------------------
-Fri Aug 30 13:04:46 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.50:
-  * Generate initrd for the default snapshot (boo#1224773)
-
--------------------------------------------------------------------
-Tue Aug 13 13:52:03 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.49:
-  * Require sdbootutil if already installed
-
--------------------------------------------------------------------
-Thu Jul 18 10:10:56 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.48:
-  * Fix 64k check in check_arm_pagesize() that would cause OBS
-    builds to fail
-
--------------------------------------------------------------------
-Wed Jul  3 21:49:31 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.47:
-  * rpm scriptlets: fix shellcheck warnings
-
-- Update to version 16.0.46:
-  * Support for bootloaders that follow the boot loader specification
-    in particular systemd-boot (bsc#1226122)
-  * Spec file: obsolete sdbootutil-rpm-scriptlets, the scriptlets
-    in suse-module-tools-scriptlets have modified to support the
-    systemd-boot / sdbootutil use case, too
-
--------------------------------------------------------------------
-Mon Jun 24 14:10:46 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.45:
-  * udevrules: activate CPUs on hotplug for s390, too (bsc#1224400)
-
--------------------------------------------------------------------
-Wed May 22 18:32:42 UTC 2024 - Martin Wilck <mwilck@suse.com>
-
-- Update to version 16.0.44:
-  * Include unblacklist in initramfs (bsc#1224320)
-  * regenerate-initrd-posttrans: run update-bootloader --refresh for XEN
-    (bsc#1223278)
-
 -------------------------------------------------------------------
 Wed Jan 31 12:02:16 UTC 2024 - Martin Wilck <mwilck@suse.com>
 

suse-module-tools.obsinfo

@@ -1,4 +1,4 @@
 name: suse-module-tools
-version: 16.0.60
+version: 16.0.43
-mtime: 1747255983
+mtime: 1705070353
-commit: db5c2837fc8f80349f9d29880158814feebbe52a
+commit: 2e7447774e720050841ea03eb9f8447191eeffde

suse-module-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package suse-module-tools
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,10 +15,11 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
+# Location for modprobe and depmod .conf files
+#
+# This assumes post-usr-merge (20210527) for Tumbleweed
 %global modprobe_dir /usr/lib/modprobe.d
 %global depmod_dir /usr/lib/depmod.d
-%global dracutlibdir %{_prefix}/lib/dracut
 %global with_kernel_sysctl 1
 # boot_sysctl may be dropped on TW when we can assume that nobody keeps
 # kernel packages around that store sysctl files under /boot
@@ -35,7 +36,7 @@
 %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
 
 Name:           suse-module-tools
-Version:        16.0.60
+Version:        16.0.43
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -49,9 +50,8 @@ Requires:       /usr/bin/gzip
 Requires:       /usr/bin/sed
 Requires:       coreutils
 Requires:       findutils
-Requires:       rpm
 Requires:       systemd-rpm-macros
-Requires:       util-linux
+Requires:       rpm
 Requires(post): /usr/bin/grep
 Requires(post): /usr/bin/sed
 Requires(post): coreutils
@@ -68,22 +68,18 @@ Recommends:     kmod
 Conflicts:      dracut < 49.1
 # TW: conflict with pre-usrmerge
 Conflicts:      filesystem < 16
-# Adds an ordering edge (from @mls)
-Suggests:       sdbootutil
-Requires:       (sdbootutil > 1+git20240829 if sdbootutil)
 
 %description
 This package contains helper scripts for KMP installation and
 uninstallation, as well as default configuration files for depmod and
 modprobe.
 
+
 %package scriptlets
 Summary:        Kernel rpm scriptlets
 Provides:       suse-kernel-rpm-scriptlets = 0
 Requires:       suse-module-tools = %{version}
-Provides:       sdbootutil-rpm-scriptlets = 2.0
 Provides:       suse-module-tools:/usr/lib/module-init-tools/kernel-scriptlets
-Obsoletes:      sdbootutil-rpm-scriptlets < 2.0
 
 %description scriptlets
 Scripts called by the SUSE kernel packages on installation
@@ -117,8 +113,6 @@ install -pm 644 "depmod-00-system.conf" "%{buildroot}%{depmod_dir}/00-system.con
 install -d -m 755 "%{buildroot}/usr/lib/module-init-tools"
 install -pm 755 -t "%{buildroot}/usr/lib/module-init-tools/" \
 	weak-modules2 driver-check.sh unblacklist lsinitrd-quick get_dracut_drivers
-install -pm 755 "dracut-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
-install -pm 755 "mkosi-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
 install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
 install -d -m 755 "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets"
 install -pm 755 "kernel-scriptlets/cert-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets"
@@ -132,8 +126,6 @@ for i in "pre" "preun" "post" "posttrans" "postun" ; do
     ln -s rpm-script %{buildroot}/usr/lib/module-init-tools/kernel-scriptlets/rpm-$i
 done
 
-install -d -m 755 %{buildroot}%{dracutlibdir}/dracut.conf.d
-install -pm 644 10-unblacklist.conf %{buildroot}%{dracutlibdir}/dracut.conf.d
 install -d -m 755 "%{buildroot}%{_prefix}/bin"
 
 # systemd service(s) to load kernel-specific sysctl settings
@@ -240,17 +232,12 @@ exit 0
 %{_unitdir}/systemd-sysctl.service.d
 %{_modulesloaddir}
 %{_udevrulesdir}
-%dir %{dracutlibdir}
-%{dracutlibdir}/dracut.conf.d
 %ifarch ppc64 ppc64le
 /usr/lib/systemd/system-generators
 %endif
-
 #
 %files scriptlets
 /usr/lib/module-init-tools/kernel-scriptlets
-/usr/lib/module-init-tools/dracut-posttrans
-/usr/lib/module-init-tools/mkosi-initrd-posttrans
 /usr/lib/module-init-tools/regenerate-initrd-posttrans
 
 %changelog