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.000000000 +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 - [email protected] + +- 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 - [email protected] + +- version 15.0 (git 6ce3011) +- modsign-verify: support for parsing PKCS#7 signatures + (bsc#1111300, bsc#1105495) +- Fix logic for unsupported modules (bsc#1111183) + * SLES15: allow unsupported modules only if 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 - [email protected] + +- 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 - [email protected] + +- 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: 50-kernel-uname_r.conf -Source14: modhash -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# module-init-tools in older distros, kmod-compat in later ones +Requires: /sbin/depmod +Requires: rpm +Requires: sed %description This package contains helper scripts for KMP installation and @@ -56,53 +43,68 @@ module-init-tools, whichever implementation you choose to install. %prep -%setup -Tcqa2 +%setup -q %build +%if 0%{?is_opensuse} == 0 +sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \ + 10-unsupported-modules.conf +%endif %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 +cp modprobe.conf/modprobe.conf.common 00-system.conf +if [ -f "modprobe.conf/modprobe.conf.$RPM_ARCH" ]; then + cat "modprobe.conf/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" +install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d" +install -pm644 "10-unsupported-modules.conf" \ + "%{buildroot}%{_sysconfdir}/modprobe.d/" +install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/" +install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf" +install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d" +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 "$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/" +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/" # 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/" +install -d -m 755 "%{buildroot}%{_sysconfdir}/rpm" +install -pm 644 "macros.initrd" "%{buildroot}%{_sysconfdir}/rpm/" +install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}%{_libexecdir}/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/" -install -pm 755 %_sourcedir/kmp-install "$b/usr/bin/" +install -d -m 755 "%{buildroot}%{_prefix}/bin" +install -pm 755 modsign-verify "%{buildroot}%{_bindir}/" +install -pm 755 kmp-install "%{buildroot}%{_bindir}/" # modhash for calculating hash of signed kernel module -install -pm 755 %_sourcedir/modhash "$b/usr/bin/" +install -pm 755 modhash "%{buildroot}%{_bindir}/" # systemd service to load /boot/sysctl.conf-`uname -r` -install -d -m 755 "$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" +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" + +# 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" + +mkdir -p %{buildroot}%{_defaultlicensedir} %post +%if 0%{?sle_version} >= 150000 +# Delete obsolete unsupported-modules file from SLE11 +rm -f %{_sysconfdir}/modprobe.d/unsupported-modules +%else +# Logic for releases below CODE 15 +%if 0%{?is_opensuse} == 1 +allowed=1 +%else +allowed=0 +%endif test_allow_on_install() { # configure handling of unsupported modules @@ -110,20 +112,21 @@ 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 -e %{_sysconfdir}/sysconfig/hardware/config; then + . %{_sysconfdir}/sysconfig/hardware/config if test "x$LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY" = "xno"; then allow=0 fi # obsolete - rm /etc/sysconfig/hardware/config + rm %{_sysconfdir}/sysconfig/hardware/config fi # don't change the setting during upgrade if test "$1" != 1; then + allow= return fi # on SLES, the default is not to allow unsupported modules - if grep -qs "Enterprise Server" /etc/SuSE-release; then + if grep -qs "Enterprise Server" %{_sysconfdir}/os-release; then allow=0 else return @@ -134,7 +137,7 @@ return fi # or if the installer already loaded some unsupported modules - # (see TAINT_NO_SUPPORT in /usr/src/linux/include/linux/kernel.h) + # (see TAINT_NO_SUPPORT in /etc/src/linux/include/linux/kernel.h) tainted=$(cat /proc/sys/kernel/tainted 2>/dev/null || echo 0) if test $((tainted & (1<<30))) != 0; then allow=1 @@ -142,34 +145,44 @@ fi } # upgrade from old locations -if test -e /etc/modprobe.d/unsupported-modules; then - mv -f /etc/modprobe.d/unsupported-modules \ - /etc/modprobe.d/10-unsupported-modules.conf -fi -if test -e /etc/modprobe.conf.local; then - mv -f /etc/modprobe.conf.local \ - /etc/modprobe.d/99-local.conf +if test -e %{_sysconfdir}/modprobe.d/unsupported-modules; then + mv -f %{_sysconfdir}/modprobe.d/unsupported-modules \ + %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf fi test_allow_on_install "$@" -if test "$allow" = "0"; then - sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \ - /etc/modprobe.d/10-unsupported-modules.conf +if test -n "$allow" -a "$allow" != "$allowed"; then + sed -ri 's/^( *allow_unsupported_modules *) [01]/\1 '"$allow"'/' \ + %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf +fi +%endif + +# upgrade from old locations +if test -e %{_sysconfdir}/modprobe.conf.local; then + mv -f %{_sysconfdir}/modprobe.conf.local \ + %{_sysconfdir}/modprobe.d/99-local.conf fi %files %defattr(-,root,root) -%dir /etc/modprobe.d -%config /etc/modprobe.d/00-system.conf -%config(noreplace) /etc/modprobe.d/10-unsupported-modules.conf -%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/modhash -/usr/bin/kmp-install -/usr/bin/modsign-verify -/usr/lib/module-init-tools -/usr/lib/systemd/system/systemd-sysctl.service.d + +%if 0%{?sle_version:%{sle_version}}%{!?sle_version:150000} <= 120200 +%dir %{_defaultlicensedir} +%endif +%license LICENSE +%doc README.SUSE +%dir %{_sysconfdir}/modprobe.d +%config %{_sysconfdir}/modprobe.d/00-system.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf +%dir %{_sysconfdir}/depmod.d +%config %{_sysconfdir}/depmod.d/00-system.conf +%config %{_sysconfdir}/rpm/macros.initrd +%{_bindir}/modhash +%{_bindir}/kmp-install +%{_bindir}/modsign-verify +%{_libexecdir}/module-init-tools +%{_libexecdir}/systemd/system/systemd-sysctl.service.d +%dir %{_sysconfdir}/modules-load.d +%config(noreplace) %{_sysconfdir}/modules-load.d/sg.conf %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/openSUSE/suse-module-tools.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">suse-module-tools</param> <param name="version">15.0.1</param> <param name="revision">15.0.1</param> <param name="exclude">*.spec</param> <param name="exclude">*.rpmlintrc</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/suse-module-tools.git</param> <param name="changesrevision">5c6331938afd2e9250b60450d458bd9297f0d2cf</param></service></servicedata>
