diff --git a/_service b/_service index 7a80918..d8c522a 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ git enable suse-module-tools - 15.0 - 15.0 + 15.0.1 + 15.0.1 *.spec *.rpmlintrc diff --git a/_servicedata b/_servicedata index fd73073..58c3f66 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 48696deb44b821a6c255b88da643912b2998aee9 \ No newline at end of file + 5c6331938afd2e9250b60450d458bd9297f0d2cf \ No newline at end of file diff --git a/suse-module-tools-15.0.1.tar.xz b/suse-module-tools-15.0.1.tar.xz new file mode 100644 index 0000000..38cc081 --- /dev/null +++ b/suse-module-tools-15.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f090075efe7f9f414eec855dde3c2355ca6621db036adecbee5694adacb6531 +size 27980 diff --git a/suse-module-tools-15.0.tar.xz b/suse-module-tools-15.0.tar.xz deleted file mode 100644 index 7244724..0000000 --- a/suse-module-tools-15.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc0a4958050532c429bef85dfac22c709236c2320896c215acb18dff292819ed -size 28012 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index d7c37c5..ac6494d 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 3f76ebb..ce43386 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -17,7 +17,7 @@ Name: suse-module-tools -Version: 15.0 +Version: 15.0.1 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -35,11 +35,6 @@ Requires: gzip Requires: /sbin/depmod Requires: rpm Requires: sed -# For SLE11-SP4 -%if 0%{suse_version} < 1200 -BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif %description This package contains helper scripts for KMP installation and @@ -88,19 +83,16 @@ install -pm 755 kmp-install "%{buildroot}%{_bindir}/" # modhash for calculating hash of signed kernel module install -pm 755 modhash "%{buildroot}%{_bindir}/" -%if 0%{suse_version} >= 1200 # systemd service to load /boot/sysctl.conf-`uname -r` install -d -m 755 "%{buildroot}%{_libexecdir}/systemd/system/systemd-sysctl.service.d" install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_libexecdir}/systemd/system/systemd-sysctl.service.d" -%endif -# udev rule to load sg if necessary, and after type-specific driver -install -d -m 755 "%{buildroot}%{_libexecdir}/udev/rules.d" -install -pm 644 81-sg.rules "%{buildroot}%{_libexecdir}/udev/rules.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}%{_sysconfdir}/modules-load.d" +install -pm 644 sg.conf "%{buildroot}%{_sysconfdir}/modules-load.d" -%if 0%{suse_version} >= 1200 mkdir -p %{buildroot}%{_defaultlicensedir} -%endif %post %if 0%{?sle_version} >= 150000 @@ -173,14 +165,10 @@ fi %files %defattr(-,root,root) -%if 0%{suse_version} >= 1200 %if 0%{?sle_version:%{sle_version}}%{!?sle_version:150000} <= 120200 %dir %{_defaultlicensedir} %endif %license LICENSE -%else -%doc LICENSE -%endif %doc README.SUSE %dir %{_sysconfdir}/modprobe.d %config %{_sysconfdir}/modprobe.d/00-system.conf @@ -193,13 +181,8 @@ fi %{_bindir}/kmp-install %{_bindir}/modsign-verify %{_libexecdir}/module-init-tools -%if 0%{?suse_version} >= 1200 %{_libexecdir}/systemd/system/systemd-sysctl.service.d -%endif -%if 0%{?sle_version} <= 120200 -%dir %{_libexecdir}/udev -%endif -%dir %{_libexecdir}/udev/rules.d -%{_libexecdir}/udev/rules.d/81-sg.rules +%dir %{_sysconfdir}/modules-load.d +%config(noreplace) %{_sysconfdir}/modules-load.d/sg.conf %changelog