Accepting request 646506 from home:mwilck:branches:Base:System

- version 15.0 (git 6ce3011)
  * SLES15: allow unsupported modules only if kernel-default-extra
  from SLE-WE module is installed

OBS-URL: https://build.opensuse.org/request/show/646506
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=45

_service

@@ -6,6 +6,8 @@
     <param name="filename">suse-module-tools</param>
     <param name="version">15.0</param>
     <param name="revision">15.0</param>
+    <param name="exclude">*.spec</param>
+    <param name="exclude">*.rpmlintrc</param>
   </service>
   <service mode="disabled" name="recompress">
     <param name="file">*.tar</param>

_servicedata

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

suse-module-tools-15.0.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b6793b083e35f9d3089cf4dffb64be4c8aa453640c334f74579b0fb0a1159e8
-size 30016
+oid sha256:dc0a4958050532c429bef85dfac22c709236c2320896c215acb18dff292819ed
+size 28012

suse-module-tools.changes

@@ -1,12 +1,12 @@
 -------------------------------------------------------------------
-Fri Nov 02 20:44:37 UTC 2018 - mwilck@suse.com
+Mon Nov 05 10:08:19 UTC 2018 - mwilck@suse.com
 
-- version 15.0
+- 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 SLE WE is installed
-    (new package suse-module-tools-we overrides policy)
+  * 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

suse-module-tools.spec

@@ -24,7 +24,7 @@ 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
+Source1:        %{name}.rpmlintrc
 Requires:       /sbin/mkinitrd
 Requires:       binutils
 Requires:       coreutils
@@ -46,23 +46,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.
 
-%if 0%{?sle_version} >= 150000
-%if 0%{?is_opensuse} == 0
-%package we
-Summary:        Configuration module for Workstation Extension
-Group:          System/Base
-Requires:       %{name} >= %{version}
-Supplements:    kernel-default-extra
-
-%description we
-This package contains a configuration file that allows loading
-unsupported kernel modules. This is necessary to load modules
-from the kernel-default-extra package from the SUSE Linux Enterprise
-Workstation Extension module.
-
-%endif
-%endif
-
 %prep
 %setup -q
 
@@ -81,15 +64,6 @@ fi
 install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d"
 install -pm644 "10-unsupported-modules.conf" \
 	"%{buildroot}%{_sysconfdir}/modprobe.d/"
-%if 0%{?sle_version} >= 150000
-%if 0%{?is_opensuse} == 0
-cat >"%{buildroot}%{_sysconfdir}/modprobe.d/20-unsupported-modules-we.conf" <<EOF
-# This overrides the default from 10-unsupported-modules.conf
-# Necessary to load modules from kernel-default-extra
-allow_unsupported_modules 1
-EOF
-%endif
-%endif
 install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/"
 install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf"
 install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d"
@@ -227,12 +201,4 @@ fi
 %dir %{_libexecdir}/udev/rules.d
 %{_libexecdir}/udev/rules.d/81-sg.rules
 
-%if 0%{?sle_version} >= 150000
-%if 0%{?is_opensuse} == 0
-%files we
-%defattr(-,root,root)
-%config /etc/modprobe.d/20-unsupported-modules-we.conf
-%endif
-%endif
-
 %changelog