Accepting request 900614 from Base:System

- Update to version 16.0.4:
  * re-add legacy subpackage with "weak-modules", and add a
    "Supplements" dependency on dkms, which needs it (forwarded request 900613 from mwilck)

OBS-URL: https://build.opensuse.org/request/show/900614
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-module-tools?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger 2021-06-21 18:35:02 +00:00 committed by Git OBS Bridge
commit 8cbe8572b3
8 changed files with 61 additions and 19 deletions

View File

@ -1,3 +1,4 @@
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
@ -14,6 +15,7 @@
<param name="files">*/suse-module-tools.spec</param>
<param name="outfilename">suse-module-tools.spec</param>
</service>
<service name="set_version" mode="manual"/>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>

View File

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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e048038228685ca609cc8c1f9efb57fdecef0edb84819fb7ecfba45c33063536
size 99339

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a4186329fde129bd7de4ad88612e7eb4c62a8f8b18486f6058b46448b59222dc
size 93707

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Thu Jun 17 14:43:13 UTC 2021 - mwilck@suse.com
- Update to version 16.0.4:
* re-add legacy subpackage with "weak-modules", and add a
"Supplements" dependency on dkms, which needs it
-------------------------------------------------------------------
Thu Jun 17 13:10:42 UTC 2021 - mwilck@suse.com
- Update to version 16.0.3:
* Fix treatment of compressed modules (bsc#1187093)
-------------------------------------------------------------------
Thu Jun 10 08:41:47 UTC 2021 - mwilck@suse.com
- Update to version 16.0.2:
* fix kernel version in dracut invocation (bug in 16.0.0)
* spec file: really fix ppc64/ppc64le
-------------------------------------------------------------------
Thu May 27 19:13:05 UTC 2021 - mwilck@suse.com
- Update to version 16.0.1:
* fix ppc64/ppc64le build
-------------------------------------------------------------------
Thu May 27 09:29:56 UTC 2021 - mwilck@suse.com
- Update to version 16.0.0
- modprobe.conf cleanup (bsc#1161343)
* Unify ppc64 and ppc64le
* Delete files for obsolete architectures
* Remove obsolete SUSE_INITRD statements (bsc#1161343)
* Add dependency on dracut 049.1 (bsc#1142152, ltc#176292, FATE#327775)
- Replace mkinitrd with dracut everywhere
- Remove obsolete "weak-modules" script
-------------------------------------------------------------------
Thu Apr 22 16:29:01 UTC 2021 - obs-service-tar-scm@invalid

View File

@ -1,5 +1,5 @@
name: suse-module-tools
version: 15.4.1
mtime: 1619108342
commit: f4a9c82b6e4964fed422119264ac944330b68d85
version: 16.0.4
mtime: 1623940916
commit: fe422e7058c691493567eeffc162f278b2120549

View File

@ -1,2 +1,3 @@
# The package installs different configs for different architectures
addFilter("no-binary");

View File

@ -28,7 +28,7 @@
%endif
Name: suse-module-tools
Version: 15.4.1
Version: 16.0.4
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities for KMPs
License: GPL-2.0-or-later
@ -45,17 +45,13 @@ 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
# Use weak dependencies for dracut 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: dracut
Recommends: kmod
%else
Recommends: modutils
%endif
# This release requires the dracut fix for bsc#1127891
Conflicts: dracut < 44.2
# This release requires the dracut module 90nvdimm
Conflicts: dracut < 49.1
%description
This package contains helper scripts for KMP installation and
@ -63,16 +59,18 @@ 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
Supplements: dkms
%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.
SLE 11 and later. It is still used by the DKMS module packaging framework.
%prep
%setup -q
@ -82,6 +80,9 @@ SLE 11 and later.
%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
@ -127,7 +128,7 @@ install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.s
# 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
%ifarch ppc64 ppc64le
install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators
%endif
@ -271,7 +272,7 @@ done
%{_unitdir}/systemd-sysctl.service.d
%dir %{modules_load_dir}
%{modules_load_dir}/sg.conf
%ifarch ppc64le
%ifarch ppc64 ppc64le
/usr/lib/systemd/system-generators
%endif