1
0

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

- 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-4085)
  * spec: use br_netfilter softdep only for SLE12
  (jsc#SLE-12255, bsc#1166531, boo#1158817, bsc#937216)

OBS-URL: https://build.opensuse.org/request/show/809697
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=86
This commit is contained in:
Martin Wilck 2020-05-27 21:10:59 +00:00 committed by Git OBS Bridge
parent 4bf2181ccd
commit aac00d2a85
7 changed files with 32 additions and 20 deletions

View File

@ -1,5 +1,5 @@
<services>
<service mode="disabled" name="tar_scm">
<service mode="disabled" name="obs_scm">
<param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
@ -8,14 +8,19 @@
<param name="versionrewrite-pattern">\+0$</param>
<param name="versionrewrite-replacement"></param>
<param name="revision">master</param>
<param name="exclude">*.spec</param>
<param name="exclude">*.rpmlintrc</param>
</service>
<service mode="disabled" name="set_version">
<param name="basename">suse-module-tools</param>
<service mode="disabled" name="extract_file">
<param name="archive">*.obscpio</param>
<param name="files">*/suse-module-tools.spec</param>
<param name="outfilename">suse-module-tools.spec</param>
</service>
<service mode="disabled" name="recompress">
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<!-- <service mode="disabled" name="set_version">
<param name="basename">suse-module-tools</param>
</service> -->
</services>

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">ee68844d60e97a584f4f67fc0c274b5f83f38bb6</param></service></servicedata>
<param name="changesrevision">5def500a75de25a50a156ebf1af7233c386e0aa2</param></service></servicedata>

View File

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

View File

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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-4085)
* 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

View File

@ -0,0 +1,5 @@
name: suse-module-tools
version: 15.3.3
mtime: 1590612157
commit: 5def500a75de25a50a156ebf1af7233c386e0aa2

View File

@ -21,19 +21,14 @@
%define modules_load_dir /usr/lib/modules-load.d
# List of legacy file systems to be blacklisted by default
%if 0%{?is_opensuse}
%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs f2fs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs
%else
# SLE only ships a few of them
%global fs_blacklist cramfs ufs
%endif
%if 0%{?sle_version} >= 120200 && 0%{?is_opensuse} == 0
%if 0%{?sle_version} >= 120200 && 0%{?sle_version} < 150000
%global softdep_br_netfilter 1
%endif
Name: suse-module-tools
Version: 15.3.2
Version: 15.3.3
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities for KMPs
License: GPL-2.0-or-later
@ -81,10 +76,6 @@ SLE 11 and later.
%setup -q
%build
%if 0%{?is_opensuse} == 0
sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \
10-unsupported-modules.conf
%endif
%install
# now assemble the parts for modprobe.conf