commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2020-11-10 13:38:25 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.11331 (New) Package is "suse-module-tools" Tue Nov 10 13:38:25 2020 rev:38 rq:846084 version:15.3.5 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2020-08-31 16:47:29.212274035 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.11331/suse-module-tools.changes 2020-11-10 13:39:10.832506031 +0100 @@ -1,0 +2,6 @@ +Mon Nov 02 17:03:42 UTC 2020 - mwi...@suse.com + +- Update to version 15.3.5: + * Skip coldplug for memory devices on ppc64le, using generator + +--- @@ -5,0 +12,6 @@ + +--- +Mon Aug 03 21:05:03 UTC 2020 - mwi...@suse.com + +- Update to version 15.3.4: + * rework dependencies to reduce system size for small OS Old: suse-module-tools-15.3.4.tar.xz New: suse-module-tools-15.3.5.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.e4aTEU/_old 2020-11-10 13:39:11.312505077 +0100 +++ /var/tmp/diff_new_pack.e4aTEU/_new 2020-11-10 13:39:11.316505070 +0100 @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version:15.3.4 +Version:15.3.5 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -128,6 +128,10 @@ # 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 +install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators +install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators +%endif mkdir -p %{buildroot}%{_defaultlicensedir} @@ -268,6 +272,9 @@ %{_unitdir}/systemd-sysctl.service.d %dir %{modules_load_dir} %{modules_load_dir}/sg.conf +%ifarch ppc64le +/usr/lib/systemd/system-generators +%endif %files legacy %defattr(-,root,root) ++ _service ++ --- /var/tmp/diff_new_pack.e4aTEU/_old 2020-11-10 13:39:11.344505014 +0100 +++ /var/tmp/diff_new_pack.e4aTEU/_new 2020-11-10 13:39:11.348505006 +0100 @@ -5,7 +5,7 @@ enable suse-module-tools @PARENT_TAG@+@TAG_OFFSET@ -\+0$ +\+[01]$ master *.rpmlintrc ++ _servicedata ++ --- /var/tmp/diff_new_pack.e4aTEU/_old 2020-11-10 13:39:11.364504974 +0100 +++ /var/tmp/diff_new_pack.e4aTEU/_new 2020-11-10 13:39:11.364504974 +0100 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 241a1582698c6a7f96f877a5ec64f478fdf90c82 \ No newline at end of file + 31b83356f95d05bd06fbddc0e023635aa0fc50cd \ No newline at end of file ++ suse-module-tools-15.3.4.tar.xz -> suse-module-tools-15.3.5.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.3.4/suse-module-tools.spec new/suse-module-tools-15.3.5/suse-module-tools.spec --- old/suse-module-tools-15.3.4/suse-module-tools.spec 2020-08-03 23:04:07.0 +0200 +++ new/suse-module-tools-15.3.5/suse-module-tools.spec 2020-11-04 21:25:21.0 +0100 @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version:15.3.4 +Version:15.3.5 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -128,6 +128,10 @@ # 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 +install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators +install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators +%endif mkdir -p %{buildroot}%{_defaultlicensedir} @@ -268,6 +272,9 @@ %{_unitdir}/systemd-sysctl.service.d %dir %{modules_load_dir} %{modules_load_dir}/sg.conf +%ifarch ppc64le +/usr/lib/systemd/system-generators +%endif %files legacy %defattr(-,root,root) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.3.4/udev-trigger-generator new/suse-module-tools-15.3.5/udev-trigger-generator --- old/suse-module-tools-15.3.4/udev-trigger-generator 1970-01-01 01:00:00.0 +0100 +++ new/suse-module-tools-15.3.5/udev-trigger-generator 2020-11-04 21:25:21.0 +0100 @@ -0,0 +1,32 @@ +#!
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2020-08-31 16:47:24 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.3399 (New) Package is "suse-module-tools" Mon Aug 31 16:47:24 2020 rev:37 rq:829944 version:15.3.4 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2020-06-11 14:42:09.424878376 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.3399/suse-module-tools.changes 2020-08-31 16:47:29.212274035 +0200 @@ -1,0 +2,6 @@ +Tue Aug 25 15:43:20 UTC 2020 - mwi...@suse.com + +- Update to version 15.3.4: + * spec: rework dependencies + +--- Old: suse-module-tools-15.3.3.tar.xz New: suse-module-tools-15.3.4.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.rN8DSw/_old 2020-08-31 16:47:29.940274388 +0200 +++ /var/tmp/diff_new_pack.rN8DSw/_new 2020-08-31 16:47:29.944274390 +0200 @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version:15.3.3 +Version:15.3.4 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -36,12 +36,15 @@ URL:https://github.com/openSUSE/suse-module-tools Source0:%{name}-%{version}.tar.xz Source1:%{name}.rpmlintrc +Requires: /usr/bin/grep +Requires: /usr/bin/gzip +Requires: /usr/bin/sed Requires: coreutils Requires: findutils -Requires: grep -Requires: gzip Requires: rpm -Requires: sed +Requires(post): /usr/bin/grep +Requires(post): /usr/bin/sed +Requires(post): coreutils # Use weak dependencies for mkinitrd and kmod in order to # keep Ring0 lean. In normal deployments, these packages # will be available anyway. ++ _servicedata ++ --- /var/tmp/diff_new_pack.rN8DSw/_old 2020-08-31 16:47:29.992274413 +0200 +++ /var/tmp/diff_new_pack.rN8DSw/_new 2020-08-31 16:47:29.992274413 +0200 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 5def500a75de25a50a156ebf1af7233c386e0aa2 \ No newline at end of file + 241a1582698c6a7f96f877a5ec64f478fdf90c82 \ No newline at end of file ++ suse-module-tools-15.3.3.tar.xz -> suse-module-tools-15.3.4.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.3.3/suse-module-tools.spec new/suse-module-tools-15.3.4/suse-module-tools.spec --- old/suse-module-tools-15.3.3/suse-module-tools.spec 2020-05-27 22:42:37.0 +0200 +++ new/suse-module-tools-15.3.4/suse-module-tools.spec 2020-08-03 23:04:07.0 +0200 @@ -28,7 +28,7 @@ %endif Name: suse-module-tools -Version:15.3.3 +Version:15.3.4 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -36,12 +36,15 @@ URL:https://github.com/openSUSE/suse-module-tools Source0:%{name}-%{version}.tar.xz Source1:%{name}.rpmlintrc +Requires: /usr/bin/grep +Requires: /usr/bin/gzip +Requires: /usr/bin/sed Requires: coreutils Requires: findutils -Requires: grep -Requires: gzip Requires: rpm -Requires: sed +Requires(post): /usr/bin/grep +Requires(post): /usr/bin/sed +Requires(post): coreutils # Use weak dependencies for mkinitrd and kmod in order to # keep Ring0 lean. In normal deployments, these packages # will be available anyway.
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2020-06-11 14:41:38 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.3606 (New) Package is "suse-module-tools" Thu Jun 11 14:41:38 2020 rev:36 rq:811879 version:15.3.3 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2020-04-22 20:42:57.462213519 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.3606/suse-module-tools.changes 2020-06-11 14:42:09.424878376 +0200 @@ -1,0 +2,17 @@ +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 - mwi...@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) + +--- Old: suse-module-tools-15.3.2.tar.xz New: suse-module-tools-15.3.3.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.9skaY7/_old 2020-06-11 14:42:11.096884818 +0200 +++ /var/tmp/diff_new_pack.9skaY7/_new 2020-06-11 14:42:11.100884833 +0200 @@ -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} < 15 %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 @@ %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 ++ _service ++ --- /var/tmp/diff_new_pack.9skaY7/_old 2020-06-11 14:42:11.132884956 +0200 +++ /var/tmp/diff_new_pack.9skaY7/_new 2020-06-11 14:42:11.132884956 +0200 @@ -8,14 +8,15 @@ \+0$ master -*.spec *.rpmlintrc - -suse-module-tools - - + *.tar xz + +*.tar.xz +*/suse-module-tools.spec +suse-module-tools.spec + ++ _servicedata ++ --- /var/tmp/diff_new_pack.9skaY7/_old 2020-06-11 14:42:11.152885033 +0200 +++ /var/tmp/diff_new_pack.9skaY7/_new 2020-06-11 14:42:11.152885033 +0200 @@ -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 ++ suse-module-tools-15.3.2.tar.xz -> suse-module-tools-15.3.3.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.3.2/10-unsupported-modules.conf new/suse-module-tools-15.3.3/10-unsupported-modules.conf --- old/suse-module-tools-15.3.2/10-unsupported-modules.conf2020-04-17 17:48:13.0 +0200 +++ new/suse-module-tools-15.3.3/10-unsupported-modules.conf2020-05-27 22:42:37.0 +0200 @@ -21,4 +21,6 @@ # are marked as "externally supported". Such modules are not regarded as # "unsupported" and thus unaffected by the "allow_unsupported_modules" flag. # -allow_unsupported_modules 1 +# On openSUSE, the kernel doesn't have the feature to recognize supported modules, +# and this flag has no effect. +allow_unsupported_modules 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.3.2/suse-module-tools.spec new/suse-module-tools-15.3.3/suse-module-tools.spec --- old/suse-module-tools-15.3.2/suse-module-tools.spec 1970-01-01 01:00:00.0 +0100 +++ new/suse-module-tools-15.3.3/suse-module-tools.spec 2020-05-27 22:42:37.0 +0200 @@ -0,0 +1,273 @@ +# +# spec file for package suse-module-tools +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2020-04-22 20:42:54 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.2738 (New) Package is "suse-module-tools" Wed Apr 22 20:42:54 2020 rev:35 rq:794962 version:15.3.2 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2020-01-25 13:23:14.192012272 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.2738/suse-module-tools.changes 2020-04-22 20:42:57.462213519 +0200 @@ -1,0 +2,7 @@ +Fri Apr 17 15:32:54 UTC 2020 - mwi...@suse.com + +- Update to version 15.3.2: + * modprobe.conf.common: eliminate circular uas/usb-storage dependency + (bsc#1168661) + +--- Old: suse-module-tools-15.2.10.tar.xz New: suse-module-tools-15.3.2.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.jPl3Yg/_old 2020-04-22 20:42:58.482215516 +0200 +++ /var/tmp/diff_new_pack.jPl3Yg/_new 2020-04-22 20:42:58.486215523 +0200 @@ -33,7 +33,7 @@ %endif Name: suse-module-tools -Version:15.2.10 +Version:15.3.2 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later ++ _servicedata ++ --- /var/tmp/diff_new_pack.jPl3Yg/_old 2020-04-22 20:42:58.526215601 +0200 +++ /var/tmp/diff_new_pack.jPl3Yg/_new 2020-04-22 20:42:58.526215601 +0200 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 88e785968c55e64cbe12f029b047fc4757799a0f \ No newline at end of file + ee68844d60e97a584f4f67fc0c274b5f83f38bb6 \ No newline at end of file ++ suse-module-tools-15.2.10.tar.xz -> suse-module-tools-15.3.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.2.10/modprobe.conf/modprobe.conf.common new/suse-module-tools-15.3.2/modprobe.conf/modprobe.conf.common --- old/suse-module-tools-15.2.10/modprobe.conf/modprobe.conf.common 2020-01-20 15:57:17.0 +0100 +++ new/suse-module-tools-15.3.2/modprobe.conf/modprobe.conf.common 2020-04-17 17:48:13.0 +0200 @@ -88,8 +88,9 @@ options ch init=0 # uas devices can be unpredictably a fallback for both drivers must be present -softdep usb_storage pre: uas -softdep uas pre: usb_storage +# (bnc#862397) +# but avoid circular dependency (bsc#1168661) +softdep usb_storage post: uas # bsc#1100989: cxgb4 needs to be loaded before csiostor (Chelsio request) # SUSE INITRD: csiostor REQUIRES cxgb4
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2020-01-25 13:22:59 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.26092 (New) Package is "suse-module-tools" Sat Jan 25 13:22:59 2020 rev:34 rq:765872 version:15.2.10 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2020-01-18 12:16:28.099085404 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.26092/suse-module-tools.changes 2020-01-25 13:23:14.192012272 +0100 @@ -1,0 +2,7 @@ +Mon Jan 20 15:03:51 UTC 2020 - mwi...@suse.com + +- Update to version 15.2.10: + * ppc64le: fix dependency of papr_scm +(bsc#1142152, ltc#176292, FATE#327775). + +--- Old: suse-module-tools-15.2.9.tar.xz New: suse-module-tools-15.2.10.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.5J3IRl/_old 2020-01-25 13:23:15.628012901 +0100 +++ /var/tmp/diff_new_pack.5J3IRl/_new 2020-01-25 13:23:15.632012903 +0100 @@ -33,7 +33,7 @@ %endif Name: suse-module-tools -Version:15.2.9 +Version:15.2.10 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later ++ _servicedata ++ --- /var/tmp/diff_new_pack.5J3IRl/_old 2020-01-25 13:23:15.668012919 +0100 +++ /var/tmp/diff_new_pack.5J3IRl/_new 2020-01-25 13:23:15.668012919 +0100 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 0009a5445b7cc13072d9bd16ed01fef5e812c091 \ No newline at end of file + 88e785968c55e64cbe12f029b047fc4757799a0f \ No newline at end of file ++ suse-module-tools-15.2.9.tar.xz -> suse-module-tools-15.2.10.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.2.9/modprobe.conf/modprobe.conf.ppc64le new/suse-module-tools-15.2.10/modprobe.conf/modprobe.conf.ppc64le --- old/suse-module-tools-15.2.9/modprobe.conf/modprobe.conf.ppc64le 2020-01-15 21:48:39.0 +0100 +++ new/suse-module-tools-15.2.10/modprobe.conf/modprobe.conf.ppc64le 2020-01-20 15:57:17.0 +0100 @@ -4,7 +4,6 @@ options ib_mthca catas_reset_disable=1 # bsc#1142152 papr_scm requires libnvdimm -# SUSE INITRD: papr_scm REQUIRES libnvdimm +# SUSE INITRD: libnvdimm REQUIRES papr_scm # end of ppc64le part for modprobe.conf -
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2020-01-18 12:14:42 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.26092 (New) Package is "suse-module-tools" Sat Jan 18 12:14:42 2020 rev:33 rq:764809 version:15.2.9 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-11-13 13:12:44.550724193 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.26092/suse-module-tools.changes 2020-01-18 12:16:28.099085404 +0100 @@ -1,0 +2,13 @@ +Wed Jan 15 20:46:40 UTC 2020 - mwi...@suse.com + +- Update to version 15.2.9: + * 00-system.conf: move br_netfilter softdep to separate file +(boo#1158817) + +--- +Thu Jan 09 12:30:58 UTC 2020 - mwi...@suse.com + +- Update to version 15.2.8: + * Add modprobe.conf.s390x (bsc#1132798) + +--- Old: suse-module-tools-15.2.7.tar.xz New: suse-module-tools-15.2.9.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.3h5t75/_old 2020-01-18 12:16:28.679085716 +0100 +++ /var/tmp/diff_new_pack.3h5t75/_new 2020-01-18 12:16:28.687085720 +0100 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,13 +28,17 @@ %global fs_blacklist cramfs ufs %endif +%if 0%{?sle_version} >= 120200 && 0%{?is_opensuse} == 0 +%global softdep_br_netfilter 1 +%endif + Name: suse-module-tools -Version:15.2.7 +Version:15.2.9 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later Group: System/Base -Url:https://github.com/openSUSE/suse-module-tools +URL:https://github.com/openSUSE/suse-module-tools Source0:%{name}-%{version}.tar.xz Source1:%{name}.rpmlintrc Requires: coreutils @@ -92,6 +96,11 @@ install -pm644 "10-unsupported-modules.conf" \ "%{buildroot}%{_sysconfdir}/modprobe.d/" install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/" + +%if 0%{?softdep_br_netfilter} +# softdep bridge->br_netfilter, SLE only +install -pm644 modprobe.conf/00-system-937216.conf %{buildroot}%{_sysconfdir}/modprobe.d +%endif %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf" %endif @@ -245,6 +254,9 @@ %doc README.SUSE %dir %{_sysconfdir}/modprobe.d %config %{_sysconfdir}/modprobe.d/00-system.conf +%if 0%{?softdep_br_netfilter} +%config(noreplace) %{_sysconfdir}/modprobe.d/00-system-937216.conf +%endif %config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 %config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf ++ _servicedata ++ --- /var/tmp/diff_new_pack.3h5t75/_old 2020-01-18 12:16:28.743085749 +0100 +++ /var/tmp/diff_new_pack.3h5t75/_new 2020-01-18 12:16:28.743085749 +0100 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - c5dfc586f807831053ac3c47df52b65513b5a42f \ No newline at end of file + 0009a5445b7cc13072d9bd16ed01fef5e812c091 \ No newline at end of file ++ suse-module-tools-15.2.7.tar.xz -> suse-module-tools-15.2.9.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.2.7/modprobe.conf/00-system-937216.conf new/suse-module-tools-15.2.9/modprobe.conf/00-system-937216.conf --- old/suse-module-tools-15.2.7/modprobe.conf/00-system-937216.conf 1970-01-01 01:00:00.0 +0100 +++ new/suse-module-tools-15.2.9/modprobe.conf/00-system-937216.conf 2020-01-15 21:48:39.0 +0100 @@ -0,0 +1,5 @@ +# Since kernel 3.18 br_netfilter is needed to pass bridged packets to +# netfilter. Load br_netfilter automatically to avoid regressions in SLE12 SP2+ +# service packs (bsc#937216). +# Don't use this in openSUSE (bsc#1158817). +softdep bridge post: br_netfilter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.2.7/modprobe.conf/modprobe.conf.common new/suse-module-tools-15.2.9/modprobe.conf/modprobe.conf.common ---
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-11-13 13:12:43 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.2990 (New) Package is "suse-module-tools" Wed Nov 13 13:12:43 2019 rev:32 rq:746407 version:15.2.7 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-08-27 11:59:57.451662855 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.2990/suse-module-tools.changes 2019-11-13 13:12:44.550724193 +0100 @@ -1,0 +2,13 @@ +Thu Nov 07 20:34:15 UTC 2019 - mwi...@suse.com + +- Update to version 15.2.7: + * spec file: avoid %{_libexecdir} + +--- +Thu Nov 07 19:48:05 UTC 2019 - mwi...@suse.com + +- Update to version 15.2.6: + * modprobe.conf: add dependency of papr_scm on libnvdimm +(bsc#1142152, ltc#176292, FATE#327775). + +--- Old: suse-module-tools-15.2.5.tar.xz New: suse-module-tools-15.2.7.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.qoIKhd/_old 2019-11-13 13:12:45.046724708 +0100 +++ /var/tmp/diff_new_pack.qoIKhd/_new 2019-11-13 13:12:45.046724708 +0100 @@ -29,7 +29,7 @@ %endif Name: suse-module-tools -Version:15.2.5 +Version:15.2.7 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -100,10 +100,10 @@ install -pm 644 "depmod-00-system.conf" \ "%{buildroot}%{_sysconfdir}/depmod.d/00-system.conf" -# "module-init-tools" name hardcoded in KMPs, mkinitrd, etc. -install -d -m 755 "%{buildroot}%{_libexecdir}/module-init-tools" -install -pm 755 weak-modules{,2} "%{buildroot}%{_libexecdir}/module-init-tools/" -install -pm 755 driver-check.sh "%{buildroot}%{_libexecdir}/module-init-tools/" +# "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc. +install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" +install -pm 755 weak-modules{,2} "%{buildroot}/usr/lib/module-init-tools/" +install -pm 755 driver-check.sh "%{buildroot}/usr/lib/module-init-tools/" %if 0%{?suse_version} < 1550 # rpm macros and helper @@ -112,14 +112,14 @@ install -d -m 755 "%{buildroot}%{_rpmmacrodir}" install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" %endif -install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}%{_libexecdir}/module-init-tools/" +install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/" install -d -m 755 "%{buildroot}%{_prefix}/bin" install -pm 755 kmp-install "%{buildroot}%{_bindir}/" # 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" +install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d" +install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.service.d" # Ensure that the sg driver is loaded early (bsc#1036463) # Not needed in SLE11, where sg is loaded via udev rule. @@ -257,15 +257,14 @@ %{_rpmmacrodir}/macros.initrd %endif %{_bindir}/kmp-install -%{_libexecdir}/module-init-tools -%exclude %{_libexecdir}/module-init-tools/weak-modules -%{_libexecdir}/systemd/system/systemd-sysctl.service.d +/usr/lib/module-init-tools +%exclude /usr/lib/module-init-tools/weak-modules +%{_unitdir}/systemd-sysctl.service.d %dir %{modules_load_dir} %{modules_load_dir}/sg.conf %files legacy %defattr(-,root,root) - -%{_libexecdir}/module-init-tools/weak-modules +/usr/lib/module-init-tools/weak-modules %changelog ++ _servicedata ++ --- /var/tmp/diff_new_pack.qoIKhd/_old 2019-11-13 13:12:45.082724746 +0100 +++ /var/tmp/diff_new_pack.qoIKhd/_new 2019-11-13 13:12:45.082724746 +0100 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - c60957409705d36e749e9543e9889483b1115774 \ No newline at end of file + c5dfc586f807831053ac3c47df52b65513b5a42f \ No newline at end of file ++ suse-module-tools-15.2.5.tar.xz -> suse-module-tools-15.2.7.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.2.5/modprobe.conf/modprobe.conf.ppc64le new/suse-module-tools-15.2.7/modprobe.conf/modprobe.conf.ppc64le --- old/suse-module-tools-15.2.5/modprobe.conf/modprobe.conf.ppc64le 2019-08-16 10:44:32.0 +0200 +++
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-08-27 11:59:52 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.7948 (New) Package is "suse-module-tools" Tue Aug 27 11:59:52 2019 rev:31 rq:723940 version:15.2.5 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-07-21 11:28:36.516835440 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.7948/suse-module-tools.changes 2019-08-27 11:59:57.451662855 +0200 @@ -1,0 +2,6 @@ +Fri Aug 16 08:46:15 UTC 2019 - mwi...@suse.com + +- Update to version 15.2.5: + * remove 'modhash' - moved to mokutil package (jsc#SLE-6094) + +--- Old: suse-module-tools-15.2.4.tar.xz New: suse-module-tools-15.2.5.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.KxHCxe/_old 2019-08-27 11:59:59.131662622 +0200 +++ /var/tmp/diff_new_pack.KxHCxe/_new 2019-08-27 11:59:59.131662622 +0200 @@ -29,7 +29,7 @@ %endif Name: suse-module-tools -Version:15.2.4 +Version:15.2.5 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -116,8 +116,6 @@ install -d -m 755 "%{buildroot}%{_prefix}/bin" install -pm 755 kmp-install "%{buildroot}%{_bindir}/" -# modhash for calculating hash of signed kernel module -install -pm 755 modhash "%{buildroot}%{_bindir}/" # systemd service to load /boot/sysctl.conf-`uname -r` install -d -m 755 "%{buildroot}%{_libexecdir}/systemd/system/systemd-sysctl.service.d" @@ -258,7 +256,6 @@ %if 0%{?suse_version} < 1550 %{_rpmmacrodir}/macros.initrd %endif -%{_bindir}/modhash %{_bindir}/kmp-install %{_libexecdir}/module-init-tools %exclude %{_libexecdir}/module-init-tools/weak-modules ++ _servicedata ++ --- /var/tmp/diff_new_pack.KxHCxe/_old 2019-08-27 11:59:59.159662618 +0200 +++ /var/tmp/diff_new_pack.KxHCxe/_new 2019-08-27 11:59:59.159662618 +0200 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - cff4830822fe2ba4e40649b58c70e3b178d003fc \ No newline at end of file + c60957409705d36e749e9543e9889483b1115774 \ No newline at end of file ++ suse-module-tools-15.2.4.tar.xz -> suse-module-tools-15.2.5.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.2.4/modhash new/suse-module-tools-15.2.5/modhash --- old/suse-module-tools-15.2.4/modhash2019-07-15 13:55:54.0 +0200 +++ new/suse-module-tools-15.2.5/modhash1970-01-01 01:00:00.0 +0100 @@ -1,149 +0,0 @@ -#!/usr/bin/perl -# -# Calculate the digest of the kernel module -# It will strip kernel modules signature before calculation. -# -# Based on modsign-verify, written by Michal Marek -# Authors: -# Gary Lin -# Joey Lee -# - -my $USAGE = "Usage: modhash [-v] [-q] [-d ] \n"; - -use strict; -use warnings; -use IPC::Open2; -use Getopt::Long; -use File::Temp qw(tempfile); - -my $verbose = 1; -my $dgst = "sha256"; -GetOptions( - "d=s" => \$dgst, - "q|quiet" => sub { $verbose-- if $verbose; }, - "v|verbose" => sub { $verbose++; }, - "h|help" => sub { - print $USAGE; - exit(0); - } -) or die($USAGE); - -sub _verbose { - my $level = shift; - - return if $verbose < $level; - print STDERR @_; -} - -sub info{ _verbose(1, @_); } -sub verbose { _verbose(2, @_); } -sub debug { _verbose(3, @_); } - -if (@ARGV > 1) { - print STDERR "Excess arguments\n"; - die($USAGE); -} elsif (@ARGV < 1) { - print STDERR "No module supplied\n"; - die($USAGE); -} -my $module_name = shift(@ARGV); - -if ($dgst ne "sha"and $dgst ne "sha1" and $dgst ne "sha256" and -$dgst ne "sha384" and $dgst ne "sha512") { - die("unsupported algorithm: $dgst"); -} - -# -# Function to read the contents of a file into a variable. -# -sub read_file($) -{ -my ($file) = @_; -my $contents; -my $len; - -open(FD, "<$file") || die $file; -binmode FD; -my @st = stat(FD); -die $file if (!@st); -$len = read(FD, $contents, $st[7]) || die $file; -close(FD) || die $file; -die "$file: Wanted length ", $st[7], ", got ", $len, "\n" - if ($len != $st[7]); -return $contents; -} - -sub openssl_pipe($$) { - my ($input, $cmd) = @_; - my ($pid, $res); - - $pid = open2(*read_from, *write_to, $cmd) || die $cmd; - binmode
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-07-21 11:28:35 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.4126 (New) Package is "suse-module-tools" Sun Jul 21 11:28:35 2019 rev:30 rq:715471 version:15.2.4 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-07-13 13:34:08.779339829 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.4126/suse-module-tools.changes 2019-07-21 11:28:36.516835440 +0200 @@ -1,0 +2,6 @@ +Mon Jul 15 11:58:07 UTC 2019 - mwi...@suse.com + +- Update to version 15.2.4: + * sg.conf: avoid file conflict with system-tuning-common-SUSE + +--- Old: suse-module-tools-15.2.3.tar.xz New: suse-module-tools-15.2.4.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.p6KxWw/_old 2019-07-21 11:28:37.028835353 +0200 +++ /var/tmp/diff_new_pack.p6KxWw/_new 2019-07-21 11:28:37.032835353 +0200 @@ -29,7 +29,7 @@ %endif Name: suse-module-tools -Version:15.2.3 +Version:15.2.4 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later ++ _servicedata ++ --- /var/tmp/diff_new_pack.p6KxWw/_old 2019-07-21 11:28:37.060835348 +0200 +++ /var/tmp/diff_new_pack.p6KxWw/_new 2019-07-21 11:28:37.060835348 +0200 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 22cf1c54dbe945eb9554b79be090413ad82a16ef \ No newline at end of file + cff4830822fe2ba4e40649b58c70e3b178d003fc \ No newline at end of file ++ suse-module-tools-15.2.3.tar.xz -> suse-module-tools-15.2.4.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.2.3/sg.conf new/suse-module-tools-15.2.4/sg.conf --- old/suse-module-tools-15.2.3/sg.conf2019-07-01 22:14:55.0 +0200 +++ new/suse-module-tools-15.2.4/sg.conf2019-07-15 13:55:54.0 +0200 @@ -1,2 +1 @@ -# load sg module at boot time sg
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-07-13 13:34:07 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.4615 (New) Package is "suse-module-tools" Sat Jul 13 13:34:07 2019 rev:29 rq:712919 version:15.2.3 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-05-17 23:35:39.326157038 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.4615/suse-module-tools.changes 2019-07-13 13:34:08.779339829 +0200 @@ -1,0 +2,27 @@ +Mon Jul 01 20:18:55 UTC 2019 - mwi...@suse.com + +- Update to version 15.2.3: + * softdep of bridge on br_netfilter (bsc#937216, bsc#1134819) + +--- +Tue Jun 18 13:08:07 UTC 2019 - mwi...@suse.com + +- Update to version 15.2.2: + * kmp-install, driver-check.sh, weak-modules2: +Support for compressed kernel modules (bsc#1135854) + +--- +Fri Jun 14 14:52:19 UTC 2019 - mwi...@suse.com + +- Update to version 15.2.1: +- Install sg.conf under /usr/lib/modules-load.d (bsc#1036463) + * sg.conf: avoid file conflict with systemd + +--- +Fri Jun 14 10:06:55 UTC 2019 - mwi...@suse.com + +- Update to version 15.2.0: + * weak-modules2: emit "inconsistent" warning only if replacement fails + (bsc#1127155) + +--- Old: suse-module-tools-15.1.13.tar.xz New: suse-module-tools-15.2.3.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.J6YEN1/_old 2019-07-13 13:34:09.235339708 +0200 +++ /var/tmp/diff_new_pack.J6YEN1/_new 2019-07-13 13:34:09.235339708 +0200 @@ -16,6 +16,10 @@ # +# Define _rpmmacrodir if it's not defined yet +%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d} +%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 @@ -25,7 +29,7 @@ %endif Name: suse-module-tools -Version:15.1.13 +Version:15.2.3 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -121,8 +125,8 @@ # 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" +install -d -m 755 "%{buildroot}%{modules_load_dir}" +install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}" mkdir -p %{buildroot}%{_defaultlicensedir} @@ -259,8 +263,8 @@ %{_libexecdir}/module-init-tools %exclude %{_libexecdir}/module-init-tools/weak-modules %{_libexecdir}/systemd/system/systemd-sysctl.service.d -%dir %{_sysconfdir}/modules-load.d -%config(noreplace) %{_sysconfdir}/modules-load.d/sg.conf +%dir %{modules_load_dir} +%{modules_load_dir}/sg.conf %files legacy %defattr(-,root,root) ++ _servicedata ++ --- /var/tmp/diff_new_pack.J6YEN1/_old 2019-07-13 13:34:09.267339700 +0200 +++ /var/tmp/diff_new_pack.J6YEN1/_new 2019-07-13 13:34:09.267339700 +0200 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 53810546ce76fb4a95fe2cb4ce6a08f41dafb797 \ No newline at end of file + 22cf1c54dbe945eb9554b79be090413ad82a16ef \ No newline at end of file ++ suse-module-tools-15.1.13.tar.xz -> suse-module-tools-15.2.3.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.1.13/driver-check.sh new/suse-module-tools-15.2.3/driver-check.sh --- old/suse-module-tools-15.1.13/driver-check.sh 2019-03-14 16:58:47.0 +0100 +++ new/suse-module-tools-15.2.3/driver-check.sh2019-07-01 22:14:55.0 +0200 @@ -176,7 +176,7 @@ if ! rpm -q -R "$kmp" | grep -Eq "$req_re"; then error "$kmp does not have proper dependencies" fi - exec 3< <(sed -rn 's:^(/lib/modules)?/([^/]*)/(.*\.ko)$:\1 \2 \3:p' \ + exec 3< <(sed -rn 's:^(/lib/modules)?/([^/]*)/(.*\.ko(\.[gx]z)?)$:\1 \2 \3:p' \ "$tmp/rpms/$kmp") while read prefix krel path <&3; do found_module=true @@ -331,7 +331,7 @@ check_krel "$krel" done -modules=($(find /lib/modules/
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-05-17 23:35:38 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.5148 (New) Package is "suse-module-tools" Fri May 17 23:35:38 2019 rev:28 rq:703662 version:15.1.13 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-03-24 14:54:56.375215130 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.5148/suse-module-tools.changes 2019-05-17 23:35:39.326157038 +0200 @@ -1,0 +2,11 @@ +Fri May 17 06:18:33 UTC 2019 - Dominique Leuenberger + +- Only ship RPM macros up to suse_version 1500: after that, the + macros can be found in the rpm-config-SUSE package. + +--- +Fri May 10 09:18:57 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + +--- Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.1EKqjG/_old 2019-05-17 23:35:39.974156697 +0200 +++ /var/tmp/diff_new_pack.1EKqjG/_new 2019-05-17 23:35:39.978156695 +0200 @@ -101,9 +101,13 @@ install -pm 755 weak-modules{,2} "%{buildroot}%{_libexecdir}/module-init-tools/" install -pm 755 driver-check.sh "%{buildroot}%{_libexecdir}/module-init-tools/" +%if 0%{?suse_version} < 1550 # rpm macros and helper -install -d -m 755 "%{buildroot}%{_sysconfdir}/rpm" -install -pm 644 "macros.initrd" "%{buildroot}%{_sysconfdir}/rpm/" +# The RPM Macros have been moved to the package rpm-config-SUSE after CODE15, thus are no longer +# shipped here +install -d -m 755 "%{buildroot}%{_rpmmacrodir}" +install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" +%endif install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}%{_libexecdir}/module-init-tools/" install -d -m 755 "%{buildroot}%{_prefix}/bin" @@ -247,7 +251,9 @@ %config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf %dir %{_sysconfdir}/depmod.d %config %{_sysconfdir}/depmod.d/00-system.conf -%config %{_sysconfdir}/rpm/macros.initrd +%if 0%{?suse_version} < 1550 +%{_rpmmacrodir}/macros.initrd +%endif %{_bindir}/modhash %{_bindir}/kmp-install %{_libexecdir}/module-init-tools
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-03-24 14:54:52 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.25356 (New) Package is "suse-module-tools" Sun Mar 24 14:54:52 2019 rev:27 rq:685081 version:15.1.13 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-02-24 16:53:30.340962554 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.25356/suse-module-tools.changes 2019-03-24 14:54:56.375215130 +0100 @@ -1,0 +2,15 @@ +Thu Mar 14 16:02:23 UTC 2019 - mwi...@suse.com + +- Update to version 15.1.13: + * spec file: add conflicts for dracut < 44.2 (bsc#1127891) + +--- +Thu Mar 14 14:53:24 UTC 2019 - mwi...@suse.com + +- Update to version 15.1.12 (git 1ab0b84): + * modprobe.conf.common: add csiostor->cxgb4 dependency +(bsc#1100989) + * Load fbcon together with virtio_gpu on s390 (bsc#1121996, +fate#327159) + +--- Old: suse-module-tools-15.1.11.tar.xz New: suse-module-tools-15.1.13.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.pGjjU2/_old 2019-03-24 14:54:56.931215072 +0100 +++ /var/tmp/diff_new_pack.pGjjU2/_new 2019-03-24 14:54:56.935215071 +0100 @@ -25,7 +25,7 @@ %endif Name: suse-module-tools -Version:15.1.11 +Version:15.1.13 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -48,6 +48,8 @@ %else Recommends: modutils %endif +# This release requires the dracut fix for bsc#1127891 +Conflicts: dracut < 44.2 %description This package contains helper scripts for KMP installation and ++ _service ++ --- /var/tmp/diff_new_pack.pGjjU2/_old 2019-03-24 14:54:56.979215066 +0100 +++ /var/tmp/diff_new_pack.pGjjU2/_new 2019-03-24 14:54:56.991215065 +0100 @@ -4,11 +4,16 @@ git enable suse-module-tools -15.1.11 +@PARENT_TAG@+@TAG_OFFSET@ +\+0$ + master *.spec *.rpmlintrc + +suse-module-tools + *.tar xz ++ _servicedata ++ --- /var/tmp/diff_new_pack.pGjjU2/_old 2019-03-24 14:54:57.023215062 +0100 +++ /var/tmp/diff_new_pack.pGjjU2/_new 2019-03-24 14:54:57.023215062 +0100 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 54df1924526f53b1860e15be9815277f2095c4a2 \ No newline at end of file + 53810546ce76fb4a95fe2cb4ce6a08f41dafb797 \ No newline at end of file ++ suse-module-tools-15.1.11.tar.xz -> suse-module-tools-15.1.13.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.1.11/modprobe.conf/modprobe.conf.common new/suse-module-tools-15.1.13/modprobe.conf/modprobe.conf.common --- old/suse-module-tools-15.1.11/modprobe.conf/modprobe.conf.common 2019-02-18 12:58:43.0 +0100 +++ new/suse-module-tools-15.1.13/modprobe.conf/modprobe.conf.common 2019-03-14 16:58:47.0 +0100 @@ -91,4 +91,8 @@ softdep usb_storage pre: uas softdep uas pre: usb_storage +# bsc#1100989: cxgb4 needs to be loaded before csiostor (Chelsio request) +# SUSE INITRD: csiostor REQUIRES cxgb4 +softdep csiostor pre: cxgb4 + # end of common part for modprobe.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-15.1.11/modprobe.conf/modprobe.conf.s390 new/suse-module-tools-15.1.13/modprobe.conf/modprobe.conf.s390 --- old/suse-module-tools-15.1.11/modprobe.conf/modprobe.conf.s390 2019-02-18 12:58:43.0 +0100 +++ new/suse-module-tools-15.1.13/modprobe.conf/modprobe.conf.s390 2019-03-14 16:58:47.0 +0100 @@ -40,5 +40,11 @@ alias block-major-35 xpram +# The framebuffer console is built as a module on s390, because it is +# useful only to a KVM guest. But then it should be loaded together +# with the corresponding DRM driver. +# SUSE INITRD: virtio_gpu REQUIRES fbcon +softdep virtio_gpu post: fbcon + # end of s390 part for modprobe.conf
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-02-24 16:53:16 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.28833 (New) Package is "suse-module-tools" Sun Feb 24 16:53:16 2019 rev:26 rq:677421 version:15.1.11 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-02-19 13:54:45.100731436 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.28833/suse-module-tools.changes 2019-02-24 16:53:30.340962554 +0100 @@ -1,0 +2,7 @@ +Mon Feb 18 12:02:27 UTC 2019 - mwi...@suse.com + +- Update to version 15.1.11 (git 54df192): + * spec file: use more gentle wording in blacklist files + * spec file: drop jffs2 and ubifs from blacklist + +--- Old: suse-module-tools-15.1.10.tar.xz New: suse-module-tools-15.1.11.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.CqRKdW/_old 2019-02-24 16:53:30.792962342 +0100 +++ /var/tmp/diff_new_pack.CqRKdW/_new 2019-02-24 16:53:30.792962342 +0100 @@ -18,14 +18,14 @@ # 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 jffs2 jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ubifs ufs +%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 Name: suse-module-tools -Version:15.1.10 +Version:15.1.11 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -124,7 +124,7 @@ for mod in %{fs_blacklist}; do echo "\ # The $mod file system is blacklisted by default because it isn't actively -# supported by SUSE, not well maintained, and may have security vulnerabilites. +# supported by SUSE, not well maintained, or may have security vulnerabilites. # To enable autoloading the $mod file system module, comment out the # \"blacklist $mod\" statement below. ENABLE AT YOUR OWN RISK. # ++ _service ++ --- /var/tmp/diff_new_pack.CqRKdW/_old 2019-02-24 16:53:30.808962334 +0100 +++ /var/tmp/diff_new_pack.CqRKdW/_new 2019-02-24 16:53:30.812962332 +0100 @@ -4,7 +4,7 @@ git enable suse-module-tools -15.1.10 +15.1.11 master *.spec *.rpmlintrc ++ _servicedata ++ --- /var/tmp/diff_new_pack.CqRKdW/_old 2019-02-24 16:53:30.820962328 +0100 +++ /var/tmp/diff_new_pack.CqRKdW/_new 2019-02-24 16:53:30.824962326 +0100 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - b28b13d83209ebdbbb30fe3881462ff86bc46428 \ No newline at end of file + 54df1924526f53b1860e15be9815277f2095c4a2 \ No newline at end of file ++ suse-module-tools-15.1.10.tar.xz -> suse-module-tools-15.1.11.tar.xz ++
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-02-19 13:54:42 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.28833 (New) Package is "suse-module-tools" Tue Feb 19 13:54:42 2019 rev:25 rq:674668 version:15.1.10 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2019-02-06 14:05:23.138671278 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.28833/suse-module-tools.changes 2019-02-19 13:54:45.100731436 +0100 @@ -1,0 +2,6 @@ +Fri Feb 08 10:44:56 UTC 2019 - mwi...@suse.com + +- Update to version 15.1.10 (git b28b13d): +- implemented fs blacklisting logic (jsc#SLES-4085, fate#326832) + +--- Old: suse-module-tools-15.1.0.tar.xz New: suse-module-tools-15.1.10.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.kTOvyu/_old 2019-02-19 13:54:45.864730889 +0100 +++ /var/tmp/diff_new_pack.kTOvyu/_new 2019-02-19 13:54:45.888730872 +0100 @@ -16,8 +16,16 @@ # +# 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 jffs2 jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ubifs ufs +%else +# SLE only ships a few of them +%global fs_blacklist cramfs ufs +%endif + Name: suse-module-tools -Version:15.1.0 +Version:15.1.10 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -112,6 +120,25 @@ mkdir -p %{buildroot}%{_defaultlicensedir} +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +for mod in %{fs_blacklist}; do +echo "\ +# The $mod file system is blacklisted by default because it isn't actively +# supported by SUSE, not well maintained, and may have security vulnerabilites. +# To enable autoloading the $mod file system module, comment out the +# \"blacklist $mod\" statement below. ENABLE AT YOUR OWN RISK. +# +# File system modules loaded at installation time of the %{name} package +# are not blacklisted. This is achieved by commenting out the blacklist +# line in the post-installation script. To prevent the post-installation +# script from modifying this file, delete the line containing \"THIS FILE MAY +# BE MODIFIED\" at the bottom. +blacklist $mod +# __THIS FILE MAY BE MODIFIED__" \ + >%{buildroot}%{_sysconfdir}/modprobe.d/60-blacklist_fs-"$mod".conf +done +%endif + %post %if 0%{?sle_version} >= 15 # Delete obsolete unsupported-modules file from SLE11 @@ -180,6 +207,26 @@ %{_sysconfdir}/modprobe.d/99-local.conf fi +# Avoid systems becoming unbootable by blacklisting filesystem +# modules. Modules loaded at installation time will not be +# blacklisted (the blacklist statement is commented out). +# config(noreplace) makes sure that this is not overwritten by rpm. +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +for mod in %{fs_blacklist}; do + conf=%{_sysconfdir}/modprobe.d/60-blacklist_fs-"$mod".conf + if [ -f "$conf" ] && \ + grep -q '^# __THIS FILE MAY BE MODIFIED__$' "$conf" && \ +sed '/^nodev/d;' /proc/filesystems | grep -q "\<$mod\>"; then + sed -i ' +/^# next line was commented out by postinstall script of %{name}$/d +/^blacklist '"$mod"'/{i\ +# next line was commented out by postinstall script of %{name} +s/^/# / +}' "$conf" + fi +done +%endif + %files %defattr(-,root,root) @@ -193,6 +240,7 @@ %config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 %config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/60-blacklist_fs-*.conf %endif %config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf %dir %{_sysconfdir}/depmod.d ++ _service ++ --- /var/tmp/diff_new_pack.kTOvyu/_old 2019-02-19 13:54:45.960730820 +0100 +++ /var/tmp/diff_new_pack.kTOvyu/_new 2019-02-19 13:54:45.960730820 +0100 @@ -4,7 +4,7 @@ git enable suse-module-tools -15.1.0 +15.1.10 master *.spec *.rpmlintrc ++ _servicedata ++ --- /var/tmp/diff_new_pack.kTOvyu/_old 2019-02-19 13:54:45.976730809 +0100 +++ /var/tmp/diff_new_pack.kTOvyu/_new 2019-02-19 13:54:45.976730809 +0100 @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 6b07b8840b0e26b7f4fcaf5c5ddf17f6a3b97810 \ No newline at end of file +
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2019-02-06 14:05:19 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.28833 (New) Package is "suse-module-tools" Wed Feb 6 14:05:19 2019 rev:24 rq:670473 version:15.1.0 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2018-11-19 23:27:58.923467761 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.28833/suse-module-tools.changes 2019-02-06 14:05:23.138671278 +0100 @@ -1,0 +2,30 @@ +Thu Jan 31 23:07:10 UTC 2019 - mwi...@suse.com + +- Update to version 15.1.0 (git 6b07b88): + * 50-blacklist.conf is not added in Leap before 15.1. + fix conditionals and bump version accordingly. + +--- +Wed Jan 30 23:04:26 UTC 2019 - mwi...@suse.com + +- Update to version 15.0.20 (git 1396df5): +- Fix driver-check.sh (boo#1123697, boo#1123704) +- add /etc/modprobe.d/50-blacklist.conf from sysconfig package + (boo#1107611) +- Remove hard dependency on mkinitrd (boo#1123721) +- Make sure code works also without kmod-compat +- Replace file dependency on /sbin/depmod by weak package dependency + +--- +Mon Dec 10 12:10:29 UTC 2018 - Martin Wilck + +- Move "weak-modules" script to -legacy subpackage to avoid + dependency on binutils (bsc#1116665) + +--- +Fri Dec 7 12:45:36 UTC 2018 - Adrian Schröter + +- Require mkinitrd (provided also by dracut) directly instead of + file requires. This is fixing image build failures + +--- Old: suse-module-tools-15.0.1.tar.xz New: suse-module-tools-15.1.0.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.y13kKj/_old 2019-02-06 14:05:23.786671162 +0100 +++ /var/tmp/diff_new_pack.y13kKj/_new 2019-02-06 14:05:23.786671162 +0100 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: suse-module-tools -Version:15.0.1 +Version:15.1.0 Release:0 Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0-or-later @@ -25,16 +25,21 @@ Url:https://github.com/openSUSE/suse-module-tools Source0:%{name}-%{version}.tar.xz Source1:%{name}.rpmlintrc -Requires: /sbin/mkinitrd -Requires: binutils Requires: coreutils Requires: findutils Requires: grep Requires: gzip -# module-init-tools in older distros, kmod-compat in later ones -Requires: /sbin/depmod Requires: rpm Requires: sed +# Use weak dependencies for mkinitrd 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: kmod +%else +Recommends: modutils +%endif %description This package contains helper scripts for KMP installation and @@ -42,6 +47,18 @@ 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 + +%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. + %prep %setup -q @@ -61,6 +78,9 @@ install -pm644 "10-unsupported-modules.conf" \ "%{buildroot}%{_sysconfdir}/modprobe.d/" install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/" +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf" +%endif install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf" install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d" install -pm 644 "depmod-00-system.conf" \ @@ -76,9 +96,7 @@ install -pm 644 "macros.initrd" "%{buildroot}%{_sysconfdir}/rpm/" install -pm 755 "regenerate-initrd-posttrans"
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2018-11-19 23:27:53 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Mon Nov 19 23:27:53 2018 rev:23 rq:647026 version:15.0.1 Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2016-09-12 13:21:51.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2018-11-19 23:27:58.923467761 +0100 @@ -1,0 +2,37 @@ +Wed Nov 07 14:53:52 UTC 2018 - mwi...@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 - mwi...@suse.com + +- version 15.0 (git 6ce3011) +- modsign-verify: support for parsing PKCS#7 signatures + (bsc#300, bsc#1105495) +- Fix logic for unsupported modules (bsc#183) + * 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 + * fix %config(noreplace) logic for 10-unsupported-modules.conf +- added udev rule 81-sg.rules to make sure the sg module is + always loaded (bsc#1036463) + +--- +Wed Jul 26 08:07:29 UTC 2017 - tchva...@suse.com + +- Use path dependency that is not parsed by obs to ensure we + are not pulling systemd everywhere + +--- +Mon Jun 19 12:58:04 UTC 2017 - tchva...@suse.com + +- Set url to github project and repack using obs service +- Cleanup a bit with spec-cleaner +- Grep os-release and not deprecated SuSE-release + +--- Old: 10-unsupported-modules.conf 50-kernel-uname_r.conf README.SUSE depmod-00-system.conf driver-check.sh kmp-install macros.initrd modhash modprobe.conf.tar.bz2 modsign-verify regenerate-initrd-posttrans weak-modules weak-modules2 New: _service _servicedata suse-module-tools-15.0.1.tar.xz Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.Fk79SW/_old 2018-11-19 23:27:59.659466915 +0100 +++ /var/tmp/diff_new_pack.Fk79SW/_new 2018-11-19 23:27:59.663466910 +0100 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,42 +12,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: suse-module-tools -Version:12.4 +Version:15.0.1 Release:0 -Requires: /sbin/depmod +Summary:Configuration for module loading and SUSE-specific utilities for KMPs +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 Requires: /sbin/mkinitrd +Requires: binutils +Requires: coreutils Requires: findutils +Requires: grep Requires: gzip -# for grepping /etc/SUSE-release -PreReq: grep -# nm and rpmsort (rpm) are required by the weak-modules script which is invoked -# in post, it also requires getopt (coreutils) and sed -PreReq: coreutils rpm -# XXX: this should be nm OR eu-nm, the script works with both -PreReq: /usr/bin/eu-nm /bin/sed -Summary:Configuration for module loading and SUSE-specific utilities for KMPs -License:GPL-2.0+ -Group: System/Base -Source: README.SUSE -Source2:modprobe.conf.tar.bz2 -Source3:depmod-00-system.conf -Source4:10-unsupported-modules.conf -Source5:weak-modules -Source6:weak-modules2 -Source7:driver-check.sh -Source8:suse-module-tools.rpmlintrc -Source9:modsign-verify -Source10: kmp-install -Source11: macros.initrd -Source12: regenerate-initrd-posttrans -Source13:
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2016-09-12 13:21:50 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2016-06-12 18:50:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2016-09-12 13:21:51.0 +0200 @@ -1,0 +2,5 @@ +Thu Sep 8 08:55:50 UTC 2016 - dmuel...@suse.com + +- blacklist efifb on aarch64 (bsc#996080) + +--- Other differences: -- ++ modprobe.conf.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modprobe.conf/modprobe.conf.aarch64 new/modprobe.conf/modprobe.conf.aarch64 --- old/modprobe.conf/modprobe.conf.aarch64 1970-01-01 01:00:00.0 +0100 +++ new/modprobe.conf/modprobe.conf.aarch64 2016-09-08 10:55:21.0 +0200 @@ -0,0 +1,9 @@ +# begin of aarch64 part for modprobe.conf + + +# does not work on aarch64 because PCI host bridge driver +# remaps the bars (bsc#996080) +blacklist efifb + +# end of aarch64 part for modprobe.conf +
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2016-06-12 18:50:16 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2016-05-19 12:02:31.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2016-06-12 18:50:17.0 +0200 @@ -1,0 +2,17 @@ +Fri May 27 13:14:36 UTC 2016 - mma...@suse.cz + +- Run dos2unix on the modhash script. + +--- +Thu May 26 07:36:58 UTC 2016 - j...@suse.com + +- Add modhash tool to calculate hash of signed module. + It strips X.509 or PKCS#7 signature before hash kernel module. + (fate#319460) + +--- +Wed May 25 13:23:35 UTC 2016 - mma...@suse.cz + +- Remove -x bit from 50-kernel-uname_r.conf (bsc#981291). + +--- New: modhash Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.6GAOZz/_old 2016-06-12 18:50:18.0 +0200 +++ /var/tmp/diff_new_pack.6GAOZz/_new 2016-06-12 18:50:18.0 +0200 @@ -46,6 +46,7 @@ Source11: macros.initrd Source12: regenerate-initrd-posttrans Source13: 50-kernel-uname_r.conf +Source14: modhash BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,10 +95,12 @@ install -d -m 755 "$b/usr/bin" install -pm 755 %_sourcedir/modsign-verify "$b/usr/bin/" install -pm 755 %_sourcedir/kmp-install "$b/usr/bin/" +# modhash for calculating hash of signed kernel module +install -pm 755 %_sourcedir/modhash "$b/usr/bin/" # systemd service to load /boot/sysctl.conf-`uname -r` install -d -m 755 "$b/usr/lib/systemd/system/systemd-sysctl.service.d" -install -pm 755 %_sourcedir/50-kernel-uname_r.conf "$b/usr/lib/systemd/system/systemd-sysctl.service.d" +install -pm 644 %_sourcedir/50-kernel-uname_r.conf "$b/usr/lib/systemd/system/systemd-sysctl.service.d" %post test_allow_on_install() @@ -163,6 +166,7 @@ %config/etc/depmod.d/00-system.conf %config /etc/rpm/macros.initrd %_docdir/module-init-tools +/usr/bin/modhash /usr/bin/kmp-install /usr/bin/modsign-verify /usr/lib/module-init-tools ++ modhash ++ #!/usr/bin/perl # # Calculate the digest of the kernel module # It will strip kernel modules signature before calculation. # # Based on modsign-verify, written by Michal Marek # Authors: # Gary Lin# Joey Lee # my $USAGE = "Usage: modhash [-v] [-q] [-d ] \n"; use strict; use warnings; use IPC::Open2; use Getopt::Long; use File::Temp qw(tempfile); my $verbose = 1; my $dgst = "sha256"; GetOptions( "d=s" => \$dgst, "q|quiet" => sub { $verbose-- if $verbose; }, "v|verbose" => sub { $verbose++; }, "h|help" => sub { print $USAGE; exit(0); } ) or die($USAGE); sub _verbose { my $level = shift; return if $verbose < $level; print STDERR @_; } sub info{ _verbose(1, @_); } sub verbose { _verbose(2, @_); } sub debug { _verbose(3, @_); } if (@ARGV > 1) { print STDERR "Excess arguments\n"; die($USAGE); } elsif (@ARGV < 1) { print STDERR "No module supplied\n"; die($USAGE); } my $module_name = shift(@ARGV); if ($dgst ne "sha"and $dgst ne "sha1" and $dgst ne "sha256" and $dgst ne "sha384" and $dgst ne "sha512") { die("unsupported algorithm: $dgst"); } # # Function to read the contents of a file into a variable. # sub read_file($) { my ($file) = @_; my $contents; my $len; open(FD, "<$file") || die $file; binmode FD; my @st = stat(FD); die $file if (!@st); $len = read(FD, $contents, $st[7]) || die $file; close(FD) || die $file; die "$file: Wanted length ", $st[7], ", got ", $len, "\n" if ($len != $st[7]); return $contents; } sub openssl_pipe($$) { my ($input, $cmd) = @_; my ($pid, $res); $pid = open2(*read_from, *write_to, $cmd) || die $cmd; binmode write_to; if (defined($input) && $input ne "") { print write_to $input || die "$cmd: $!"; } close(write_to) || die "$cmd: $!"; binmode read_from; read(read_from, $res, 4096) || die "$cmd: $!"; close(read_from) || die "$cmd: $!"; waitpid($pid, 0) || die; die "$cmd died: $?" if ($? >> 8); return $res; } my
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2016-05-19 12:02:30 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2016-04-28 16:49:11.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2016-05-19 12:02:31.0 +0200 @@ -1,0 +2,11 @@ +Fri Apr 29 11:31:46 UTC 2016 - mma...@suse.cz + +- Ignore failures when loading the kernel sysctl (bsc#977715). + +--- +Thu Apr 28 20:15:31 UTC 2016 - mma...@suse.com + +- Add a systemd service to load /boot/sysctl.conf-`uname -r` + (bsc#977715). + +--- New: 50-kernel-uname_r.conf Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.HonDb5/_old 2016-05-19 12:02:32.0 +0200 +++ /var/tmp/diff_new_pack.HonDb5/_new 2016-05-19 12:02:32.0 +0200 @@ -45,6 +45,7 @@ Source10: kmp-install Source11: macros.initrd Source12: regenerate-initrd-posttrans +Source13: 50-kernel-uname_r.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,6 +95,10 @@ install -pm 755 %_sourcedir/modsign-verify "$b/usr/bin/" install -pm 755 %_sourcedir/kmp-install "$b/usr/bin/" +# systemd service to load /boot/sysctl.conf-`uname -r` +install -d -m 755 "$b/usr/lib/systemd/system/systemd-sysctl.service.d" +install -pm 755 %_sourcedir/50-kernel-uname_r.conf "$b/usr/lib/systemd/system/systemd-sysctl.service.d" + %post test_allow_on_install() { @@ -161,5 +166,6 @@ /usr/bin/kmp-install /usr/bin/modsign-verify /usr/lib/module-init-tools +/usr/lib/systemd/system/systemd-sysctl.service.d %changelog ++ 50-kernel-uname_r.conf ++ [Unit] RequiresMountsFor=/boot [Service] ExecStartPre=-/usr/lib/systemd/systemd-sysctl /boot/sysctl.conf-%v
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2016-04-28 16:49:09 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2016-03-01 11:57:13.0 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2016-04-28 16:49:11.0 +0200 @@ -1,0 +2,6 @@ +Fri Apr 1 11:43:32 UTC 2016 - mma...@suse.cz + +- Skip KMPs built from the kernel spec file directly (fate#319339) +- Bump version number to 12.4 + +--- @@ -7,0 +14,5 @@ +Fri Jan 15 23:04:41 UTC 2016 - bpoir...@suse.com + +- Add module option ib_mthca.catas_reset_disable=1 on ppc64le (bsc#456389). + +--- @@ -14 +25 @@ -Tue Sep 8 12:44:33 UTC 2015 - tr...@suse.de +Tue Sep 8 12:52:15 UTC 2015 - tr...@suse.de Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.vRI6Fi/_old 2016-04-28 16:49:12.0 +0200 +++ /var/tmp/diff_new_pack.vRI6Fi/_new 2016-04-28 16:49:12.0 +0200 @@ -17,7 +17,7 @@ Name: suse-module-tools -Version:12.3 +Version:12.4 Release:0 Requires: /sbin/depmod Requires: /sbin/mkinitrd ++ modprobe.conf.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modprobe.conf/modprobe.conf.ppc64le new/modprobe.conf/modprobe.conf.ppc64le --- old/modprobe.conf/modprobe.conf.ppc64le 1970-01-01 01:00:00.0 +0100 +++ new/modprobe.conf/modprobe.conf.ppc64le 2016-01-16 00:12:26.0 +0100 @@ -0,0 +1,7 @@ +# begin of ppc64le part for modprobe.conf + +# catas recovery conflicts with eeh (bsc#456389) +options ib_mthca catas_reset_disable=1 + +# end of ppc64le part for modprobe.conf + ++ weak-modules2 ++ --- /var/tmp/diff_new_pack.vRI6Fi/_old 2016-04-28 16:49:12.0 +0200 +++ /var/tmp/diff_new_pack.vRI6Fi/_new 2016-04-28 16:49:12.0 +0200 @@ -248,6 +248,11 @@ local kmp for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor"); do + if rpm -q --qf '[%{providename}\n]' --nodigest --nosignature "$kmp" | \ + grep -q '^kmp_in_kernel$'; then + # KMP built directly from the kernel spec file (fate#319339) + continue + fi rpm -ql --nodigest --nosignature "$kmp" \ | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \ > $tmpdir/modules-$kmp
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2016-03-01 11:57:02 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2015-10-19 22:13:53.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2016-03-01 11:57:13.0 +0100 @@ -1,0 +2,6 @@ +Tue Feb 23 10:43:39 UTC 2016 - lnus...@suse.de + +- add missing requirements on module-init-tools, findutils and gzip, + mkinitrd (bnc#965830) + +--- Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.G2gNFT/_old 2016-03-01 11:57:16.0 +0100 +++ /var/tmp/diff_new_pack.G2gNFT/_new 2016-03-01 11:57:16.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,6 +19,10 @@ Name: suse-module-tools Version:12.3 Release:0 +Requires: /sbin/depmod +Requires: /sbin/mkinitrd +Requires: findutils +Requires: gzip # for grepping /etc/SUSE-release PreReq: grep # nm and rpmsort (rpm) are required by the weak-modules script which is invoked
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2015-10-19 22:13:52 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2015-10-01 12:20:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2015-10-19 22:13:53.0 +0200 @@ -1,0 +2,6 @@ +Tue Oct 13 08:35:32 UTC 2015 - mma...@suse.cz + +- Revert change for fate#319339, as some 3rd party KMPs are built + with a modified template (bsc#949862). + +--- Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.4roH4f/_old 2015-10-19 22:13:54.0 +0200 +++ /var/tmp/diff_new_pack.4roH4f/_new 2015-10-19 22:13:54.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ weak-modules2 ++ --- /var/tmp/diff_new_pack.4roH4f/_old 2015-10-19 22:13:54.0 +0200 +++ /var/tmp/diff_new_pack.4roH4f/_new 2015-10-19 22:13:54.0 +0200 @@ -247,9 +247,7 @@ local basename=$1 flavor=$2 local kmp -# Only consider KMPs that are built using the %kernel_module_package macro -# and have the _k string in their version -for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor" | grep '_k[1-9][^-]*-[^-]*$'); do +for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor"); do rpm -ql --nodigest --nosignature "$kmp" \ | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \ > $tmpdir/modules-$kmp
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2015-10-01 12:20:33 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2015-09-19 06:52:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2015-10-01 12:20:35.0 +0200 @@ -1,0 +2,9 @@ +Tue Sep 8 12:44:33 UTC 2015 - tr...@suse.de + +- Use /run instead of deprecated /var/run + This can have sever consequences if this package uses /var/run. It may + be installed before filesystem package generating the /run tmpfs and + predict it to generate the link /var/run -> /run. Later dracut convertfs + kicks in to generate it, but it has issues. bsc#922676 + +--- Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.O1gZVs/_old 2015-10-01 12:20:37.0 +0200 +++ /var/tmp/diff_new_pack.O1gZVs/_new 2015-10-01 12:20:37.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ macros.initrd ++ --- /var/tmp/diff_new_pack.O1gZVs/_old 2015-10-01 12:20:37.0 +0200 +++ /var/tmp/diff_new_pack.O1gZVs/_new 2015-10-01 12:20:37.0 +0200 @@ -4,8 +4,8 @@ # See also fate#313506 %regenerate_initrd_post \ - mkdir -p /var/run/regenerate-initrd/ \ - touch /var/run/regenerate-initrd/all \ + mkdir -p /run/regenerate-initrd/ \ + touch /run/regenerate-initrd/all \ %nil %regenerate_initrd_posttrans \ ++ regenerate-initrd-posttrans ++ --- /var/tmp/diff_new_pack.O1gZVs/_old 2015-10-01 12:20:37.0 +0200 +++ /var/tmp/diff_new_pack.O1gZVs/_new 2015-10-01 12:20:37.0 +0200 @@ -2,18 +2,18 @@ # # Packages that install kernels or kernel-modules create a flag # -# /var/run/regenerate-initrd/ +# /run/regenerate-initrd/ # # to have the initrd for generated, or # -# /var/run/regenerate-initrd/all +# /run/regenerate-initrd/all # # to have all initrds generated. This script is called from posttrans # and takes care of generating the initrds shopt -s nullglob -dir=/var/run/regenerate-initrd +dir=/run/regenerate-initrd did_mkinitrd_setup=false run_mkinitrd_setup() ++ weak-modules2 ++ --- /var/tmp/diff_new_pack.O1gZVs/_old 2015-10-01 12:20:37.0 +0200 +++ /var/tmp/diff_new_pack.O1gZVs/_new 2015-10-01 12:20:37.0 +0200 @@ -357,8 +357,8 @@ done if [ -n "$image" ]; then if test -n "$INITRD_IN_POSTTRANS"; then - mkdir -p /var/run/regenerate-initrd - touch /var/run/regenerate-initrd/$image-$krel + mkdir -p /run/regenerate-initrd + touch /run/regenerate-initrd/$image-$krel else doit /sbin/mkinitrd -k /boot/$image-$krel -i /boot/initrd-$krel status=$?
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2015-09-19 06:52:01 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is "suse-module-tools" Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2015-06-30 10:14:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2015-09-19 06:52:02.0 +0200 @@ -1,0 +2,6 @@ +Thu Aug 13 13:30:17 UTC 2015 - mma...@suse.cz + +- Only handle KMPs that are built using the %kernel_module_package + macro (preparatory work for fate#319339). + +--- Other differences: -- ++ weak-modules2 ++ --- /var/tmp/diff_new_pack.7xBJx9/_old 2015-09-19 06:52:03.0 +0200 +++ /var/tmp/diff_new_pack.7xBJx9/_new 2015-09-19 06:52:03.0 +0200 @@ -247,7 +247,9 @@ local basename=$1 flavor=$2 local kmp -for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor"); do +# Only consider KMPs that are built using the %kernel_module_package macro +# and have the _k string in their version +for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor" | grep '_k[1-9][^-]*-[^-]*$'); do rpm -ql --nodigest --nosignature "$kmp" \ | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \ > $tmpdir/modules-$kmp
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2015-06-30 10:14:26 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2014-09-09 18:59:58.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2015-06-30 10:14:28.0 +0200 @@ -1,0 +2,5 @@ +Tue Jun 23 14:39:46 UTC 2015 - mma...@suse.cz + +- Use absolute path to mkinitrd (bsc#935566) + +--- Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.R6kq2s/_old 2015-06-30 10:14:28.0 +0200 +++ /var/tmp/diff_new_pack.R6kq2s/_new 2015-06-30 10:14:28.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ regenerate-initrd-posttrans ++ --- /var/tmp/diff_new_pack.R6kq2s/_old 2015-06-30 10:14:29.0 +0200 +++ /var/tmp/diff_new_pack.R6kq2s/_new 2015-06-30 10:14:29.0 +0200 @@ -43,7 +43,7 @@ if test -e $dir/all; then rm $dir/* run_mkinitrd_setup - mkinitrd + /sbin/mkinitrd exit fi err=0 @@ -56,7 +56,7 @@ continue fi run_mkinitrd_setup - if ! mkinitrd -k /boot/$image -i /boot/$initrd; then + if ! /sbin/mkinitrd -k /boot/$image -i /boot/$initrd; then err=$? fi done
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2014-09-09 18:59:46 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2014-05-10 08:31:51.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2014-09-09 18:59:58.0 +0200 @@ -1,0 +2,5 @@ +Fri May 16 08:36:15 UTC 2014 - mma...@suse.cz + +- Add kgraft/ to the depmod search list (fate#313296) + +--- Other differences: -- ++ depmod-00-system.conf ++ --- /var/tmp/diff_new_pack.T9xYx8/_old 2014-09-09 19:00:00.0 +0200 +++ /var/tmp/diff_new_pack.T9xYx8/_new 2014-09-09 19:00:00.0 +0200 @@ -10,8 +10,9 @@ # 1 updates/ (KMPs) # 2 extra/ (KMPs or manually compiled modules) # 3 weak-updates/ (KMPs built for older kernels) -# 4 everything else -search updates extra weak-updates built-in +# 4 kgraft/ (kgraft patches) +# 5 everything else +search updates extra weak-updates kgraft built-in # do not generate modules.*map files make_map_files no -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2014-04-22 16:59:56 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2014-04-11 14:40:27.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2014-04-22 16:59:56.0 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15 14:32:55 UTC 2014 - mma...@suse.cz + +- weak-modules2: Use lsinitrd to list the modules in an initrd, so + that initrds with early microcode work (bnc#873209, bnc#873113). + +--- Other differences: -- ++ weak-modules2 ++ --- /var/tmp/diff_new_pack.qMx5kZ/_old 2014-04-22 16:59:57.0 +0200 +++ /var/tmp/diff_new_pack.qMx5kZ/_new 2014-04-22 16:59:57.0 +0200 @@ -75,7 +75,7 @@ } filter_basenames() { -sed -rn 's:/?lib/modules/.*/([^/]*\.ko)$:\1:p' +sed -rn 's:.*\lib/modules/.*/([^/]*\.ko)$:\1:p' } # Name of the symlink that makes a module available to a given kernel @@ -297,8 +297,7 @@ xz -cd $file } -# test if mkinitrd is needed for $krel. This should be decided by initrd itself -# actually +# test if mkinitrd is needed for $krel. # stdin - list of changed modules (_kernel_ for the whole kernel) needs_mkinitrd() { local krel=$1 @@ -327,7 +326,7 @@ if [ ! -e /boot/initrd-$krel ]; then return 0 fi -local initrd_basenames=($( (uncomp /boot/initrd-$krel | cpio -t --quiet | filter_basenames; INITRD_MODULES=; . /etc/sysconfig/kernel /dev/null; printf '%s.ko\n' $INITRD_MODULES) | sort -u)) +local initrd_basenames=($( (lsinitrd /boot/initrd-$krel | filter_basenames; INITRD_MODULES=; . /etc/sysconfig/kernel /dev/null; printf '%s.ko\n' $INITRD_MODULES) | sort -u)) local i=($(join (printf '%s\n' ${changed_basenames[@]}) \ (printf '%s\n' ${initrd_basenames[@]}) )) log changed initrd modules for kernel $krel: ${i[@]-none} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2014-04-11 14:40:26 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2014-04-05 16:49:59.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2014-04-11 14:40:27.0 +0200 @@ -1,0 +2,17 @@ +Fri Apr 4 14:32:48 UTC 2014 - mma...@suse.cz + +- weak-modules2: Run mkinitrd in posttrans if $INITRD_IN_POSTTRANS + is set (fate#313506) + +--- +Fri Apr 4 13:34:09 UTC 2014 - mma...@suse.cz + +- regenerate-initrd-posttrans: Run mkinitrd_setup + +--- +Fri Apr 4 12:13:18 UTC 2014 - mma...@suse.cz + +- Add macros for regenerating the initrd in %posttrans + (fate#313506). + +--- New: macros.initrd regenerate-initrd-posttrans Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.d2wPNt/_old 2014-04-11 14:40:30.0 +0200 +++ /var/tmp/diff_new_pack.d2wPNt/_new 2014-04-11 14:40:30.0 +0200 @@ -39,6 +39,8 @@ Source8:suse-module-tools.rpmlintrc Source9:modsign-verify Source10: kmp-install +Source11: macros.initrd +Source12: regenerate-initrd-posttrans BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -78,6 +80,11 @@ install -pm 755 %_sourcedir/weak-modules{,2} $b/usr/lib/module-init-tools/ install -pm 755 %_sourcedir/driver-check.sh $b/usr/lib/module-init-tools/ +# rpm macros and helper +install -d -m 755 $b/etc/rpm +install -pm 644 %_sourcedir/macros.initrd $b/etc/rpm/ +install -pm 755 %_sourcedir/regenerate-initrd-posttrans $b/usr/lib/module-init-tools/ + # modsign-verify for verifying module signatures install -d -m 755 $b/usr/bin install -pm 755 %_sourcedir/modsign-verify $b/usr/bin/ @@ -145,6 +152,7 @@ %config(noreplace) /etc/modprobe.d/99-local.conf %dir /etc/depmod.d %config/etc/depmod.d/00-system.conf +%config /etc/rpm/macros.initrd %_docdir/module-init-tools /usr/bin/kmp-install /usr/bin/modsign-verify ++ macros.initrd ++ # Packages installing files and binaries that end up in the initrd should # call these macros in their post(trans) scriptlets to have the initrd # regenerated # See also fate#313506 %regenerate_initrd_post \ mkdir -p /var/run/regenerate-initrd/ \ touch /var/run/regenerate-initrd/all \ %nil %regenerate_initrd_posttrans \ if test -x /usr/lib/module-init-tools/regenerate-initrd-posttrans; then \ /bin/bash -${-/e/} /usr/lib/module-init-tools/regenerate-initrd-posttrans \ fi \ %nil ++ regenerate-initrd-posttrans ++ #!/bin/bash # # Packages that install kernels or kernel-modules create a flag # # /var/run/regenerate-initrd/kernel image # # to have the initrd for kernel image generated, or # # /var/run/regenerate-initrd/all # # to have all initrds generated. This script is called from posttrans # and takes care of generating the initrds shopt -s nullglob dir=/var/run/regenerate-initrd did_mkinitrd_setup=false run_mkinitrd_setup() { if ! $did_mkinitrd_setup; then if test -x /sbin/mkinitrd_setup; then /sbin/mkinitrd_setup fi did_mkinitrd_setup=true fi } if ! test -d $dir; then exit 0 fi for f in $dir/*; do # check if we are in a build chroot if ! [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then echo Please run mkinitrd as soon as your system is complete. 2 rm $dir/* exit 0 fi break done if test -e $dir/all; then rm $dir/* run_mkinitrd_setup mkinitrd exit fi err=0 for f in $dir/*; do rm $f image=${f##*/} initrd=initrd-${image#*-} if ! test -e /boot/$image; then echo $0: /boot/$image does not exist, initrd won't be generated continue fi run_mkinitrd_setup if ! mkinitrd -k /boot/$image -i /boot/$initrd; then err=$? fi done exit $err ++ weak-modules2 ++ --- /var/tmp/diff_new_pack.d2wPNt/_old 2014-04-11 14:40:30.0 +0200 +++ /var/tmp/diff_new_pack.d2wPNt/_new 2014-04-11 14:40:30.0 +0200 @@ -355,14 +355,19 @@
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2014-04-05 16:49:58 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2014-03-18 13:38:11.0 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2014-04-05 16:49:59.0 +0200 @@ -1,0 +2,12 @@ +Mon Mar 31 09:11:16 UTC 2014 - mma...@suse.cz + +- Use softdep to order {u,o,e}hci-hcd drivers. +- Drop ia64 modprobe config. + +--- +Fri Mar 28 14:25:25 UTC 2014 - mma...@suse.cz + +- Add kmp-install tool for easier installation of SolidDriver KMPs + (fate#314581). + +--- @@ -19,0 +32,5 @@ + +--- +Fri Feb 7 13:05:20 UTC 2014 - rsalev...@suse.com + +- load the uas driver simulsimultaneously with the usb_storage driver and vice versa (bnc#862397) New: kmp-install Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.9nLbSt/_old 2014-04-05 16:50:00.0 +0200 +++ /var/tmp/diff_new_pack.9nLbSt/_new 2014-04-05 16:50:00.0 +0200 @@ -38,6 +38,7 @@ Source7:driver-check.sh Source8:suse-module-tools.rpmlintrc Source9:modsign-verify +Source10: kmp-install BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,6 +81,7 @@ # modsign-verify for verifying module signatures install -d -m 755 $b/usr/bin install -pm 755 %_sourcedir/modsign-verify $b/usr/bin/ +install -pm 755 %_sourcedir/kmp-install $b/usr/bin/ %post test_allow_on_install() @@ -144,6 +146,7 @@ %dir /etc/depmod.d %config/etc/depmod.d/00-system.conf %_docdir/module-init-tools +/usr/bin/kmp-install /usr/bin/modsign-verify /usr/lib/module-init-tools ++ kmp-install ++ #!/usr/bin/perl # # KMP-INSTALL: Install specified kernel module packages and automatically # remove packages providing same-named modules. # # Copyright (c) 2014 SUSE # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # Software), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to # the following conditions: # # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. # # THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. # IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. use strict; use warnings; use IO::Handle; use File::Find; my @zypper_cmd = qw(zypper); sub print_help { print Usage: $0 [options] package ... Installs given packages and removes any KMPs that contain conficting module names. Run 'zypper help install' for the list of valid options. Additionally, the options --non-interactive and --non-interactive-include-reboot-patches can be used\n; } sub add_package { my ($list, $attr) = @_; return unless $attr-[0] =~ /-kmp-/; my $new = { name =$attr-[0], version = $attr-[1], arch =$attr-[2], }; $new-{repo} = $attr-[3] if defined($attr-[3]); # old-version - new-version $new-{version} =~ s/.*-\s*//; push(@$list, $new); } sub add_module { my ($package, $path) = @_; return unless $path =~ m@^/lib/modules/([^/]+)/.*/([^/]+\.ko)$@; my ($version, $name) = ($1, $2); $name =~ s/-/_/g; $package-{modules} ||= []; push(@{$package-{modules}}, $version/$name); } sub query_installed_kmps { my $res = shift; my %seen; open(my $pipe, '-|', rpm, -qa, --qf, '[%{n} %{v} %{r} %{arch} %{filenames}\n]', *-kmp-*); while ($pipe) { chomp; my ($n, $v, $r, $a, $file) = split(' '); next
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2014-03-18 13:38:10 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2014-03-12 14:45:40.0 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2014-03-18 13:38:11.0 +0100 @@ -1,0 +2,12 @@ +Tue Mar 11 12:57:36 UTC 2014 - mma...@suse.cz + +- Add modsign-verify tool to verify signatures of modules + (fate#314507). + +--- +Tue Mar 11 12:38:39 UTC 2014 - mma...@suse.cz + +- weak-modules2: Support XZ compressed initrds (bnc#778119, + bnc#867312) + +--- New: modsign-verify Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.iPYbr2/_old 2014-03-18 13:38:12.0 +0100 +++ /var/tmp/diff_new_pack.iPYbr2/_new 2014-03-18 13:38:12.0 +0100 @@ -37,6 +37,7 @@ Source6:weak-modules2 Source7:driver-check.sh Source8:suse-module-tools.rpmlintrc +Source9:modsign-verify BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,6 +77,10 @@ install -pm 755 %_sourcedir/weak-modules{,2} $b/usr/lib/module-init-tools/ install -pm 755 %_sourcedir/driver-check.sh $b/usr/lib/module-init-tools/ +# modsign-verify for verifying module signatures +install -d -m 755 $b/usr/bin +install -pm 755 %_sourcedir/modsign-verify $b/usr/bin/ + %post test_allow_on_install() { @@ -139,6 +144,7 @@ %dir /etc/depmod.d %config/etc/depmod.d/00-system.conf %_docdir/module-init-tools +/usr/bin/modsign-verify /usr/lib/module-init-tools %changelog ++ modsign-verify ++ #!/usr/bin/perl # # Verify kernel module signature generated by /usr/src/linux/scripts/sign-file # # Parts of this script were copied from sign-file, written by David Howels # my $USAGE = Usage: modsign-verify [-v] [-q] [--certificate x509 | --cert-dir dir] module\n; use strict; use warnings; use IPC::Open2; use Getopt::Long; use File::Temp qw(tempfile); my $cert; my $cert_dir; my $verbose = 1; GetOptions( certificate=s = \$cert, cert-dir=s = \$cert_dir, q|quiet = sub { $verbose-- if $verbose; }, v|verbose = sub { $verbose++; }, h|help = sub { print $USAGE; print Return codes: 0 good signature\n; print 1 bad signature\n; print 2 certificate not found\n; print 3 module not signed\n; print 3 other error\n; exit(0); } ) or die($USAGE); sub _verbose { my $level = shift; return if $verbose $level; print STDERR @_; } sub info{ _verbose(1, @_); } sub verbose { _verbose(2, @_); } sub debug { _verbose(3, @_); } if (@ARGV 1) { print STDERR Excess arguments\n; die($USAGE); } elsif (@ARGV 1) { print STDERR No module supplied\n; die($USAGE); } elsif ($cert $cert_dir) { print STDERR Please specify either --certificate or --cert-dir, not both.\n; die($USAGE); } my $module_name = shift(@ARGV); if (!$cert !$cert_dir) { $cert_dir = /etc/uefi/certs; verbose(Using default certificate directory $cert_dir\n); } my @certs; if ($cert) { push(@certs, $cert); } else { my $dh; if (!opendir($dh, $cert_dir)) { print STDERR $cert_dir: $!\n; exit(2); } while (my $entry = readdir($dh)) { next if $entry =~ /^\./; next if !-f $cert_dir/$entry; push(@certs, $cert_dir/$entry); } closedir($dh); if (!@certs) { print STDERR No certificates found in $cert_dir\n; exit(2); } } # # Function to read the contents of a file into a variable. # sub read_file($) { my ($file) = @_; my $contents; my $len; open(FD, $file) || die $file; binmode FD; my @st = stat(FD); die $file if (!@st); $len = read(FD, $contents, $st[7]) || die $file; close(FD) || die $file; die $file: Wanted length , $st[7], , got , $len, \n if ($len != $st[7]); return $contents; } sub openssl_pipe($$) { my ($input, $cmd) = @_; my ($pid, $res); $pid = open2(*read_from, *write_to, $cmd) || die $cmd; binmode
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2014-03-12 14:45:39 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2013-06-05 13:16:08.0 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2014-03-12 14:45:40.0 +0100 @@ -1,0 +2,8 @@ +Mon Mar 10 15:08:15 UTC 2014 - mma...@suse.cz + +- The package cannot be noarch, because it installs different + configs for different architectures. +- Install 10-unsupported-modules.conf unconditionally, kmod has + been patched. + +--- New: suse-module-tools.rpmlintrc Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.IC9alM/_old 2014-03-12 14:45:41.0 +0100 +++ /var/tmp/diff_new_pack.IC9alM/_new 2014-03-12 14:45:41.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,8 +36,8 @@ Source5:weak-modules Source6:weak-modules2 Source7:driver-check.sh +Source8:suse-module-tools.rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %description This package contains helper scripts for KMP installation and @@ -63,10 +63,8 @@ cat modprobe.conf.$RPM_ARCH 00-system.conf fi install -d -m 755 $b/etc/modprobe.d -%if 0%{?sles_version} install -pm644 %_sourcedir/10-unsupported-modules.conf \ $b/etc/modprobe.d/ -%endif install -pm644 00-system.conf $b/etc/modprobe.d/ install -pm644 modprobe.conf.local $b/etc/modprobe.d/99-local.conf install -d -m 755 $b/etc/depmod.d @@ -79,7 +77,6 @@ install -pm 755 %_sourcedir/driver-check.sh $b/usr/lib/module-init-tools/ %post -%if 0%{?sles_version} test_allow_on_install() { # configure handling of unsupported modules @@ -132,14 +129,12 @@ sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \ /etc/modprobe.d/10-unsupported-modules.conf fi -%endif + %files %defattr(-,root,root) %dir /etc/modprobe.d %config/etc/modprobe.d/00-system.conf -%if 0%{?sles_version} %config(noreplace) /etc/modprobe.d/10-unsupported-modules.conf -%endif %config(noreplace) /etc/modprobe.d/99-local.conf %dir /etc/depmod.d %config/etc/depmod.d/00-system.conf ++ suse-module-tools.rpmlintrc ++ # The package installs different configs for different architectures addFilter(no-binary); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2013-06-05 13:16:06 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2013-03-26 16:02:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2013-06-05 13:16:08.0 +0200 @@ -1,0 +2,5 @@ +Wed May 29 12:44:00 UTC 2013 - sch...@suse.de + +- weak-modules{,2}: also look for Image-$krel for aarch64 + +--- Other differences: -- ++ weak-modules ++ --- /var/tmp/diff_new_pack.iYG1Y8/_old 2013-06-05 13:16:08.0 +0200 +++ /var/tmp/diff_new_pack.iYG1Y8/_new 2013-06-05 13:16:08.0 +0200 @@ -311,7 +311,7 @@ [ -e /boot/System.map-$krel ] || continue image= -for x in vmlinuz image vmlinux linux bzImage uImage; do +for x in vmlinuz image vmlinux linux bzImage uImage Image; do if [ -f /boot/$x-$krel ]; then image=$x break ++ weak-modules2 ++ --- /var/tmp/diff_new_pack.iYG1Y8/_old 2013-06-05 13:16:08.0 +0200 +++ /var/tmp/diff_new_pack.iYG1Y8/_new 2013-06-05 13:16:08.0 +0200 @@ -338,7 +338,7 @@ fi if needs_mkinitrd $krel; then local image - for x in vmlinuz image vmlinux linux bzImage uImage; do + for x in vmlinuz image vmlinux linux bzImage uImage Image; do if [ -f /boot/$x-$krel ]; then image=$x break -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2013-03-26 16:02:34 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2012-11-28 16:59:24.0 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2013-03-26 16:02:35.0 +0100 @@ -1,0 +2,7 @@ +Sun Mar 17 20:04:12 UTC 2013 - crrodrig...@opensuse.org + +- The allow_unsupported_modules feature, does not belong too + openSUSE, kmod (and hence udev and systemd) do not understand + it in anyway. limit to SLE only. + +--- Other differences: -- ++ suse-module-tools.spec ++ --- /var/tmp/diff_new_pack.fQKspx/_old 2013-03-26 16:02:36.0 +0100 +++ /var/tmp/diff_new_pack.fQKspx/_new 2013-03-26 16:02:36.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,8 +63,10 @@ cat modprobe.conf.$RPM_ARCH 00-system.conf fi install -d -m 755 $b/etc/modprobe.d +%if 0%{?sles_version} install -pm644 %_sourcedir/10-unsupported-modules.conf \ $b/etc/modprobe.d/ +%endif install -pm644 00-system.conf $b/etc/modprobe.d/ install -pm644 modprobe.conf.local $b/etc/modprobe.d/99-local.conf install -d -m 755 $b/etc/depmod.d @@ -77,6 +79,7 @@ install -pm 755 %_sourcedir/driver-check.sh $b/usr/lib/module-init-tools/ %post +%if 0%{?sles_version} test_allow_on_install() { # configure handling of unsupported modules @@ -129,12 +132,14 @@ sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \ /etc/modprobe.d/10-unsupported-modules.conf fi - +%endif %files %defattr(-,root,root) %dir /etc/modprobe.d %config/etc/modprobe.d/00-system.conf +%if 0%{?sles_version} %config(noreplace) /etc/modprobe.d/10-unsupported-modules.conf +%endif %config(noreplace) /etc/modprobe.d/99-local.conf %dir /etc/depmod.d %config/etc/depmod.d/00-system.conf -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suse-module-tools for openSUSE:Factory
Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2012-11-28 16:59:17 Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) Package is suse-module-tools, Maintainer is Changes: New Changes file: --- /dev/null 2012-11-26 11:02:30.307549147 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2012-11-28 16:59:24.0 +0100 @@ -0,0 +1,5 @@ +--- +Wed Nov 14 18:31:35 UTC 2012 - jeng...@inai.de + +- New package. Split SUSE-specific scripts from module-init-tools, + so that we can actually get a system with kmod-compat running. New: 10-unsupported-modules.conf README.SUSE depmod-00-system.conf driver-check.sh modprobe.conf.tar.bz2 suse-module-tools.changes suse-module-tools.spec weak-modules weak-modules2 Other differences: -- ++ suse-module-tools.spec ++ # # spec file for package suse-module-tools # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An Open Source License is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: suse-module-tools Version:12.3 Release:0 # for grepping /etc/SUSE-release PreReq: grep # nm and rpmsort (rpm) are required by the weak-modules script which is invoked # in post, it also requires getopt (coreutils) and sed PreReq: coreutils rpm # XXX: this should be nm OR eu-nm, the script works with both PreReq: /usr/bin/eu-nm /bin/sed Summary:Configuration for module loading and SUSE-specific utilities for KMPs License:GPL-2.0+ Group: System/Base Source: README.SUSE Source2:modprobe.conf.tar.bz2 Source3:depmod-00-system.conf Source4:10-unsupported-modules.conf Source5:weak-modules Source6:weak-modules2 Source7:driver-check.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description This package contains helper scripts for KMP installation and 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. %prep %setup -Tcqa2 %build %install b=%buildroot mkdir -p $b/%_docdir/module-init-tools install -pm644 %_sourcedir/README.SUSE $b/%_docdir/module-init-tools # # now assemble the parts for modprobe.conf # cd modprobe.conf cp modprobe.conf.common 00-system.conf if [ -f modprobe.conf.$RPM_ARCH ]; then cat modprobe.conf.$RPM_ARCH 00-system.conf fi install -d -m 755 $b/etc/modprobe.d install -pm644 %_sourcedir/10-unsupported-modules.conf \ $b/etc/modprobe.d/ install -pm644 00-system.conf $b/etc/modprobe.d/ install -pm644 modprobe.conf.local $b/etc/modprobe.d/99-local.conf install -d -m 755 $b/etc/depmod.d install -pm 644 %_sourcedir/depmod-00-system.conf \ $b/etc/depmod.d/00-system.conf # module-init-tools name hardcoded in KMPs, mkinitrd, etc. install -d -m 755 $b/usr/lib/module-init-tools install -pm 755 %_sourcedir/weak-modules{,2} $b/usr/lib/module-init-tools/ install -pm 755 %_sourcedir/driver-check.sh $b/usr/lib/module-init-tools/ %post test_allow_on_install() { # configure handling of unsupported modules # default is to allow them allow=1 # if the obsolete LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY variable is # set to no, don't allow (this was used in SLES 9 and 10) if test -e /etc/sysconfig/hardware/config; then . /etc/sysconfig/hardware/config if test x$LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY = xno; then allow=0 fi # obsolete rm /etc/sysconfig/hardware/config fi # don't change the setting during upgrade if test $1 != 1; then return fi # on SLES, the default is not to allow unsupported modules if grep -qs Enterprise Server /etc/SuSE-release; then allow=0 else