From 429799edc5eb683e663f10a38f9b466f22df46ca2dd6674df8a1a7839c975e37 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 13 Apr 2021 15:42:57 +0000 Subject: [PATCH 1/4] Accepting request 885109 from home:mwilck:branches:Base:System MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use server-side source services (this makes the changelog so big) - Update to version 15.4.0: * Bump version to 15.4.0 * Enable f2fs (bsc#1184415) old: Base:System/suse-module-tools new: home:mwilck:branches:Base:System/suse-module-tools rev None Index: _service =================================================================== --- _service (revision 96) +++ _service (revision 26) @@ -1,22 +1,22 @@ - + https://github.com/openSUSE/suse-module-tools.git git enable suse-module-tools @PARENT_TAG@+@TAG_OFFSET@ - \+[01]$ - + ([^+]*)\+0 master *.rpmlintrc - - *.tar - xz - - - *.tar.xz + + *.obscpio */suse-module-tools.spec suse-module-tools.spec + + + *.tar + xz + Index: suse-module-tools.spec =================================================================== --- suse-module-tools.spec (revision 96) +++ suse-module-tools.spec (revision 26) @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2020 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 @@ -63,7 +63,6 @@ modprobe. These utilities are provided by kmod-compat or module-init-tools, whichever implementation you choose to install. - %package legacy Summary: Legacy "weak-modules" script for Code10 Group: System/Base Index: _service:extract_file:suse-module-tools.spec =================================================================== --- _service:extract_file:suse-module-tools.spec (added) +++ _service:extract_file:suse-module-tools.spec (revision 26) @@ -0,0 +1,283 @@ +# +# spec file for package suse-module-tools +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +# Define _rpmmacrodir if it's not defined yet +%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d} +%define modules_load_dir /usr/lib/modules-load.d + +# List of legacy file systems to be blacklisted by default +%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs + +%if 0%{?sle_version} >= 120200 && 0%{?sle_version} < 150000 +%global softdep_br_netfilter 1 +%endif + +Name: suse-module-tools +Version: 15.4.0 +Release: 0 +Summary: Configuration for module loading and SUSE-specific utilities for KMPs +License: GPL-2.0-or-later +Group: System/Base +URL: https://github.com/openSUSE/suse-module-tools +Source0: %{name}-%{version}.tar.xz +Source1: %{name}.rpmlintrc +Requires: /usr/bin/grep +Requires: /usr/bin/gzip +Requires: /usr/bin/sed +Requires: coreutils +Requires: findutils +Requires: rpm +Requires(post): /usr/bin/grep +Requires(post): /usr/bin/sed +Requires(post): coreutils +# Use weak dependencies for mkinitrd and kmod in order to +# keep Ring0 lean. In normal deployments, these packages +# will be available anyway. +Recommends: mkinitrd +%if 0%{?suse_version} >= 1315 +Recommends: kmod +%else +Recommends: modutils +%endif +# This release requires the dracut fix for bsc#1127891 +Conflicts: dracut < 44.2 + +%description +This package contains helper scripts for KMP installation and +uninstallation, as well as default configuration files for depmod and +modprobe. These utilities are provided by kmod-compat or +module-init-tools, whichever implementation you choose to install. + + +%package legacy +Summary: Legacy "weak-modules" script for Code10 +Group: System/Base +Requires: %{name} +Requires: binutils + +%description legacy +This package contains the legacy "weak-modules" script for kernel +module package (KMP) support. It was replaced by "weak-modules2" in +SLE 11 and later. + +%prep +%setup -q + +%build + +%install +# now assemble the parts for modprobe.conf +cp modprobe.conf/modprobe.conf.common 00-system.conf +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}%{_sysconfdir}/modprobe.d" +install -pm644 "10-unsupported-modules.conf" \ + "%{buildroot}%{_sysconfdir}/modprobe.d/" +install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/" + +%if 0%{?softdep_br_netfilter} +# softdep bridge->br_netfilter, SLE only +install -pm644 modprobe.conf/00-system-937216.conf %{buildroot}%{_sysconfdir}/modprobe.d +%endif +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf" +%endif +install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf" +install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d" +install -pm 644 "depmod-00-system.conf" \ + "%{buildroot}%{_sysconfdir}/depmod.d/00-system.conf" + +# "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc. +install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" +install -pm 755 weak-modules{,2} "%{buildroot}/usr/lib/module-init-tools/" +install -pm 755 driver-check.sh "%{buildroot}/usr/lib/module-init-tools/" + +%if 0%{?suse_version} < 1550 +# rpm macros and helper +# The RPM Macros have been moved to the package rpm-config-SUSE after CODE15, thus are no longer +# shipped here +install -d -m 755 "%{buildroot}%{_rpmmacrodir}" +install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" +%endif +install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/" + +install -d -m 755 "%{buildroot}%{_prefix}/bin" +install -pm 755 kmp-install "%{buildroot}%{_bindir}/" + +# systemd service to load /boot/sysctl.conf-`uname -r` +install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d" +install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.service.d" + +# Ensure that the sg driver is loaded early (bsc#1036463) +# Not needed in SLE11, where sg is loaded via udev rule. +install -d -m 755 "%{buildroot}%{modules_load_dir}" +install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}" +%ifarch ppc64le +install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators +install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators +%endif + +mkdir -p %{buildroot}%{_defaultlicensedir} + +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +for mod in %{fs_blacklist}; do + echo "\ +# The $mod file system is blacklisted by default because it isn't actively +# supported by SUSE, not well maintained, or may have security vulnerabilites. +# To enable autoloading the $mod file system module, comment out the +# \"blacklist $mod\" statement below. ENABLE AT YOUR OWN RISK. +# +# File system modules loaded at installation time of the %{name} package +# are not blacklisted. This is achieved by commenting out the blacklist +# line in the post-installation script. To prevent the post-installation +# script from modifying this file, delete the line containing \"THIS FILE MAY +# BE MODIFIED\" at the bottom. +blacklist $mod +# __THIS FILE MAY BE MODIFIED__" \ + >%{buildroot}%{_sysconfdir}/modprobe.d/60-blacklist_fs-"$mod".conf +done +%endif + +%post +%if 0%{?sle_version} >= 150000 +# Delete obsolete unsupported-modules file from SLE11 +rm -f %{_sysconfdir}/modprobe.d/unsupported-modules +%else +# Logic for releases below CODE 15 +%if 0%{?is_opensuse} == 1 +allowed=1 +%else +allowed=0 +%endif +test_allow_on_install() +{ + # configure handling of unsupported modules + # default is to allow them + allow=1 + # if the obsolete LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY variable is + # set to no, don't allow (this was used in SLES 9 and 10) + if test -e %{_sysconfdir}/sysconfig/hardware/config; then + . %{_sysconfdir}/sysconfig/hardware/config + if test "x$LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY" = "xno"; then + allow=0 + fi + # obsolete + rm %{_sysconfdir}/sysconfig/hardware/config + fi + # don't change the setting during upgrade + if test "$1" != 1; then + allow= + return + fi + # on SLES, the default is not to allow unsupported modules + if grep -qs "Enterprise Server" %{_sysconfdir}/os-release; then + allow=0 + else + return + fi + # unless the admin passed "oem-modules=1" to the kernel during install + if grep -qs '\' /proc/cmdline; then + allow=1 + return + fi + # or if the installer already loaded some unsupported modules + # (see TAINT_NO_SUPPORT in /etc/src/linux/include/linux/kernel.h) + tainted=$(cat /proc/sys/kernel/tainted 2>/dev/null || echo 0) + if test $((tainted & (1<<30))) != 0; then + allow=1 + return + fi +} +# upgrade from old locations +if test -e %{_sysconfdir}/modprobe.d/unsupported-modules; then + mv -f %{_sysconfdir}/modprobe.d/unsupported-modules \ + %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf +fi +test_allow_on_install "$@" +if test -n "$allow" -a "$allow" != "$allowed"; then + sed -ri 's/^( *allow_unsupported_modules *) [01]/\1 '"$allow"'/' \ + %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf +fi +%endif + +# upgrade from old locations +if test -e %{_sysconfdir}/modprobe.conf.local; then + mv -f %{_sysconfdir}/modprobe.conf.local \ + %{_sysconfdir}/modprobe.d/99-local.conf +fi + +# Avoid systems becoming unbootable by blacklisting filesystem +# modules. Modules loaded at installation time will not be +# blacklisted (the blacklist statement is commented out). +# config(noreplace) makes sure that this is not overwritten by rpm. +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +for mod in %{fs_blacklist}; do + conf=%{_sysconfdir}/modprobe.d/60-blacklist_fs-"$mod".conf + if [ -f "$conf" ] && \ + grep -q '^# __THIS FILE MAY BE MODIFIED__$' "$conf" && \ + sed '/^nodev/d;' /proc/filesystems | grep -q "\<$mod\>"; then + sed -i ' +/^# next line was commented out by postinstall script of %{name}$/d +/^blacklist '"$mod"'/{i\ +# next line was commented out by postinstall script of %{name} +s/^/# / +}' "$conf" + fi +done +%endif + +%files +%defattr(-,root,root) + +%if 0%{?sle_version:%{sle_version}}%{!?sle_version:150000} <= 120200 +%dir %{_defaultlicensedir} +%endif +%license LICENSE +%doc README.SUSE +%dir %{_sysconfdir}/modprobe.d +%config %{_sysconfdir}/modprobe.d/00-system.conf +%if 0%{?softdep_br_netfilter} +%config(noreplace) %{_sysconfdir}/modprobe.d/00-system-937216.conf +%endif +%config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +%config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/60-blacklist_fs-*.conf +%endif +%config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf +%dir %{_sysconfdir}/depmod.d +%config %{_sysconfdir}/depmod.d/00-system.conf +%if 0%{?suse_version} < 1550 +%{_rpmmacrodir}/macros.initrd +%endif +%{_bindir}/kmp-install +/usr/lib/module-init-tools +%exclude /usr/lib/module-init-tools/weak-modules +%{_unitdir}/systemd-sysctl.service.d +%dir %{modules_load_dir} +%{modules_load_dir}/sg.conf +%ifarch ppc64le +/usr/lib/systemd/system-generators +%endif + +%files legacy +%defattr(-,root,root) +/usr/lib/module-init-tools/weak-modules + +%changelog Index: _service:obs_scm:_servicedata =================================================================== --- _service:obs_scm:_servicedata (added) +++ _service:obs_scm:_servicedata (revision 26) @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/suse-module-tools.git + 37a04d84cbeaf0540e6771e8d8f7c8ec10c61df7 \ No newline at end of file Index: _service:obs_scm:suse-module-tools-15.4.0.obscpio =================================================================== Binary file _service:obs_scm:suse-module-tools-15.4.0.obscpio (revision 26) added Index: _service:obs_scm:suse-module-tools.changes =================================================================== --- _service:obs_scm:suse-module-tools.changes (added) +++ _service:obs_scm:suse-module-tools.changes (revision 26) @@ -0,0 +1,391 @@ +------------------------------------------------------------------- +Tue Apr 13 15:24:23 UTC 2021 - obs-service-tar-scm@invalid + +- Update to version 15.4.0: + * Bump version to 15.4.0 + * Enable f2fs (bsc#1184415) + +------------------------------------------------------------------- +Mon Nov 02 17:03:42 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.5: + * Skip coldplug for memory devices on ppc64le, using generator + (bsc#1174287, bsc#1172745) + +------------------------------------------------------------------- +Tue Aug 25 15:43:20 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.4: + * spec: rework dependencies + +------------------------------------------------------------------- +Mon Aug 03 21:05:03 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.4: + * rework dependencies to reduce system size for small OS + +------------------------------------------------------------------- +Fri Jun 5 15:28:50 UTC 2020 - Martin Wilck + +- Reverted back to tar_scm source service + (obs_scm doesn't work well for Ring0 packages) + +------------------------------------------------------------------- +Wed May 27 20:49:04 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.3: + * spec: remove SLE/openSUSE difference in allow_unsupported_modules + (jsc#SLE-12255) + * spec: use same fs_blacklist on SLE and openSUSE + (jsc#SLE-12255, jsc#SLE-3926) + * spec: use br_netfilter softdep only for SLE12 + (jsc#SLE-12255, bsc#1166531, boo#1158817, bsc#937216) + +------------------------------------------------------------------- +Fri Apr 17 15:32:54 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.2: + * modprobe.conf.common: eliminate circular uas/usb-storage dependency + (bsc#1168661) + +------------------------------------------------------------------- +Mon Jan 20 15:03:51 UTC 2020 - mwilck@suse.com + +- Update to version 15.2.10: + * ppc64le: fix dependency of papr_scm + (bsc#1142152, ltc#176292, FATE#327775). + +------------------------------------------------------------------- +Wed Jan 15 20:46:40 UTC 2020 - mwilck@suse.com + +- Update to version 15.2.9: + * 00-system.conf: move br_netfilter softdep to separate file + (boo#1158817) + +------------------------------------------------------------------- +Thu Jan 09 12:30:58 UTC 2020 - mwilck@suse.com + +- Update to version 15.2.8: + * Add modprobe.conf.s390x (bsc#1132798) + +------------------------------------------------------------------- +Thu Nov 07 20:34:15 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.7: + * spec file: avoid %{_libexecdir} + +------------------------------------------------------------------- +Thu Nov 07 19:48:05 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.6: + * modprobe.conf: add dependency of papr_scm on libnvdimm + (bsc#1142152, ltc#176292, FATE#327775). + +------------------------------------------------------------------- +Fri Aug 16 08:46:15 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.5: + * remove 'modhash' - moved to mokutil package (jsc#SLE-6094) + +------------------------------------------------------------------- +Mon Jul 15 11:58:07 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.4: + * sg.conf: avoid file conflict with system-tuning-common-SUSE + +------------------------------------------------------------------- +Mon Jul 01 20:18:55 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.3: + * softdep of bridge on br_netfilter (bsc#937216, bsc#1134819) + +------------------------------------------------------------------- +Tue Jun 18 13:08:07 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.2: + * kmp-install, driver-check.sh, weak-modules2: + Support for compressed kernel modules (bsc#1135854) + +------------------------------------------------------------------- +Fri Jun 14 14:52:19 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.1: +- Install sg.conf under /usr/lib/modules-load.d (bsc#1036463) + * sg.conf: avoid file conflict with systemd + +------------------------------------------------------------------- +Fri Jun 14 10:06:55 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.0: + * weak-modules2: emit "inconsistent" warning only if replacement fails + (bsc#1127155) + +------------------------------------------------------------------- +Fri May 17 06:18:33 UTC 2019 - Dominique Leuenberger + +- Only ship RPM macros up to suse_version 1500: after that, the + macros can be found in the rpm-config-SUSE package. + +------------------------------------------------------------------- +Fri May 10 09:18:57 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + +------------------------------------------------------------------- +Thu Mar 14 16:02:23 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.13: + * spec file: add conflicts for dracut < 44.2 (bsc#1127891) + +------------------------------------------------------------------- +Thu Mar 14 14:53:24 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.12 (git 1ab0b84): + * modprobe.conf.common: add csiostor->cxgb4 dependency + (bsc#1100989) + * Load fbcon together with virtio_gpu on s390 (bsc#1121996, + fate#327159) + +------------------------------------------------------------------- +Mon Feb 18 12:02:27 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.11 (git 54df192): + * spec file: use more gentle wording in blacklist files + * spec file: drop jffs2 and ubifs from blacklist + +------------------------------------------------------------------- +Fri Feb 08 10:44:56 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.10 (git b28b13d): +- implemented fs blacklisting logic (jsc#SLES-4085, fate#326832) + +------------------------------------------------------------------- +Thu Jan 31 23:07:10 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.0 (git 6b07b88): + * 50-blacklist.conf is not added in Leap before 15.1. + fix conditionals and bump version accordingly. + +------------------------------------------------------------------- +Wed Jan 30 23:04:26 UTC 2019 - mwilck@suse.com + +- Update to version 15.0.20 (git 1396df5): +- Fix driver-check.sh (boo#1123697, boo#1123704) +- add /etc/modprobe.d/50-blacklist.conf from sysconfig package + (boo#1107611) +- Remove hard dependency on mkinitrd (boo#1123721) +- Make sure code works also without kmod-compat +- Replace file dependency on /sbin/depmod by weak package dependency + +------------------------------------------------------------------- +Mon Dec 10 12:10:29 UTC 2018 - Martin Wilck + +- Move "weak-modules" script to -legacy subpackage to avoid + dependency on binutils (bsc#1116665) + +------------------------------------------------------------------- +Fri Dec 7 12:45:36 UTC 2018 - Adrian Schröter + +- Require mkinitrd (provided also by dracut) directly instead of + file requires. This is fixing image build failures + +------------------------------------------------------------------- +Wed Nov 07 14:53:52 UTC 2018 - mwilck@suse.com + +- Update to version 15.0.1 (git 5c63319): +- Use /etc/modules-load.d/sg.conf for sg driver autoloading + (bsc#1036463) + * added /etc/modules-load.d/sg.conf + +------------------------------------------------------------------- +Mon Nov 05 10:08:19 UTC 2018 - mwilck@suse.com + +- version 15.0 (git 6ce3011) +- modsign-verify: support for parsing PKCS#7 signatures + (bsc#1111300, bsc#1105495) +- Fix logic for unsupported modules (bsc#1111183) + * SLES15: allow unsupported modules only if kernel-default-extra + from SLE-WE module is installed + * Always allow unsupported modules on Leap 15 and Factory + * No change for SLE12 / Leap 42.x and below + * 10-unsupported-modules.conf: improved comments + * fix %config(noreplace) logic for 10-unsupported-modules.conf +- added udev rule 81-sg.rules to make sure the sg module is + always loaded (bsc#1036463) + +------------------------------------------------------------------- +Wed Jul 26 08:07:29 UTC 2017 - tchvatal@suse.com + +- Use path dependency that is not parsed by obs to ensure we + are not pulling systemd everywhere + +------------------------------------------------------------------- +Mon Jun 19 12:58:04 UTC 2017 - tchvatal@suse.com + +- Set url to github project and repack using obs service +- Cleanup a bit with spec-cleaner +- Grep os-release and not deprecated SuSE-release + +------------------------------------------------------------------- +Thu Sep 8 08:55:50 UTC 2016 - dmueller@suse.com + +- blacklist efifb on aarch64 (bsc#996080) + +------------------------------------------------------------------- +Fri May 27 13:14:36 UTC 2016 - mmarek@suse.cz + +- Run dos2unix on the modhash script. + +------------------------------------------------------------------- +Thu May 26 07:36:58 UTC 2016 - jlee@suse.com + +- Add modhash tool to calculate hash of signed module. + It strips X.509 or PKCS#7 signature before hash kernel module. + (fate#319460) + +------------------------------------------------------------------- +Wed May 25 13:23:35 UTC 2016 - mmarek@suse.cz + +- Remove -x bit from 50-kernel-uname_r.conf (bsc#981291). + +------------------------------------------------------------------- +Fri Apr 29 11:31:46 UTC 2016 - mmarek@suse.cz + +- Ignore failures when loading the kernel sysctl (bsc#977715). + +------------------------------------------------------------------- +Thu Apr 28 20:15:31 UTC 2016 - mmarek@suse.com + +- Add a systemd service to load /boot/sysctl.conf-`uname -r` + (bsc#977715). + +------------------------------------------------------------------- +Fri Apr 1 11:43:32 UTC 2016 - mmarek@suse.cz + +- Skip KMPs built from the kernel spec file directly (fate#319339) +- Bump version number to 12.4 + +------------------------------------------------------------------- +Tue Feb 23 10:43:39 UTC 2016 - lnussel@suse.de + +- add missing requirements on module-init-tools, findutils and gzip, + mkinitrd (bnc#965830) + +------------------------------------------------------------------- +Fri Jan 15 23:04:41 UTC 2016 - bpoirier@suse.com + +- Add module option ib_mthca.catas_reset_disable=1 on ppc64le (bsc#456389). + +------------------------------------------------------------------- +Tue Oct 13 08:35:32 UTC 2015 - mmarek@suse.cz + +- Revert change for fate#319339, as some 3rd party KMPs are built + with a modified template (bsc#949862). + +------------------------------------------------------------------- +Tue Sep 8 12:52:15 UTC 2015 - trenn@suse.de + +- Use /run instead of deprecated /var/run + This can have sever consequences if this package uses /var/run. It may + be installed before filesystem package generating the /run tmpfs and + predict it to generate the link /var/run -> /run. Later dracut convertfs + kicks in to generate it, but it has issues. bsc#922676 + +------------------------------------------------------------------- +Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz + +- Only handle KMPs that are built using the %kernel_module_package + macro (preparatory work for fate#319339). + +------------------------------------------------------------------- +Tue Jun 23 14:39:46 UTC 2015 - mmarek@suse.cz + +- Use absolute path to mkinitrd (bsc#935566) + +------------------------------------------------------------------- +Fri May 16 08:36:15 UTC 2014 - mmarek@suse.cz + +- Add kgraft/ to the depmod search list (fate#313296) + +------------------------------------------------------------------- +Mon May 5 17:15:37 UTC 2014 - tonyj@suse.com + +- Add support for ARM zImage to weak-modules2 + +------------------------------------------------------------------- +Tue Apr 15 14:32:55 UTC 2014 - mmarek@suse.cz + +- weak-modules2: Use lsinitrd to list the modules in an initrd, so + that initrds with early microcode work (bnc#873209, bnc#873113). + +------------------------------------------------------------------- +Fri Apr 4 14:32:48 UTC 2014 - mmarek@suse.cz + +- weak-modules2: Run mkinitrd in posttrans if $INITRD_IN_POSTTRANS + is set (fate#313506) + +------------------------------------------------------------------- +Fri Apr 4 13:34:09 UTC 2014 - mmarek@suse.cz + +- regenerate-initrd-posttrans: Run mkinitrd_setup + +------------------------------------------------------------------- +Fri Apr 4 12:13:18 UTC 2014 - mmarek@suse.cz + +- Add macros for regenerating the initrd in %posttrans + (fate#313506). + +------------------------------------------------------------------- +Mon Mar 31 09:11:16 UTC 2014 - mmarek@suse.cz + +- Use softdep to order {u,o,e}hci-hcd drivers. +- Drop ia64 modprobe config. + +------------------------------------------------------------------- +Fri Mar 28 14:25:25 UTC 2014 - mmarek@suse.cz + +- Add kmp-install tool for easier installation of SolidDriver KMPs + (fate#314581). + +------------------------------------------------------------------- +Tue Mar 11 12:57:36 UTC 2014 - mmarek@suse.cz + +- Add modsign-verify tool to verify signatures of modules + (fate#314507). + +------------------------------------------------------------------- +Tue Mar 11 12:38:39 UTC 2014 - mmarek@suse.cz + +- weak-modules2: Support XZ compressed initrds (bnc#778119, + bnc#867312) + +------------------------------------------------------------------- +Mon Mar 10 15:08:15 UTC 2014 - mmarek@suse.cz + +- The package cannot be noarch, because it installs different + configs for different architectures. +- Install 10-unsupported-modules.conf unconditionally, kmod has + been patched. + +------------------------------------------------------------------- +Fri Feb 7 13:05:20 UTC 2014 - rsalevsky@suse.com + +- load the uas driver simulsimultaneously with the usb_storage driver and vice versa (bnc#862397) + +------------------------------------------------------------------- +Wed May 29 12:44:00 UTC 2013 - schwab@suse.de + +- weak-modules{,2}: also look for Image-$krel for aarch64 + +------------------------------------------------------------------- +Sun Mar 17 20:04:12 UTC 2013 - crrodriguez@opensuse.org + +- The "allow_unsupported_modules" feature, does not belong too + openSUSE, kmod (and hence udev and systemd) do not understand + it in anyway. limit to SLE only. + +------------------------------------------------------------------- +Wed Nov 14 18:31:35 UTC 2012 - jengelh@inai.de + +- New package. Split SUSE-specific scripts from module-init-tools, + so that we can actually get a system with kmod-compat running. Index: _service:obs_scm:suse-module-tools.obsinfo =================================================================== --- _service:obs_scm:suse-module-tools.obsinfo (added) +++ _service:obs_scm:suse-module-tools.obsinfo (revision 26) @@ -0,0 +1,5 @@ +name: suse-module-tools +version: 15.4.0 +mtime: 1618321769 +commit: 37a04d84cbeaf0540e6771e8d8f7c8ec10c61df7 + Index: suse-module-tools-15.3.5.tar.xz =================================================================== Binary file suse-module-tools-15.3.5.tar.xz (revision 96) deleted OBS-URL: https://build.opensuse.org/request/show/885109 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=97 --- _service | 18 +- _service:extract_file:suse-module-tools.spec | 283 +++++++++++++ _service:obs_scm:_servicedata | 4 + ...e:obs_scm:suse-module-tools-15.4.0.obscpio | 3 + _service:obs_scm:suse-module-tools.changes | 391 ++++++++++++++++++ _service:obs_scm:suse-module-tools.obsinfo | 5 + suse-module-tools-15.3.5.tar.xz | 3 - suse-module-tools.spec | 3 +- 8 files changed, 696 insertions(+), 14 deletions(-) create mode 100644 _service:extract_file:suse-module-tools.spec create mode 100644 _service:obs_scm:_servicedata create mode 100644 _service:obs_scm:suse-module-tools-15.4.0.obscpio create mode 100644 _service:obs_scm:suse-module-tools.changes create mode 100644 _service:obs_scm:suse-module-tools.obsinfo delete mode 100644 suse-module-tools-15.3.5.tar.xz diff --git a/_service b/_service index fdd03e4..b188b3a 100644 --- a/_service +++ b/_service @@ -1,22 +1,22 @@ - + https://github.com/openSUSE/suse-module-tools.git git enable suse-module-tools @PARENT_TAG@+@TAG_OFFSET@ - \+[01]$ - + ([^+]*)\+0 master *.rpmlintrc - - *.tar - xz - - - *.tar.xz + + *.obscpio */suse-module-tools.spec suse-module-tools.spec + + + *.tar + xz + diff --git a/_service:extract_file:suse-module-tools.spec b/_service:extract_file:suse-module-tools.spec new file mode 100644 index 0000000..215431d --- /dev/null +++ b/_service:extract_file:suse-module-tools.spec @@ -0,0 +1,283 @@ +# +# spec file for package suse-module-tools +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +# Define _rpmmacrodir if it's not defined yet +%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d} +%define modules_load_dir /usr/lib/modules-load.d + +# List of legacy file systems to be blacklisted by default +%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs + +%if 0%{?sle_version} >= 120200 && 0%{?sle_version} < 150000 +%global softdep_br_netfilter 1 +%endif + +Name: suse-module-tools +Version: 15.4.0 +Release: 0 +Summary: Configuration for module loading and SUSE-specific utilities for KMPs +License: GPL-2.0-or-later +Group: System/Base +URL: https://github.com/openSUSE/suse-module-tools +Source0: %{name}-%{version}.tar.xz +Source1: %{name}.rpmlintrc +Requires: /usr/bin/grep +Requires: /usr/bin/gzip +Requires: /usr/bin/sed +Requires: coreutils +Requires: findutils +Requires: rpm +Requires(post): /usr/bin/grep +Requires(post): /usr/bin/sed +Requires(post): coreutils +# Use weak dependencies for mkinitrd and kmod in order to +# keep Ring0 lean. In normal deployments, these packages +# will be available anyway. +Recommends: mkinitrd +%if 0%{?suse_version} >= 1315 +Recommends: kmod +%else +Recommends: modutils +%endif +# This release requires the dracut fix for bsc#1127891 +Conflicts: dracut < 44.2 + +%description +This package contains helper scripts for KMP installation and +uninstallation, as well as default configuration files for depmod and +modprobe. These utilities are provided by kmod-compat or +module-init-tools, whichever implementation you choose to install. + + +%package legacy +Summary: Legacy "weak-modules" script for Code10 +Group: System/Base +Requires: %{name} +Requires: binutils + +%description legacy +This package contains the legacy "weak-modules" script for kernel +module package (KMP) support. It was replaced by "weak-modules2" in +SLE 11 and later. + +%prep +%setup -q + +%build + +%install +# now assemble the parts for modprobe.conf +cp modprobe.conf/modprobe.conf.common 00-system.conf +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}%{_sysconfdir}/modprobe.d" +install -pm644 "10-unsupported-modules.conf" \ + "%{buildroot}%{_sysconfdir}/modprobe.d/" +install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/" + +%if 0%{?softdep_br_netfilter} +# softdep bridge->br_netfilter, SLE only +install -pm644 modprobe.conf/00-system-937216.conf %{buildroot}%{_sysconfdir}/modprobe.d +%endif +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf" +%endif +install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf" +install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d" +install -pm 644 "depmod-00-system.conf" \ + "%{buildroot}%{_sysconfdir}/depmod.d/00-system.conf" + +# "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc. +install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" +install -pm 755 weak-modules{,2} "%{buildroot}/usr/lib/module-init-tools/" +install -pm 755 driver-check.sh "%{buildroot}/usr/lib/module-init-tools/" + +%if 0%{?suse_version} < 1550 +# rpm macros and helper +# The RPM Macros have been moved to the package rpm-config-SUSE after CODE15, thus are no longer +# shipped here +install -d -m 755 "%{buildroot}%{_rpmmacrodir}" +install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" +%endif +install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/" + +install -d -m 755 "%{buildroot}%{_prefix}/bin" +install -pm 755 kmp-install "%{buildroot}%{_bindir}/" + +# systemd service to load /boot/sysctl.conf-`uname -r` +install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d" +install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.service.d" + +# Ensure that the sg driver is loaded early (bsc#1036463) +# Not needed in SLE11, where sg is loaded via udev rule. +install -d -m 755 "%{buildroot}%{modules_load_dir}" +install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}" +%ifarch ppc64le +install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators +install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators +%endif + +mkdir -p %{buildroot}%{_defaultlicensedir} + +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +for mod in %{fs_blacklist}; do + echo "\ +# The $mod file system is blacklisted by default because it isn't actively +# supported by SUSE, not well maintained, or may have security vulnerabilites. +# To enable autoloading the $mod file system module, comment out the +# \"blacklist $mod\" statement below. ENABLE AT YOUR OWN RISK. +# +# File system modules loaded at installation time of the %{name} package +# are not blacklisted. This is achieved by commenting out the blacklist +# line in the post-installation script. To prevent the post-installation +# script from modifying this file, delete the line containing \"THIS FILE MAY +# BE MODIFIED\" at the bottom. +blacklist $mod +# __THIS FILE MAY BE MODIFIED__" \ + >%{buildroot}%{_sysconfdir}/modprobe.d/60-blacklist_fs-"$mod".conf +done +%endif + +%post +%if 0%{?sle_version} >= 150000 +# Delete obsolete unsupported-modules file from SLE11 +rm -f %{_sysconfdir}/modprobe.d/unsupported-modules +%else +# Logic for releases below CODE 15 +%if 0%{?is_opensuse} == 1 +allowed=1 +%else +allowed=0 +%endif +test_allow_on_install() +{ + # configure handling of unsupported modules + # default is to allow them + allow=1 + # if the obsolete LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY variable is + # set to no, don't allow (this was used in SLES 9 and 10) + if test -e %{_sysconfdir}/sysconfig/hardware/config; then + . %{_sysconfdir}/sysconfig/hardware/config + if test "x$LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY" = "xno"; then + allow=0 + fi + # obsolete + rm %{_sysconfdir}/sysconfig/hardware/config + fi + # don't change the setting during upgrade + if test "$1" != 1; then + allow= + return + fi + # on SLES, the default is not to allow unsupported modules + if grep -qs "Enterprise Server" %{_sysconfdir}/os-release; then + allow=0 + else + return + fi + # unless the admin passed "oem-modules=1" to the kernel during install + if grep -qs '\' /proc/cmdline; then + allow=1 + return + fi + # or if the installer already loaded some unsupported modules + # (see TAINT_NO_SUPPORT in /etc/src/linux/include/linux/kernel.h) + tainted=$(cat /proc/sys/kernel/tainted 2>/dev/null || echo 0) + if test $((tainted & (1<<30))) != 0; then + allow=1 + return + fi +} +# upgrade from old locations +if test -e %{_sysconfdir}/modprobe.d/unsupported-modules; then + mv -f %{_sysconfdir}/modprobe.d/unsupported-modules \ + %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf +fi +test_allow_on_install "$@" +if test -n "$allow" -a "$allow" != "$allowed"; then + sed -ri 's/^( *allow_unsupported_modules *) [01]/\1 '"$allow"'/' \ + %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf +fi +%endif + +# upgrade from old locations +if test -e %{_sysconfdir}/modprobe.conf.local; then + mv -f %{_sysconfdir}/modprobe.conf.local \ + %{_sysconfdir}/modprobe.d/99-local.conf +fi + +# Avoid systems becoming unbootable by blacklisting filesystem +# modules. Modules loaded at installation time will not be +# blacklisted (the blacklist statement is commented out). +# config(noreplace) makes sure that this is not overwritten by rpm. +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +for mod in %{fs_blacklist}; do + conf=%{_sysconfdir}/modprobe.d/60-blacklist_fs-"$mod".conf + if [ -f "$conf" ] && \ + grep -q '^# __THIS FILE MAY BE MODIFIED__$' "$conf" && \ + sed '/^nodev/d;' /proc/filesystems | grep -q "\<$mod\>"; then + sed -i ' +/^# next line was commented out by postinstall script of %{name}$/d +/^blacklist '"$mod"'/{i\ +# next line was commented out by postinstall script of %{name} +s/^/# / +}' "$conf" + fi +done +%endif + +%files +%defattr(-,root,root) + +%if 0%{?sle_version:%{sle_version}}%{!?sle_version:150000} <= 120200 +%dir %{_defaultlicensedir} +%endif +%license LICENSE +%doc README.SUSE +%dir %{_sysconfdir}/modprobe.d +%config %{_sysconfdir}/modprobe.d/00-system.conf +%if 0%{?softdep_br_netfilter} +%config(noreplace) %{_sysconfdir}/modprobe.d/00-system-937216.conf +%endif +%config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +%config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/60-blacklist_fs-*.conf +%endif +%config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf +%dir %{_sysconfdir}/depmod.d +%config %{_sysconfdir}/depmod.d/00-system.conf +%if 0%{?suse_version} < 1550 +%{_rpmmacrodir}/macros.initrd +%endif +%{_bindir}/kmp-install +/usr/lib/module-init-tools +%exclude /usr/lib/module-init-tools/weak-modules +%{_unitdir}/systemd-sysctl.service.d +%dir %{modules_load_dir} +%{modules_load_dir}/sg.conf +%ifarch ppc64le +/usr/lib/systemd/system-generators +%endif + +%files legacy +%defattr(-,root,root) +/usr/lib/module-init-tools/weak-modules + +%changelog diff --git a/_service:obs_scm:_servicedata b/_service:obs_scm:_servicedata new file mode 100644 index 0000000..b36d1dd --- /dev/null +++ b/_service:obs_scm:_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/suse-module-tools.git + 37a04d84cbeaf0540e6771e8d8f7c8ec10c61df7 \ No newline at end of file diff --git a/_service:obs_scm:suse-module-tools-15.4.0.obscpio b/_service:obs_scm:suse-module-tools-15.4.0.obscpio new file mode 100644 index 0000000..786e31e --- /dev/null +++ b/_service:obs_scm:suse-module-tools-15.4.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c142f76fe6738b915d8e30ed9d0a16f710b39f26778c55ee550ee9fff46a0c1 +size 98827 diff --git a/_service:obs_scm:suse-module-tools.changes b/_service:obs_scm:suse-module-tools.changes new file mode 100644 index 0000000..f1d3910 --- /dev/null +++ b/_service:obs_scm:suse-module-tools.changes @@ -0,0 +1,391 @@ +------------------------------------------------------------------- +Tue Apr 13 15:24:23 UTC 2021 - obs-service-tar-scm@invalid + +- Update to version 15.4.0: + * Bump version to 15.4.0 + * Enable f2fs (bsc#1184415) + +------------------------------------------------------------------- +Mon Nov 02 17:03:42 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.5: + * Skip coldplug for memory devices on ppc64le, using generator + (bsc#1174287, bsc#1172745) + +------------------------------------------------------------------- +Tue Aug 25 15:43:20 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.4: + * spec: rework dependencies + +------------------------------------------------------------------- +Mon Aug 03 21:05:03 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.4: + * rework dependencies to reduce system size for small OS + +------------------------------------------------------------------- +Fri Jun 5 15:28:50 UTC 2020 - Martin Wilck + +- Reverted back to tar_scm source service + (obs_scm doesn't work well for Ring0 packages) + +------------------------------------------------------------------- +Wed May 27 20:49:04 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.3: + * spec: remove SLE/openSUSE difference in allow_unsupported_modules + (jsc#SLE-12255) + * spec: use same fs_blacklist on SLE and openSUSE + (jsc#SLE-12255, jsc#SLE-3926) + * spec: use br_netfilter softdep only for SLE12 + (jsc#SLE-12255, bsc#1166531, boo#1158817, bsc#937216) + +------------------------------------------------------------------- +Fri Apr 17 15:32:54 UTC 2020 - mwilck@suse.com + +- Update to version 15.3.2: + * modprobe.conf.common: eliminate circular uas/usb-storage dependency + (bsc#1168661) + +------------------------------------------------------------------- +Mon Jan 20 15:03:51 UTC 2020 - mwilck@suse.com + +- Update to version 15.2.10: + * ppc64le: fix dependency of papr_scm + (bsc#1142152, ltc#176292, FATE#327775). + +------------------------------------------------------------------- +Wed Jan 15 20:46:40 UTC 2020 - mwilck@suse.com + +- Update to version 15.2.9: + * 00-system.conf: move br_netfilter softdep to separate file + (boo#1158817) + +------------------------------------------------------------------- +Thu Jan 09 12:30:58 UTC 2020 - mwilck@suse.com + +- Update to version 15.2.8: + * Add modprobe.conf.s390x (bsc#1132798) + +------------------------------------------------------------------- +Thu Nov 07 20:34:15 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.7: + * spec file: avoid %{_libexecdir} + +------------------------------------------------------------------- +Thu Nov 07 19:48:05 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.6: + * modprobe.conf: add dependency of papr_scm on libnvdimm + (bsc#1142152, ltc#176292, FATE#327775). + +------------------------------------------------------------------- +Fri Aug 16 08:46:15 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.5: + * remove 'modhash' - moved to mokutil package (jsc#SLE-6094) + +------------------------------------------------------------------- +Mon Jul 15 11:58:07 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.4: + * sg.conf: avoid file conflict with system-tuning-common-SUSE + +------------------------------------------------------------------- +Mon Jul 01 20:18:55 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.3: + * softdep of bridge on br_netfilter (bsc#937216, bsc#1134819) + +------------------------------------------------------------------- +Tue Jun 18 13:08:07 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.2: + * kmp-install, driver-check.sh, weak-modules2: + Support for compressed kernel modules (bsc#1135854) + +------------------------------------------------------------------- +Fri Jun 14 14:52:19 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.1: +- Install sg.conf under /usr/lib/modules-load.d (bsc#1036463) + * sg.conf: avoid file conflict with systemd + +------------------------------------------------------------------- +Fri Jun 14 10:06:55 UTC 2019 - mwilck@suse.com + +- Update to version 15.2.0: + * weak-modules2: emit "inconsistent" warning only if replacement fails + (bsc#1127155) + +------------------------------------------------------------------- +Fri May 17 06:18:33 UTC 2019 - Dominique Leuenberger + +- Only ship RPM macros up to suse_version 1500: after that, the + macros can be found in the rpm-config-SUSE package. + +------------------------------------------------------------------- +Fri May 10 09:18:57 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + +------------------------------------------------------------------- +Thu Mar 14 16:02:23 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.13: + * spec file: add conflicts for dracut < 44.2 (bsc#1127891) + +------------------------------------------------------------------- +Thu Mar 14 14:53:24 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.12 (git 1ab0b84): + * modprobe.conf.common: add csiostor->cxgb4 dependency + (bsc#1100989) + * Load fbcon together with virtio_gpu on s390 (bsc#1121996, + fate#327159) + +------------------------------------------------------------------- +Mon Feb 18 12:02:27 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.11 (git 54df192): + * spec file: use more gentle wording in blacklist files + * spec file: drop jffs2 and ubifs from blacklist + +------------------------------------------------------------------- +Fri Feb 08 10:44:56 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.10 (git b28b13d): +- implemented fs blacklisting logic (jsc#SLES-4085, fate#326832) + +------------------------------------------------------------------- +Thu Jan 31 23:07:10 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.0 (git 6b07b88): + * 50-blacklist.conf is not added in Leap before 15.1. + fix conditionals and bump version accordingly. + +------------------------------------------------------------------- +Wed Jan 30 23:04:26 UTC 2019 - mwilck@suse.com + +- Update to version 15.0.20 (git 1396df5): +- Fix driver-check.sh (boo#1123697, boo#1123704) +- add /etc/modprobe.d/50-blacklist.conf from sysconfig package + (boo#1107611) +- Remove hard dependency on mkinitrd (boo#1123721) +- Make sure code works also without kmod-compat +- Replace file dependency on /sbin/depmod by weak package dependency + +------------------------------------------------------------------- +Mon Dec 10 12:10:29 UTC 2018 - Martin Wilck + +- Move "weak-modules" script to -legacy subpackage to avoid + dependency on binutils (bsc#1116665) + +------------------------------------------------------------------- +Fri Dec 7 12:45:36 UTC 2018 - Adrian Schröter + +- Require mkinitrd (provided also by dracut) directly instead of + file requires. This is fixing image build failures + +------------------------------------------------------------------- +Wed Nov 07 14:53:52 UTC 2018 - mwilck@suse.com + +- Update to version 15.0.1 (git 5c63319): +- Use /etc/modules-load.d/sg.conf for sg driver autoloading + (bsc#1036463) + * added /etc/modules-load.d/sg.conf + +------------------------------------------------------------------- +Mon Nov 05 10:08:19 UTC 2018 - mwilck@suse.com + +- version 15.0 (git 6ce3011) +- modsign-verify: support for parsing PKCS#7 signatures + (bsc#1111300, bsc#1105495) +- Fix logic for unsupported modules (bsc#1111183) + * SLES15: allow unsupported modules only if kernel-default-extra + from SLE-WE module is installed + * Always allow unsupported modules on Leap 15 and Factory + * No change for SLE12 / Leap 42.x and below + * 10-unsupported-modules.conf: improved comments + * fix %config(noreplace) logic for 10-unsupported-modules.conf +- added udev rule 81-sg.rules to make sure the sg module is + always loaded (bsc#1036463) + +------------------------------------------------------------------- +Wed Jul 26 08:07:29 UTC 2017 - tchvatal@suse.com + +- Use path dependency that is not parsed by obs to ensure we + are not pulling systemd everywhere + +------------------------------------------------------------------- +Mon Jun 19 12:58:04 UTC 2017 - tchvatal@suse.com + +- Set url to github project and repack using obs service +- Cleanup a bit with spec-cleaner +- Grep os-release and not deprecated SuSE-release + +------------------------------------------------------------------- +Thu Sep 8 08:55:50 UTC 2016 - dmueller@suse.com + +- blacklist efifb on aarch64 (bsc#996080) + +------------------------------------------------------------------- +Fri May 27 13:14:36 UTC 2016 - mmarek@suse.cz + +- Run dos2unix on the modhash script. + +------------------------------------------------------------------- +Thu May 26 07:36:58 UTC 2016 - jlee@suse.com + +- Add modhash tool to calculate hash of signed module. + It strips X.509 or PKCS#7 signature before hash kernel module. + (fate#319460) + +------------------------------------------------------------------- +Wed May 25 13:23:35 UTC 2016 - mmarek@suse.cz + +- Remove -x bit from 50-kernel-uname_r.conf (bsc#981291). + +------------------------------------------------------------------- +Fri Apr 29 11:31:46 UTC 2016 - mmarek@suse.cz + +- Ignore failures when loading the kernel sysctl (bsc#977715). + +------------------------------------------------------------------- +Thu Apr 28 20:15:31 UTC 2016 - mmarek@suse.com + +- Add a systemd service to load /boot/sysctl.conf-`uname -r` + (bsc#977715). + +------------------------------------------------------------------- +Fri Apr 1 11:43:32 UTC 2016 - mmarek@suse.cz + +- Skip KMPs built from the kernel spec file directly (fate#319339) +- Bump version number to 12.4 + +------------------------------------------------------------------- +Tue Feb 23 10:43:39 UTC 2016 - lnussel@suse.de + +- add missing requirements on module-init-tools, findutils and gzip, + mkinitrd (bnc#965830) + +------------------------------------------------------------------- +Fri Jan 15 23:04:41 UTC 2016 - bpoirier@suse.com + +- Add module option ib_mthca.catas_reset_disable=1 on ppc64le (bsc#456389). + +------------------------------------------------------------------- +Tue Oct 13 08:35:32 UTC 2015 - mmarek@suse.cz + +- Revert change for fate#319339, as some 3rd party KMPs are built + with a modified template (bsc#949862). + +------------------------------------------------------------------- +Tue Sep 8 12:52:15 UTC 2015 - trenn@suse.de + +- Use /run instead of deprecated /var/run + This can have sever consequences if this package uses /var/run. It may + be installed before filesystem package generating the /run tmpfs and + predict it to generate the link /var/run -> /run. Later dracut convertfs + kicks in to generate it, but it has issues. bsc#922676 + +------------------------------------------------------------------- +Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz + +- Only handle KMPs that are built using the %kernel_module_package + macro (preparatory work for fate#319339). + +------------------------------------------------------------------- +Tue Jun 23 14:39:46 UTC 2015 - mmarek@suse.cz + +- Use absolute path to mkinitrd (bsc#935566) + +------------------------------------------------------------------- +Fri May 16 08:36:15 UTC 2014 - mmarek@suse.cz + +- Add kgraft/ to the depmod search list (fate#313296) + +------------------------------------------------------------------- +Mon May 5 17:15:37 UTC 2014 - tonyj@suse.com + +- Add support for ARM zImage to weak-modules2 + +------------------------------------------------------------------- +Tue Apr 15 14:32:55 UTC 2014 - mmarek@suse.cz + +- weak-modules2: Use lsinitrd to list the modules in an initrd, so + that initrds with early microcode work (bnc#873209, bnc#873113). + +------------------------------------------------------------------- +Fri Apr 4 14:32:48 UTC 2014 - mmarek@suse.cz + +- weak-modules2: Run mkinitrd in posttrans if $INITRD_IN_POSTTRANS + is set (fate#313506) + +------------------------------------------------------------------- +Fri Apr 4 13:34:09 UTC 2014 - mmarek@suse.cz + +- regenerate-initrd-posttrans: Run mkinitrd_setup + +------------------------------------------------------------------- +Fri Apr 4 12:13:18 UTC 2014 - mmarek@suse.cz + +- Add macros for regenerating the initrd in %posttrans + (fate#313506). + +------------------------------------------------------------------- +Mon Mar 31 09:11:16 UTC 2014 - mmarek@suse.cz + +- Use softdep to order {u,o,e}hci-hcd drivers. +- Drop ia64 modprobe config. + +------------------------------------------------------------------- +Fri Mar 28 14:25:25 UTC 2014 - mmarek@suse.cz + +- Add kmp-install tool for easier installation of SolidDriver KMPs + (fate#314581). + +------------------------------------------------------------------- +Tue Mar 11 12:57:36 UTC 2014 - mmarek@suse.cz + +- Add modsign-verify tool to verify signatures of modules + (fate#314507). + +------------------------------------------------------------------- +Tue Mar 11 12:38:39 UTC 2014 - mmarek@suse.cz + +- weak-modules2: Support XZ compressed initrds (bnc#778119, + bnc#867312) + +------------------------------------------------------------------- +Mon Mar 10 15:08:15 UTC 2014 - mmarek@suse.cz + +- The package cannot be noarch, because it installs different + configs for different architectures. +- Install 10-unsupported-modules.conf unconditionally, kmod has + been patched. + +------------------------------------------------------------------- +Fri Feb 7 13:05:20 UTC 2014 - rsalevsky@suse.com + +- load the uas driver simulsimultaneously with the usb_storage driver and vice versa (bnc#862397) + +------------------------------------------------------------------- +Wed May 29 12:44:00 UTC 2013 - schwab@suse.de + +- weak-modules{,2}: also look for Image-$krel for aarch64 + +------------------------------------------------------------------- +Sun Mar 17 20:04:12 UTC 2013 - crrodriguez@opensuse.org + +- The "allow_unsupported_modules" feature, does not belong too + openSUSE, kmod (and hence udev and systemd) do not understand + it in anyway. limit to SLE only. + +------------------------------------------------------------------- +Wed Nov 14 18:31:35 UTC 2012 - jengelh@inai.de + +- New package. Split SUSE-specific scripts from module-init-tools, + so that we can actually get a system with kmod-compat running. diff --git a/_service:obs_scm:suse-module-tools.obsinfo b/_service:obs_scm:suse-module-tools.obsinfo new file mode 100644 index 0000000..73ae291 --- /dev/null +++ b/_service:obs_scm:suse-module-tools.obsinfo @@ -0,0 +1,5 @@ +name: suse-module-tools +version: 15.4.0 +mtime: 1618321769 +commit: 37a04d84cbeaf0540e6771e8d8f7c8ec10c61df7 + diff --git a/suse-module-tools-15.3.5.tar.xz b/suse-module-tools-15.3.5.tar.xz deleted file mode 100644 index 2818094..0000000 --- a/suse-module-tools-15.3.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:640fdc1c2a9c13362558f5fd7c3d5ae78b8bc6ee0033bbaebc8dd2c86673a59f -size 28452 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index da8a74b..a5175fa 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2020 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 @@ -63,7 +63,6 @@ uninstallation, as well as default configuration files for depmod and modprobe. These utilities are provided by kmod-compat or module-init-tools, whichever implementation you choose to install. - %package legacy Summary: Legacy "weak-modules" script for Code10 Group: System/Base From 30adc81e7db9c5b29b246f3de8e486adbdd5601092058c14b6e6bd73ea1c3d4d Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 15 Apr 2021 09:07:44 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=98 --- _service | 19 +- _service:extract_file:suse-module-tools.spec | 283 ------------- _service:obs_scm:_servicedata | 4 - _service:obs_scm:suse-module-tools.changes | 391 ------------------ _servicedata | 2 +- ...bscpio => suse-module-tools-15.4.0.obscpio | 0 suse-module-tools.changes | 7 + ...tools.obsinfo => suse-module-tools.obsinfo | 0 suse-module-tools.spec | 7 +- 9 files changed, 14 insertions(+), 699 deletions(-) delete mode 100644 _service:extract_file:suse-module-tools.spec delete mode 100644 _service:obs_scm:_servicedata delete mode 100644 _service:obs_scm:suse-module-tools.changes rename _service:obs_scm:suse-module-tools-15.4.0.obscpio => suse-module-tools-15.4.0.obscpio (100%) rename _service:obs_scm:suse-module-tools.obsinfo => suse-module-tools.obsinfo (100%) diff --git a/_service b/_service index b188b3a..7ee2837 100644 --- a/_service +++ b/_service @@ -1,21 +1,6 @@ - - https://github.com/openSUSE/suse-module-tools.git - git - enable - suse-module-tools - @PARENT_TAG@+@TAG_OFFSET@ - ([^+]*)\+0 - master - *.rpmlintrc - - - *.obscpio - */suse-module-tools.spec - suse-module-tools.spec - - - + + *.tar xz diff --git a/_service:extract_file:suse-module-tools.spec b/_service:extract_file:suse-module-tools.spec deleted file mode 100644 index 215431d..0000000 --- a/_service:extract_file:suse-module-tools.spec +++ /dev/null @@ -1,283 +0,0 @@ -# -# spec file for package suse-module-tools -# -# Copyright (c) 2020 SUSE LLC -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -# Define _rpmmacrodir if it's not defined yet -%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d} -%define modules_load_dir /usr/lib/modules-load.d - -# List of legacy file systems to be blacklisted by default -%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs - -%if 0%{?sle_version} >= 120200 && 0%{?sle_version} < 150000 -%global softdep_br_netfilter 1 -%endif - -Name: suse-module-tools -Version: 15.4.0 -Release: 0 -Summary: Configuration for module loading and SUSE-specific utilities for KMPs -License: GPL-2.0-or-later -Group: System/Base -URL: https://github.com/openSUSE/suse-module-tools -Source0: %{name}-%{version}.tar.xz -Source1: %{name}.rpmlintrc -Requires: /usr/bin/grep -Requires: /usr/bin/gzip -Requires: /usr/bin/sed -Requires: coreutils -Requires: findutils -Requires: rpm -Requires(post): /usr/bin/grep -Requires(post): /usr/bin/sed -Requires(post): coreutils -# Use weak dependencies for mkinitrd and kmod in order to -# keep Ring0 lean. In normal deployments, these packages -# will be available anyway. -Recommends: mkinitrd -%if 0%{?suse_version} >= 1315 -Recommends: kmod -%else -Recommends: modutils -%endif -# This release requires the dracut fix for bsc#1127891 -Conflicts: dracut < 44.2 - -%description -This package contains helper scripts for KMP installation and -uninstallation, as well as default configuration files for depmod and -modprobe. These utilities are provided by kmod-compat or -module-init-tools, whichever implementation you choose to install. - - -%package legacy -Summary: Legacy "weak-modules" script for Code10 -Group: System/Base -Requires: %{name} -Requires: binutils - -%description legacy -This package contains the legacy "weak-modules" script for kernel -module package (KMP) support. It was replaced by "weak-modules2" in -SLE 11 and later. - -%prep -%setup -q - -%build - -%install -# now assemble the parts for modprobe.conf -cp modprobe.conf/modprobe.conf.common 00-system.conf -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}%{_sysconfdir}/modprobe.d" -install -pm644 "10-unsupported-modules.conf" \ - "%{buildroot}%{_sysconfdir}/modprobe.d/" -install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/" - -%if 0%{?softdep_br_netfilter} -# softdep bridge->br_netfilter, SLE only -install -pm644 modprobe.conf/00-system-937216.conf %{buildroot}%{_sysconfdir}/modprobe.d -%endif -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 -install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf" -%endif -install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf" -install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d" -install -pm 644 "depmod-00-system.conf" \ - "%{buildroot}%{_sysconfdir}/depmod.d/00-system.conf" - -# "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc. -install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" -install -pm 755 weak-modules{,2} "%{buildroot}/usr/lib/module-init-tools/" -install -pm 755 driver-check.sh "%{buildroot}/usr/lib/module-init-tools/" - -%if 0%{?suse_version} < 1550 -# rpm macros and helper -# The RPM Macros have been moved to the package rpm-config-SUSE after CODE15, thus are no longer -# shipped here -install -d -m 755 "%{buildroot}%{_rpmmacrodir}" -install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" -%endif -install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/" - -install -d -m 755 "%{buildroot}%{_prefix}/bin" -install -pm 755 kmp-install "%{buildroot}%{_bindir}/" - -# systemd service to load /boot/sysctl.conf-`uname -r` -install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d" -install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.service.d" - -# Ensure that the sg driver is loaded early (bsc#1036463) -# Not needed in SLE11, where sg is loaded via udev rule. -install -d -m 755 "%{buildroot}%{modules_load_dir}" -install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}" -%ifarch ppc64le -install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators -install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators -%endif - -mkdir -p %{buildroot}%{_defaultlicensedir} - -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 -for mod in %{fs_blacklist}; do - echo "\ -# The $mod file system is blacklisted by default because it isn't actively -# supported by SUSE, not well maintained, or may have security vulnerabilites. -# To enable autoloading the $mod file system module, comment out the -# \"blacklist $mod\" statement below. ENABLE AT YOUR OWN RISK. -# -# File system modules loaded at installation time of the %{name} package -# are not blacklisted. This is achieved by commenting out the blacklist -# line in the post-installation script. To prevent the post-installation -# script from modifying this file, delete the line containing \"THIS FILE MAY -# BE MODIFIED\" at the bottom. -blacklist $mod -# __THIS FILE MAY BE MODIFIED__" \ - >%{buildroot}%{_sysconfdir}/modprobe.d/60-blacklist_fs-"$mod".conf -done -%endif - -%post -%if 0%{?sle_version} >= 150000 -# Delete obsolete unsupported-modules file from SLE11 -rm -f %{_sysconfdir}/modprobe.d/unsupported-modules -%else -# Logic for releases below CODE 15 -%if 0%{?is_opensuse} == 1 -allowed=1 -%else -allowed=0 -%endif -test_allow_on_install() -{ - # configure handling of unsupported modules - # default is to allow them - allow=1 - # if the obsolete LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY variable is - # set to no, don't allow (this was used in SLES 9 and 10) - if test -e %{_sysconfdir}/sysconfig/hardware/config; then - . %{_sysconfdir}/sysconfig/hardware/config - if test "x$LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY" = "xno"; then - allow=0 - fi - # obsolete - rm %{_sysconfdir}/sysconfig/hardware/config - fi - # don't change the setting during upgrade - if test "$1" != 1; then - allow= - return - fi - # on SLES, the default is not to allow unsupported modules - if grep -qs "Enterprise Server" %{_sysconfdir}/os-release; then - allow=0 - else - return - fi - # unless the admin passed "oem-modules=1" to the kernel during install - if grep -qs '\' /proc/cmdline; then - allow=1 - return - fi - # or if the installer already loaded some unsupported modules - # (see TAINT_NO_SUPPORT in /etc/src/linux/include/linux/kernel.h) - tainted=$(cat /proc/sys/kernel/tainted 2>/dev/null || echo 0) - if test $((tainted & (1<<30))) != 0; then - allow=1 - return - fi -} -# upgrade from old locations -if test -e %{_sysconfdir}/modprobe.d/unsupported-modules; then - mv -f %{_sysconfdir}/modprobe.d/unsupported-modules \ - %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf -fi -test_allow_on_install "$@" -if test -n "$allow" -a "$allow" != "$allowed"; then - sed -ri 's/^( *allow_unsupported_modules *) [01]/\1 '"$allow"'/' \ - %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf -fi -%endif - -# upgrade from old locations -if test -e %{_sysconfdir}/modprobe.conf.local; then - mv -f %{_sysconfdir}/modprobe.conf.local \ - %{_sysconfdir}/modprobe.d/99-local.conf -fi - -# Avoid systems becoming unbootable by blacklisting filesystem -# modules. Modules loaded at installation time will not be -# blacklisted (the blacklist statement is commented out). -# config(noreplace) makes sure that this is not overwritten by rpm. -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 -for mod in %{fs_blacklist}; do - conf=%{_sysconfdir}/modprobe.d/60-blacklist_fs-"$mod".conf - if [ -f "$conf" ] && \ - grep -q '^# __THIS FILE MAY BE MODIFIED__$' "$conf" && \ - sed '/^nodev/d;' /proc/filesystems | grep -q "\<$mod\>"; then - sed -i ' -/^# next line was commented out by postinstall script of %{name}$/d -/^blacklist '"$mod"'/{i\ -# next line was commented out by postinstall script of %{name} -s/^/# / -}' "$conf" - fi -done -%endif - -%files -%defattr(-,root,root) - -%if 0%{?sle_version:%{sle_version}}%{!?sle_version:150000} <= 120200 -%dir %{_defaultlicensedir} -%endif -%license LICENSE -%doc README.SUSE -%dir %{_sysconfdir}/modprobe.d -%config %{_sysconfdir}/modprobe.d/00-system.conf -%if 0%{?softdep_br_netfilter} -%config(noreplace) %{_sysconfdir}/modprobe.d/00-system-937216.conf -%endif -%config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 -%config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf -%config(noreplace) %{_sysconfdir}/modprobe.d/60-blacklist_fs-*.conf -%endif -%config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf -%dir %{_sysconfdir}/depmod.d -%config %{_sysconfdir}/depmod.d/00-system.conf -%if 0%{?suse_version} < 1550 -%{_rpmmacrodir}/macros.initrd -%endif -%{_bindir}/kmp-install -/usr/lib/module-init-tools -%exclude /usr/lib/module-init-tools/weak-modules -%{_unitdir}/systemd-sysctl.service.d -%dir %{modules_load_dir} -%{modules_load_dir}/sg.conf -%ifarch ppc64le -/usr/lib/systemd/system-generators -%endif - -%files legacy -%defattr(-,root,root) -/usr/lib/module-init-tools/weak-modules - -%changelog diff --git a/_service:obs_scm:_servicedata b/_service:obs_scm:_servicedata deleted file mode 100644 index b36d1dd..0000000 --- a/_service:obs_scm:_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://github.com/openSUSE/suse-module-tools.git - 37a04d84cbeaf0540e6771e8d8f7c8ec10c61df7 \ No newline at end of file diff --git a/_service:obs_scm:suse-module-tools.changes b/_service:obs_scm:suse-module-tools.changes deleted file mode 100644 index f1d3910..0000000 --- a/_service:obs_scm:suse-module-tools.changes +++ /dev/null @@ -1,391 +0,0 @@ -------------------------------------------------------------------- -Tue Apr 13 15:24:23 UTC 2021 - obs-service-tar-scm@invalid - -- Update to version 15.4.0: - * Bump version to 15.4.0 - * Enable f2fs (bsc#1184415) - -------------------------------------------------------------------- -Mon Nov 02 17:03:42 UTC 2020 - mwilck@suse.com - -- Update to version 15.3.5: - * Skip coldplug for memory devices on ppc64le, using generator - (bsc#1174287, bsc#1172745) - -------------------------------------------------------------------- -Tue Aug 25 15:43:20 UTC 2020 - mwilck@suse.com - -- Update to version 15.3.4: - * spec: rework dependencies - -------------------------------------------------------------------- -Mon Aug 03 21:05:03 UTC 2020 - mwilck@suse.com - -- Update to version 15.3.4: - * rework dependencies to reduce system size for small OS - -------------------------------------------------------------------- -Fri Jun 5 15:28:50 UTC 2020 - Martin Wilck - -- Reverted back to tar_scm source service - (obs_scm doesn't work well for Ring0 packages) - -------------------------------------------------------------------- -Wed May 27 20:49:04 UTC 2020 - mwilck@suse.com - -- Update to version 15.3.3: - * spec: remove SLE/openSUSE difference in allow_unsupported_modules - (jsc#SLE-12255) - * spec: use same fs_blacklist on SLE and openSUSE - (jsc#SLE-12255, jsc#SLE-3926) - * spec: use br_netfilter softdep only for SLE12 - (jsc#SLE-12255, bsc#1166531, boo#1158817, bsc#937216) - -------------------------------------------------------------------- -Fri Apr 17 15:32:54 UTC 2020 - mwilck@suse.com - -- Update to version 15.3.2: - * modprobe.conf.common: eliminate circular uas/usb-storage dependency - (bsc#1168661) - -------------------------------------------------------------------- -Mon Jan 20 15:03:51 UTC 2020 - mwilck@suse.com - -- Update to version 15.2.10: - * ppc64le: fix dependency of papr_scm - (bsc#1142152, ltc#176292, FATE#327775). - -------------------------------------------------------------------- -Wed Jan 15 20:46:40 UTC 2020 - mwilck@suse.com - -- Update to version 15.2.9: - * 00-system.conf: move br_netfilter softdep to separate file - (boo#1158817) - -------------------------------------------------------------------- -Thu Jan 09 12:30:58 UTC 2020 - mwilck@suse.com - -- Update to version 15.2.8: - * Add modprobe.conf.s390x (bsc#1132798) - -------------------------------------------------------------------- -Thu Nov 07 20:34:15 UTC 2019 - mwilck@suse.com - -- Update to version 15.2.7: - * spec file: avoid %{_libexecdir} - -------------------------------------------------------------------- -Thu Nov 07 19:48:05 UTC 2019 - mwilck@suse.com - -- Update to version 15.2.6: - * modprobe.conf: add dependency of papr_scm on libnvdimm - (bsc#1142152, ltc#176292, FATE#327775). - -------------------------------------------------------------------- -Fri Aug 16 08:46:15 UTC 2019 - mwilck@suse.com - -- Update to version 15.2.5: - * remove 'modhash' - moved to mokutil package (jsc#SLE-6094) - -------------------------------------------------------------------- -Mon Jul 15 11:58:07 UTC 2019 - mwilck@suse.com - -- Update to version 15.2.4: - * sg.conf: avoid file conflict with system-tuning-common-SUSE - -------------------------------------------------------------------- -Mon Jul 01 20:18:55 UTC 2019 - mwilck@suse.com - -- Update to version 15.2.3: - * softdep of bridge on br_netfilter (bsc#937216, bsc#1134819) - -------------------------------------------------------------------- -Tue Jun 18 13:08:07 UTC 2019 - mwilck@suse.com - -- Update to version 15.2.2: - * kmp-install, driver-check.sh, weak-modules2: - Support for compressed kernel modules (bsc#1135854) - -------------------------------------------------------------------- -Fri Jun 14 14:52:19 UTC 2019 - mwilck@suse.com - -- Update to version 15.2.1: -- Install sg.conf under /usr/lib/modules-load.d (bsc#1036463) - * sg.conf: avoid file conflict with systemd - -------------------------------------------------------------------- -Fri Jun 14 10:06:55 UTC 2019 - mwilck@suse.com - -- Update to version 15.2.0: - * weak-modules2: emit "inconsistent" warning only if replacement fails - (bsc#1127155) - -------------------------------------------------------------------- -Fri May 17 06:18:33 UTC 2019 - Dominique Leuenberger - -- Only ship RPM macros up to suse_version 1500: after that, the - macros can be found in the rpm-config-SUSE package. - -------------------------------------------------------------------- -Fri May 10 09:18:57 UTC 2019 - Dominique Leuenberger - -- Move RPM macros to %_rpmmacrodir. - -------------------------------------------------------------------- -Thu Mar 14 16:02:23 UTC 2019 - mwilck@suse.com - -- Update to version 15.1.13: - * spec file: add conflicts for dracut < 44.2 (bsc#1127891) - -------------------------------------------------------------------- -Thu Mar 14 14:53:24 UTC 2019 - mwilck@suse.com - -- Update to version 15.1.12 (git 1ab0b84): - * modprobe.conf.common: add csiostor->cxgb4 dependency - (bsc#1100989) - * Load fbcon together with virtio_gpu on s390 (bsc#1121996, - fate#327159) - -------------------------------------------------------------------- -Mon Feb 18 12:02:27 UTC 2019 - mwilck@suse.com - -- Update to version 15.1.11 (git 54df192): - * spec file: use more gentle wording in blacklist files - * spec file: drop jffs2 and ubifs from blacklist - -------------------------------------------------------------------- -Fri Feb 08 10:44:56 UTC 2019 - mwilck@suse.com - -- Update to version 15.1.10 (git b28b13d): -- implemented fs blacklisting logic (jsc#SLES-4085, fate#326832) - -------------------------------------------------------------------- -Thu Jan 31 23:07:10 UTC 2019 - mwilck@suse.com - -- Update to version 15.1.0 (git 6b07b88): - * 50-blacklist.conf is not added in Leap before 15.1. - fix conditionals and bump version accordingly. - -------------------------------------------------------------------- -Wed Jan 30 23:04:26 UTC 2019 - mwilck@suse.com - -- Update to version 15.0.20 (git 1396df5): -- Fix driver-check.sh (boo#1123697, boo#1123704) -- add /etc/modprobe.d/50-blacklist.conf from sysconfig package - (boo#1107611) -- Remove hard dependency on mkinitrd (boo#1123721) -- Make sure code works also without kmod-compat -- Replace file dependency on /sbin/depmod by weak package dependency - -------------------------------------------------------------------- -Mon Dec 10 12:10:29 UTC 2018 - Martin Wilck - -- Move "weak-modules" script to -legacy subpackage to avoid - dependency on binutils (bsc#1116665) - -------------------------------------------------------------------- -Fri Dec 7 12:45:36 UTC 2018 - Adrian Schröter - -- Require mkinitrd (provided also by dracut) directly instead of - file requires. This is fixing image build failures - -------------------------------------------------------------------- -Wed Nov 07 14:53:52 UTC 2018 - mwilck@suse.com - -- Update to version 15.0.1 (git 5c63319): -- Use /etc/modules-load.d/sg.conf for sg driver autoloading - (bsc#1036463) - * added /etc/modules-load.d/sg.conf - -------------------------------------------------------------------- -Mon Nov 05 10:08:19 UTC 2018 - mwilck@suse.com - -- version 15.0 (git 6ce3011) -- modsign-verify: support for parsing PKCS#7 signatures - (bsc#1111300, bsc#1105495) -- Fix logic for unsupported modules (bsc#1111183) - * SLES15: allow unsupported modules only if kernel-default-extra - from SLE-WE module is installed - * Always allow unsupported modules on Leap 15 and Factory - * No change for SLE12 / Leap 42.x and below - * 10-unsupported-modules.conf: improved comments - * fix %config(noreplace) logic for 10-unsupported-modules.conf -- added udev rule 81-sg.rules to make sure the sg module is - always loaded (bsc#1036463) - -------------------------------------------------------------------- -Wed Jul 26 08:07:29 UTC 2017 - tchvatal@suse.com - -- Use path dependency that is not parsed by obs to ensure we - are not pulling systemd everywhere - -------------------------------------------------------------------- -Mon Jun 19 12:58:04 UTC 2017 - tchvatal@suse.com - -- Set url to github project and repack using obs service -- Cleanup a bit with spec-cleaner -- Grep os-release and not deprecated SuSE-release - -------------------------------------------------------------------- -Thu Sep 8 08:55:50 UTC 2016 - dmueller@suse.com - -- blacklist efifb on aarch64 (bsc#996080) - -------------------------------------------------------------------- -Fri May 27 13:14:36 UTC 2016 - mmarek@suse.cz - -- Run dos2unix on the modhash script. - -------------------------------------------------------------------- -Thu May 26 07:36:58 UTC 2016 - jlee@suse.com - -- Add modhash tool to calculate hash of signed module. - It strips X.509 or PKCS#7 signature before hash kernel module. - (fate#319460) - -------------------------------------------------------------------- -Wed May 25 13:23:35 UTC 2016 - mmarek@suse.cz - -- Remove -x bit from 50-kernel-uname_r.conf (bsc#981291). - -------------------------------------------------------------------- -Fri Apr 29 11:31:46 UTC 2016 - mmarek@suse.cz - -- Ignore failures when loading the kernel sysctl (bsc#977715). - -------------------------------------------------------------------- -Thu Apr 28 20:15:31 UTC 2016 - mmarek@suse.com - -- Add a systemd service to load /boot/sysctl.conf-`uname -r` - (bsc#977715). - -------------------------------------------------------------------- -Fri Apr 1 11:43:32 UTC 2016 - mmarek@suse.cz - -- Skip KMPs built from the kernel spec file directly (fate#319339) -- Bump version number to 12.4 - -------------------------------------------------------------------- -Tue Feb 23 10:43:39 UTC 2016 - lnussel@suse.de - -- add missing requirements on module-init-tools, findutils and gzip, - mkinitrd (bnc#965830) - -------------------------------------------------------------------- -Fri Jan 15 23:04:41 UTC 2016 - bpoirier@suse.com - -- Add module option ib_mthca.catas_reset_disable=1 on ppc64le (bsc#456389). - -------------------------------------------------------------------- -Tue Oct 13 08:35:32 UTC 2015 - mmarek@suse.cz - -- Revert change for fate#319339, as some 3rd party KMPs are built - with a modified template (bsc#949862). - -------------------------------------------------------------------- -Tue Sep 8 12:52:15 UTC 2015 - trenn@suse.de - -- Use /run instead of deprecated /var/run - This can have sever consequences if this package uses /var/run. It may - be installed before filesystem package generating the /run tmpfs and - predict it to generate the link /var/run -> /run. Later dracut convertfs - kicks in to generate it, but it has issues. bsc#922676 - -------------------------------------------------------------------- -Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz - -- Only handle KMPs that are built using the %kernel_module_package - macro (preparatory work for fate#319339). - -------------------------------------------------------------------- -Tue Jun 23 14:39:46 UTC 2015 - mmarek@suse.cz - -- Use absolute path to mkinitrd (bsc#935566) - -------------------------------------------------------------------- -Fri May 16 08:36:15 UTC 2014 - mmarek@suse.cz - -- Add kgraft/ to the depmod search list (fate#313296) - -------------------------------------------------------------------- -Mon May 5 17:15:37 UTC 2014 - tonyj@suse.com - -- Add support for ARM zImage to weak-modules2 - -------------------------------------------------------------------- -Tue Apr 15 14:32:55 UTC 2014 - mmarek@suse.cz - -- weak-modules2: Use lsinitrd to list the modules in an initrd, so - that initrds with early microcode work (bnc#873209, bnc#873113). - -------------------------------------------------------------------- -Fri Apr 4 14:32:48 UTC 2014 - mmarek@suse.cz - -- weak-modules2: Run mkinitrd in posttrans if $INITRD_IN_POSTTRANS - is set (fate#313506) - -------------------------------------------------------------------- -Fri Apr 4 13:34:09 UTC 2014 - mmarek@suse.cz - -- regenerate-initrd-posttrans: Run mkinitrd_setup - -------------------------------------------------------------------- -Fri Apr 4 12:13:18 UTC 2014 - mmarek@suse.cz - -- Add macros for regenerating the initrd in %posttrans - (fate#313506). - -------------------------------------------------------------------- -Mon Mar 31 09:11:16 UTC 2014 - mmarek@suse.cz - -- Use softdep to order {u,o,e}hci-hcd drivers. -- Drop ia64 modprobe config. - -------------------------------------------------------------------- -Fri Mar 28 14:25:25 UTC 2014 - mmarek@suse.cz - -- Add kmp-install tool for easier installation of SolidDriver KMPs - (fate#314581). - -------------------------------------------------------------------- -Tue Mar 11 12:57:36 UTC 2014 - mmarek@suse.cz - -- Add modsign-verify tool to verify signatures of modules - (fate#314507). - -------------------------------------------------------------------- -Tue Mar 11 12:38:39 UTC 2014 - mmarek@suse.cz - -- weak-modules2: Support XZ compressed initrds (bnc#778119, - bnc#867312) - -------------------------------------------------------------------- -Mon Mar 10 15:08:15 UTC 2014 - mmarek@suse.cz - -- The package cannot be noarch, because it installs different - configs for different architectures. -- Install 10-unsupported-modules.conf unconditionally, kmod has - been patched. - -------------------------------------------------------------------- -Fri Feb 7 13:05:20 UTC 2014 - rsalevsky@suse.com - -- load the uas driver simulsimultaneously with the usb_storage driver and vice versa (bnc#862397) - -------------------------------------------------------------------- -Wed May 29 12:44:00 UTC 2013 - schwab@suse.de - -- weak-modules{,2}: also look for Image-$krel for aarch64 - -------------------------------------------------------------------- -Sun Mar 17 20:04:12 UTC 2013 - crrodriguez@opensuse.org - -- The "allow_unsupported_modules" feature, does not belong too - openSUSE, kmod (and hence udev and systemd) do not understand - it in anyway. limit to SLE only. - -------------------------------------------------------------------- -Wed Nov 14 18:31:35 UTC 2012 - jengelh@inai.de - -- New package. Split SUSE-specific scripts from module-init-tools, - so that we can actually get a system with kmod-compat running. diff --git a/_servicedata b/_servicedata index 39c65d3..b36d1dd 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 31b83356f95d05bd06fbddc0e023635aa0fc50cd \ No newline at end of file + 37a04d84cbeaf0540e6771e8d8f7c8ec10c61df7 \ No newline at end of file diff --git a/_service:obs_scm:suse-module-tools-15.4.0.obscpio b/suse-module-tools-15.4.0.obscpio similarity index 100% rename from _service:obs_scm:suse-module-tools-15.4.0.obscpio rename to suse-module-tools-15.4.0.obscpio diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 66f0c62..f1d3910 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 13 15:24:23 UTC 2021 - obs-service-tar-scm@invalid + +- Update to version 15.4.0: + * Bump version to 15.4.0 + * Enable f2fs (bsc#1184415) + ------------------------------------------------------------------- Mon Nov 02 17:03:42 UTC 2020 - mwilck@suse.com diff --git a/_service:obs_scm:suse-module-tools.obsinfo b/suse-module-tools.obsinfo similarity index 100% rename from _service:obs_scm:suse-module-tools.obsinfo rename to suse-module-tools.obsinfo diff --git a/suse-module-tools.spec b/suse-module-tools.spec index a5175fa..215431d 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,14 +21,14 @@ %define modules_load_dir /usr/lib/modules-load.d # List of legacy file systems to be blacklisted by default -%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs f2fs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs +%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs %if 0%{?sle_version} >= 120200 && 0%{?sle_version} < 150000 %global softdep_br_netfilter 1 %endif Name: suse-module-tools -Version: 15.3.5 +Version: 15.4.0 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -63,6 +63,7 @@ uninstallation, as well as default configuration files for depmod and modprobe. These utilities are provided by kmod-compat or module-init-tools, whichever implementation you choose to install. + %package legacy Summary: Legacy "weak-modules" script for Code10 Group: System/Base From c6159bc123f3c5ab4c650edbb9958b764348265391e86321f11424b357b48ab0 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 15 Apr 2021 09:26:36 +0000 Subject: [PATCH 3/4] merged and disabled server-side source services for Factory OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=100 --- suse-module-tools.changes | 1 - suse-module-tools.spec | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/suse-module-tools.changes b/suse-module-tools.changes index f1d3910..2312800 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -2,7 +2,6 @@ Tue Apr 13 15:24:23 UTC 2021 - obs-service-tar-scm@invalid - Update to version 15.4.0: - * Bump version to 15.4.0 * Enable f2fs (bsc#1184415) ------------------------------------------------------------------- diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 215431d..0ebecb4 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2020 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 @@ -63,7 +63,6 @@ uninstallation, as well as default configuration files for depmod and modprobe. These utilities are provided by kmod-compat or module-init-tools, whichever implementation you choose to install. - %package legacy Summary: Legacy "weak-modules" script for Code10 Group: System/Base From f6475488414635a652f769ebaa38beafb028335a0b6f55046ab4cf0b5bf5413c Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 15 Apr 2021 15:42:17 +0000 Subject: [PATCH 4/4] Re-adding the obs_scm and extract_files services in manual mode (had been deleted by "osc service merge") OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=101 --- _service | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/_service b/_service index 7ee2837..812e8c0 100644 --- a/_service +++ b/_service @@ -1,4 +1,19 @@ + + https://github.com/openSUSE/suse-module-tools.git + git + enable + suse-module-tools + @PARENT_TAG@+@TAG_OFFSET@ + ([^+]*)\+0 + master + *.rpmlintrc + + + *.obscpio + */suse-module-tools.spec + suse-module-tools.spec + *.tar