diff --git a/_service b/_service index c93545d..25c0c6b 100644 --- a/_service +++ b/_service @@ -8,14 +8,15 @@ \+0$ master - *.spec *.rpmlintrc - - suse-module-tools - - + *.tar xz + + *.tar.xz + */suse-module-tools.spec + suse-module-tools.spec + diff --git a/_servicedata b/_servicedata index c9e841f..44a1fe2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - ee68844d60e97a584f4f67fc0c274b5f83f38bb6 \ No newline at end of file + 5def500a75de25a50a156ebf1af7233c386e0aa2 \ No newline at end of file diff --git a/suse-module-tools-15.3.2.tar.xz b/suse-module-tools-15.3.2.tar.xz deleted file mode 100644 index 8f2e97e..0000000 --- a/suse-module-tools-15.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f74562e951ad5912d9d580f5006233192f41fb5fbfe5e7fb2d7211643b24ab14 -size 25328 diff --git a/suse-module-tools-15.3.3.tar.xz b/suse-module-tools-15.3.3.tar.xz new file mode 100644 index 0000000..0ceb84c --- /dev/null +++ b/suse-module-tools-15.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5880b4bfd5d39d52df450462daeb05c6bd34683a6508d940cfc2181bf4dce73 +size 27976 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 02c768d..4860720 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +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 diff --git a/suse-module-tools.spec b/suse-module-tools.spec index a982bf3..ee5f91f 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -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