From b84ccfebe8a9beb965a5da7fe8736c96c67dfcf6d3f812a4a270de083ccff8b5 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 6 Dec 2021 09:09:17 +0000 Subject: [PATCH] Accepting request 935937 from home:mwilck:suse-module-tools - Update to version 16.0.16: * modprobe.d: split conf files (jsc#SLE-21626, boo#1193059) - Rather than shipping two large files with modprobe.d options (00-system.conf and 50-blacklist.conf), ship multiple small per-module files. This makes it easier for users to override distribution defaults. * blacklist isst_if_mbox_msr (bsc#1187196) * boot-sysctl: make sure file exists (fix for containers) * remove blacklist entry for snd_bt87x (bsc#1192974, bsc#51718) OBS-URL: https://build.opensuse.org/request/show/935937 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=133 --- _servicedata | 2 +- suse-module-tools-16.0.14+2.obscpio | 3 --- suse-module-tools-16.0.16.obscpio | 3 +++ suse-module-tools.changes | 13 +++++++++++++ suse-module-tools.obsinfo | 7 +++---- suse-module-tools.spec | 26 +++++++++++--------------- 6 files changed, 31 insertions(+), 23 deletions(-) delete mode 100644 suse-module-tools-16.0.14+2.obscpio create mode 100644 suse-module-tools-16.0.16.obscpio diff --git a/_servicedata b/_servicedata index 20496e1..c54f400 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 5ab3f0d35965bb8b20dbfa1db6f3bfde511abc54 \ No newline at end of file + 0d9e013bc845fd151bffaaec809e63a09b6eb4bb \ No newline at end of file diff --git a/suse-module-tools-16.0.14+2.obscpio b/suse-module-tools-16.0.14+2.obscpio deleted file mode 100644 index 122b847..0000000 --- a/suse-module-tools-16.0.14+2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3151e3beb84028c002e1e47e01b5730681731f0eeff109da6cd8232dce13bc35 -size 128011 diff --git a/suse-module-tools-16.0.16.obscpio b/suse-module-tools-16.0.16.obscpio new file mode 100644 index 0000000..f4d68b0 --- /dev/null +++ b/suse-module-tools-16.0.16.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f495a53dfa6c85ee5c4ac0969e01c9a94a1687b371a61eb9f3aabb959d353e54 +size 130059 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 6a132eb..393f890 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 6 09:04:55 UTC 2021 - Martin Wilck + +- Update to version 16.0.16: + * modprobe.d: split conf files (jsc#SLE-21626, boo#1193059) + - Rather than shipping two large files with modprobe.d options + (00-system.conf and 50-blacklist.conf), ship multiple small + per-module files. This makes it easier for users to override + distribution defaults. + * blacklist isst_if_mbox_msr (bsc#1187196) + * boot-sysctl: make sure file exists (fix for containers) + * remove blacklist entry for snd_bt87x (bsc#1192974, bsc#51718) + ------------------------------------------------------------------- Mon Nov 08 22:05:58 UTC 2021 - Martin Wilck diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index 6ac7110..313d616 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,5 +1,4 @@ name: suse-module-tools -version: 16.0.14+2 -mtime: 1636459368 -commit: 5ab3f0d35965bb8b20dbfa1db6f3bfde511abc54 - +version: 16.0.16 +mtime: 1638780604 +commit: 0d9e013bc845fd151bffaaec809e63a09b6eb4bb diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 6291f9e..3784808 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -45,7 +45,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.14+2 +Version: 16.0.16 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -106,23 +106,19 @@ SLE 11 and later. It is still used by the DKMS module packaging framework. sed -i 's/@FS_BLACKLIST@.*/%{fs_blacklist}/' README.md %install -# now assemble the parts for modprobe.conf -cp modprobe.conf/modprobe.conf.common 00-system.conf -%ifarch ppc64le -ln -f modprobe.conf/modprobe.conf.ppc64 modprobe.conf/modprobe.conf.$RPM_ARCH -%endif -if [ -f "modprobe.conf/modprobe.conf.$RPM_ARCH" ]; then - cat "modprobe.conf/modprobe.conf.$RPM_ARCH" >>00-system.conf -fi install -d -m 755 "%{buildroot}%{modprobe_dir}" install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d" -install -pm644 "10-unsupported-modules.conf" \ - "%{buildroot}%{modprobe_dir}/" -install -pm644 00-system.conf "%{buildroot}%{modprobe_dir}/" - -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 -install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{modprobe_dir}/50-blacklist.conf" +install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/common/*.conf +if [ -d modprobe.conf/%{_arch} ]; then + install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/%{_arch}/*.conf +fi +%ifarch i386 +install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/x86_64/*.conf %endif +%ifarch ppc64le +install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/ppc64/*.conf +%endif + install -d -m 755 "%{buildroot}/%{depmod_dir}" install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d" install -pm 644 "depmod-00-system.conf" "%{buildroot}%{depmod_dir}/00-system.conf"