From c5f935da47dba2d76caddadbee396df1ae91e8654fa5a75279cc9037cdc2997a Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 15 Aug 2023 16:33:53 +0000 Subject: [PATCH] Accepting request 1104072 from home:mwilck:suse-module-tools - Update to version 16.0.33: * change wording in filesystem blacklist files (gh#openSUSE/suse-module-tools#71) * rpm-script: update bootloader after creating initramfs (boo#1213822) * usrmerge: Drop support for non-usrmerged (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1104072 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=161 --- _servicedata | 2 +- suse-module-tools-16.0.32.obscpio | 3 -- suse-module-tools-16.0.33.obscpio | 3 ++ suse-module-tools.changes | 10 ++++++ suse-module-tools.obsinfo | 6 ++-- suse-module-tools.spec | 51 ++----------------------------- 6 files changed, 20 insertions(+), 55 deletions(-) delete mode 100644 suse-module-tools-16.0.32.obscpio create mode 100644 suse-module-tools-16.0.33.obscpio diff --git a/_servicedata b/_servicedata index 7372960..b509fc3 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - eecfaab275ec7a166a6fefebadd884a0bec0b8e3 \ No newline at end of file + 68458f207a240eccc77fe87f2b947fcd6a01eaa1 \ No newline at end of file diff --git a/suse-module-tools-16.0.32.obscpio b/suse-module-tools-16.0.32.obscpio deleted file mode 100644 index 06d1d2d..0000000 --- a/suse-module-tools-16.0.32.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75aec3cf8740ab246fb0e6a81cb03e4f765ac3a398519b818d173f15e269996f -size 125451 diff --git a/suse-module-tools-16.0.33.obscpio b/suse-module-tools-16.0.33.obscpio new file mode 100644 index 0000000..bc21550 --- /dev/null +++ b/suse-module-tools-16.0.33.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7d47e09d03264d84d9124fbf102315f4454b0e26aa319477ae1cce1f067e3ad +size 122891 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index ab80ddb..43292e6 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 15 16:12:13 UTC 2023 - Martin Wilck + +- Update to version 16.0.33: + * change wording in filesystem blacklist files + (gh#openSUSE/suse-module-tools#71) + * rpm-script: update bootloader after creating initramfs + (boo#1213822) + * usrmerge: Drop support for non-usrmerged (boo#1206798) + ------------------------------------------------------------------- Mon Jul 3 19:37:53 UTC 2023 - Martin Wilck diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index d827ea7..d5bd5e6 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,4 +1,4 @@ name: suse-module-tools -version: 16.0.32 -mtime: 1688412950 -commit: eecfaab275ec7a166a6fefebadd884a0bec0b8e3 +version: 16.0.33 +mtime: 1692108558 +commit: 68458f207a240eccc77fe87f2b947fcd6a01eaa1 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 38f99d7..36b44c5 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -15,24 +15,15 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# missing in SLE15 (systemd-rpm-macros) -%{!?_modulesloaddir: %global _modulesloaddir /usr/lib/modules-load.d} - # Location for modprobe and depmod .conf files # # This assumes post-usr-merge (20210527) for Tumbleweed -%if 0%{?suse_version} >= 1550 %global modprobe_dir /usr/lib/modprobe.d %global depmod_dir /usr/lib/depmod.d %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 %bcond_without boot_sysctl -%else -%global modprobe_dir /lib/modprobe.d -%global depmod_dir /lib/depmod.d -%global with_boot_sysctl 1 -%endif %global sysctl_dropin %{_unitdir}/systemd-sysctl.service.d/50-kernel-uname_r.conf %global systemd_units %{?with_boot_sysctl:boot-sysctl.service} %{?with_kernel_sysctl:kernel-sysctl.service} @@ -45,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.32 +Version: 16.0.33 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -64,9 +55,6 @@ Requires: rpm Requires(post): /usr/bin/grep Requires(post): /usr/bin/sed Requires(post): coreutils -%if 0%{?suse_version} < 1550 -Provides: suse-kernel-rpm-scriptlets = 0 -%endif Provides: udev-extra-rules = 0.3.0 Obsoletes: udev-extra-rules < 0.3.0 Provides: system-tuning-common-SUSE = 0.3.0 @@ -79,9 +67,7 @@ Recommends: kmod # This release requires the dracut module 90nvdimm Conflicts: dracut < 49.1 # TW: conflict with pre-usrmerge -%if 0%{?suse_version} >= 1550 -Conflicts: filesystem < 15.5-40.2 -%endif +Conflicts: filesystem < 16 %description This package contains helper scripts for KMP installation and @@ -89,7 +75,6 @@ uninstallation, as well as default configuration files for depmod and modprobe. -%if 0%{?suse_version} >= 1550 %package scriptlets Summary: Kernel rpm scriptlets Provides: suse-kernel-rpm-scriptlets = 0 @@ -98,7 +83,6 @@ Provides: suse-module-tools:/usr/lib/module-init-tools/kernel-scriptlets %description scriptlets Scripts called by the SUSE kernel packages on installation -%endif %prep %setup -q @@ -109,20 +93,7 @@ sed -i 's/@FS_BLACKLIST@.*/%{fs_blacklist}/' README.md %install install -d -m 755 "%{buildroot}%{modprobe_dir}" install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d" -# keep /etc clean on Tumbleweed -%if 0%{?suse_version} < 1550 -cat > "%{buildroot}%{_sysconfdir}/modprobe.d/README" <= 1550 || 0%{?sle_version} >= 150100 for mod in %{fs_blacklist}; do echo "\ # DO NOT EDIT THIS FILE! # # The $mod file system is blacklisted by default because it isn't actively -# supported by SUSE, not well maintained, or may have security vulnerabilites. +# supported by SUSE. blacklist $mod # The filesystem can be un-blacklisted by running \"modprobe $mod\". # See README.md in the %{name} package for details. @@ -206,7 +168,6 @@ install $mod /usr/lib/module-init-tools/unblacklist $mod; /sbin/modprobe --ignor " \ >%{buildroot}%{modprobe_dir}/60-blacklist_fs-"$mod".conf done -%endif %pre %service_add_pre %{systemd_units} @@ -259,10 +220,6 @@ exit 0 %dir %{_sysconfdir}/modprobe.d %{depmod_dir} %dir %{_sysconfdir}/depmod.d -%if 0%{?suse_version} < 1550 -%{_sysconfdir}/modprobe.d/README -%{_rpmmacrodir}/macros.initrd -%endif %{_bindir}/kmp-install %dir /usr/lib/module-init-tools /usr/lib/module-init-tools/driver-check.sh @@ -278,9 +235,7 @@ exit 0 /usr/lib/systemd/system-generators %endif # -%if 0%{?suse_version} >= 1550 %files scriptlets -%endif /usr/lib/module-init-tools/kernel-scriptlets %changelog