Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package suse-module-tools for
openSUSE:Factory checked in at 2024-01-04 15:57:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.28375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Thu Jan 4 15:57:06 2024 rev:74 rq:1136446 version:16.0.42
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2023-12-15 21:47:19.226240437 +0100
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.28375/suse-module-tools.changes
2024-01-04 15:58:27.214833671 +0100
@@ -1,0 +2,20 @@
+Wed Jan 3 09:59:35 UTC 2024 - Martin Wilck <mwi...@suse.com>
+
+- Update to version 16.0.42:
+ * 60-io-scheduler.rules: test for "scheduler" sysfs attribute (boo#1216717)
+
+-------------------------------------------------------------------
+Tue Jan 2 15:35:07 UTC 2024 - Martin Wilck <mwi...@suse.com>
+
+- Update to version 16.0.41:
+ * rpm-script: fix issue during installation (bsc#1217775)
+ * rpm-script: preun: remove stale .vmlinuz.hmac file
+
+-------------------------------------------------------------------
+Mon Dec 18 20:12:46 UTC 2023 - Martin Wilck <mwi...@suse.com>
+
+ * add blacklist entry for reiserfs (jsc#PED-6167)
+ * rpm-script: add symlink /boot/.vmlinuz.hmac (bsc#1217775)
+ * Remove kmp-install (boo#1214360)
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-16.0.39.obscpio
New:
----
suse-module-tools-16.0.42.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.NS2iaZ/_old 2024-01-04 15:58:28.318874002 +0100
+++ /var/tmp/diff_new_pack.NS2iaZ/_new 2024-01-04 15:58:28.318874002 +0100
@@ -28,7 +28,7 @@
%global systemd_units %{?with_boot_sysctl:boot-sysctl.service}
%{?with_kernel_sysctl:kernel-sysctl.service}
# List of legacy file systems to be blacklisted by default
-%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs f2fs freevxfs
hfs hfsplus hpfs jffs2 jfs kafs minix nilfs2 ntfs ntfs3 omfs orangefs pstore
qnx4 qnx6 romfs sysv ufs zonefs
+%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs f2fs freevxfs
hfs hfsplus hpfs jffs2 jfs kafs minix nilfs2 ntfs ntfs3 omfs orangefs pstore
qnx4 qnx6 reiserfs romfs sysv ufs zonefs
# List of all files installed under modprobe.d
# Note: this list contains files installed by previous versions, like
00-system-937216.conf!
@@ -36,7 +36,7 @@
%global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^
]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
Name: suse-module-tools
-Version: 16.0.39
+Version: 16.0.42
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -127,7 +127,6 @@
done
install -d -m 755 "%{buildroot}%{_prefix}/bin"
-install -pm 755 kmp-install "%{buildroot}%{_bindir}/"
# systemd service(s) to load kernel-specific sysctl settings
install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
@@ -223,7 +222,6 @@
%dir %{_sysconfdir}/modprobe.d
%{depmod_dir}
%dir %{_sysconfdir}/depmod.d
-%{_bindir}/kmp-install
%dir /usr/lib/module-init-tools
/usr/lib/module-init-tools/driver-check.sh
/usr/lib/module-init-tools/lsinitrd-quick
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.NS2iaZ/_old 2024-01-04 15:58:28.350875171 +0100
+++ /var/tmp/diff_new_pack.NS2iaZ/_new 2024-01-04 15:58:28.354875317 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/suse-module-tools.git</param>
- <param
name="changesrevision">d2e769f1f4ed527b68a1a5894c7ffeb84e32d2a0</param></service></servicedata>
+ <param
name="changesrevision">065d699b3b505b10a27efcb79acee44215615171</param></service></servicedata>
(No newline at EOF)
++++++ suse-module-tools-16.0.39.obscpio -> suse-module-tools-16.0.42.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.39/kernel-scriptlets/rpm-script
new/suse-module-tools-16.0.42/kernel-scriptlets/rpm-script
--- old/suse-module-tools-16.0.39/kernel-scriptlets/rpm-script 2023-12-14
20:58:45.000000000 +0100
+++ new/suse-module-tools-16.0.42/kernel-scriptlets/rpm-script 2024-01-03
10:58:53.000000000 +0100
@@ -194,11 +194,6 @@
trigger_purge_kernels || script_rc=$?
fi
- for x in /boot/"$image" /boot/initrd; do
- rm -f $x
- ln -s ${x##*/}-"$kernelrelease"-"$flavor" $x
- done
-
# compat stuff for /boot.
# if /boot and /usr are not speparate partitions we can just link
# the kernel there to save space. Otherwise copy.
@@ -209,7 +204,7 @@
copy_or_link="ln -sf"
separate_boot=""
fi
- # XXX: need to fix suse-module-tools for sysctl.conf and System.map
+
for x in "$image" sysctl.conf System.map config; do
if [ "$separate_boot" = 1 ] || [ ! -e
/boot/$x-"$kernelrelease"-"$flavor" ]; then
$copy_or_link .."$modules_dir"/$x
/boot/$x-"$kernelrelease"-"$flavor" || script_rc=$?
@@ -219,6 +214,14 @@
fi
done
+ for x in /boot/"$image" /boot/initrd; do
+ rm -f "$x"
+ ln -s "${x##*/}-$kernelrelease-$flavor" "$x"
+ done
+ rm -f /boot/.vmlinuz.hmac
+ [ ! -e "/boot/.vmlinuz-$kernelrelease-$flavor.hmac" ] ||
+ ln -s ".vmlinuz-$kernelrelease-$flavor.hmac" /boot/.vmlinuz.hmac
+
# Add symlinks of compatible modules to
/lib/modules/$krel/weak-updates/,
# run depmod and dracut
if [ -x $wm2 ]; then
@@ -232,6 +235,9 @@
[ -z "$certs" ] ||
/usr/lib/module-init-tools/kernel-scriptlets/cert-$op --ca-check 1 --certs
"$certs" "$@" || script_rc=$?
;;
preun)
+ [ ! -L /boot/.vmlinuz.hmac ] ||
+ [ "$(readlink /boot/.vmlinuz.hmac)" !=
".vmlinuz-$kernelrelease-$flavor.hmac" ] ||
+ rm -f /boot/.vmlinuz.hmac
[ -z "$certs" ] ||
/usr/lib/module-init-tools/kernel-scriptlets/cert-$op --ca-check 1 --certs
"$certs" "$@" || script_rc=$?
;;
postun)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.39/kmp-install
new/suse-module-tools-16.0.42/kmp-install
--- old/suse-module-tools-16.0.39/kmp-install 2023-12-14 20:58:45.000000000
+0100
+++ new/suse-module-tools-16.0.42/kmp-install 1970-01-01 01:00:00.000000000
+0100
@@ -1,317 +0,0 @@
-#!/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(\.[gx]z)?|\.zst)$@;
- 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 unless $file =~
m@^/lib/modules/.*/.*/.*\.ko(\.[gx]z|\.zst)?$@;
- my $nvra = "$n-$v-$r.$a";
- if (!exists($seen{$nvra})) {
- add_package($res, [$n, "$v-$r", $a]);
- $seen{$nvra} = $res->[$#$res];
- }
- add_module($seen{$nvra}, $file);
- }
-}
-
-
-sub fetch_packages {
- my $interactive = shift;
- my $new_pkgs = shift;
- my $remove_pkgs = shift;
-
- my @cmd = @zypper_cmd;
- push(@cmd, "--non-interactive") if !$interactive;
- push(@cmd, qw(-vv install --download-only));
- push(@cmd, @_);
- pipe(READ, WRITE);
- my $pid = fork();
- if (!$pid) {
- # child
- close(READ);
- open(STDOUT, ">&WRITE");
- if (!$interactive) {
- open(NULL, '<', "/dev/null");
- open(STDIN, "<&NULL");
- close(NULL);
- open(NULL, '>', "/dev/null");
- open(STDERR, ">&NULL");
- close(NULL);
- }
- exec(@cmd);
- }
- # parent
- close(WRITE);
- my ($len, $buf, $last_line);
- my ($state, @cur_pkg);
- $state = 0;
- $last_line = "";
- my $list;
- STDOUT->autoflush(1);
- while (($len = sysread(READ, $buf, 4096))) {
- print $buf if $interactive;
- my @lines = split(/\n/, $buf, -1);
- $lines[0] = $last_line . $lines[0];
- # XXX: Assumes that the very last line is terminated by \n
- $last_line = pop(@lines);
- for my $l (@lines) {
- if ($state == 0 && $l =~ /^The following.* package.*
going to be (installed|upgraded|downgraded|REMOVED):/) {
- if ($1 eq "REMOVED") {
- $list = $remove_pkgs;
- } else {
- $list = $new_pkgs;
- }
- $state = 1;
- next;
- }
- next unless $state == 1;
- if ($l eq "") {
- $state = 0;
- if (@cur_pkg) {
- add_package($list, \@cur_pkg);
- }
- @cur_pkg = ();
- next;
- }
- $l =~ s/ *$//;
- if ($l =~ /^[^ ]/) {
- if (@cur_pkg) {
- add_package($list, \@cur_pkg);
- }
- @cur_pkg = ($l);
- }
- if ($l =~ /^ /) {
- $l =~ s/^ *//;
- push(@cur_pkg, $l);
- }
- }
- }
- STDOUT->autoflush(0);
- close(READ);
- waitpid($pid, 0);
- return $?;
-}
-
-my %repo_cache;
-sub get_repo_cache {
- my $name = shift;
- my $res;
-
- if (exists($repo_cache{$name})) {
- return $repo_cache{$name};
- }
- open(my $pipe, '-|', "zypper", "repos", $name);
- while (<$pipe>) {
- chomp;
- if (m@^MD Cache Path\s*:\s*(/.*)@) {
- $res = $1;
- $res =~ s:/raw/:/packages/:;
- $res =~ s/\s*$//;
- }
- }
- close($pipe);
- $repo_cache{$name} = $res;
- return $res;
-}
-
-sub find_fetched {
- my $packages = shift;
- my %local_packages;
-
- for $a (@_) {
- if ($a =~ /\.rpm$/ && -e $a) {
- open(my $pipe, '-|', "rpm", "-qp", "--qf",
- '%{n}-%{v}-%{r}.%{arch}', $a);
- my $nvra = <$pipe>;
- close($pipe);
- if (defined($nvra)) {
- $local_packages{$nvra} = $a;
- }
- }
- }
- for my $p (@$packages) {
- my $nvra = "$p->{name}-$p->{version}.$p->{arch}";
- if ($p->{repo} eq "Plain RPM files cache") {
- if (exists($local_packages{$nvra})) {
- $p->{path} = $local_packages{$nvra};
- } else {
- print STDERR "Cannot find package $p->{name}\n";
- }
- next;
- }
- my $dir = get_repo_cache($p->{repo});
- if (!$dir) {
- print STDERR "Cannot find zypp cache for repository
$p->{repo} (package $p->{name})\n";
- next;
- }
- my $file = "$nvra.rpm";
- my $wanted = sub {
- $p->{path} = $File::Find::name if $_ eq $file;
- };
- find($wanted, $dir);
- if (!$p->{path}) {
- print STDERR "Cannot find $file in zypp cache ($dir)\n";
- next;
- }
- }
- for my $p (@$packages) {
- next unless $p->{path};
- open(my $pipe, '-|', "rpm", "-qlp", $p->{path});
- my @files = <$pipe>;
- close($pipe);
- for my $f (@files) {
- add_module($p, $f);
- }
- }
-}
-
-# treat -n, --non-interactive, -0 and --non-interactive-include-reboot-patches
-# as global zypper options
-my @save_argv = @ARGV;
-@ARGV=();
-for my $a (@save_argv) {
- if ($a =~ /^-(h|-help)$/) {
- print_help();
- exit 0;
- } elsif ($a =~ /^-(n$|-non-interactive$|0$|-non-interactive-)/) {
- push(@zypper_cmd, $a);
- } else {
- push(@ARGV, $a);
- }
-}
-if (!@ARGV) {
- print_help();
- exit 1;
-}
-
-print "Fetching packages\n";
-my (@new_pkgs, @remove_pkgs, @installed_pkgs);
-my $ret = fetch_packages(0, \@new_pkgs, \@remove_pkgs, @ARGV);
-if ($ret != 0) {
- print "zypper returned an error, retrying in interactive mode\n";
- @new_pkgs = ();
- @remove_pkgs = ();
- $ret = fetch_packages(1, \@new_pkgs, \@remove_pkgs, @ARGV);
-}
-if ($ret != 0) {
- exit 1;
-}
-find_fetched(\@new_pkgs, @ARGV);
-query_installed_kmps(\@installed_pkgs);
-
-# Do not check packages to be updated/removed for module conflicts
-my (%new_pkgs, %remove_pkgs);
-for my $p (@remove_pkgs) {
- my $nvra = "$p->{name}-$->{version}.$p->{arch}";
- $remove_pkgs{$nvra} = 1;
-}
-for my $p (@new_pkgs) {
- $new_pkgs{$p->{name}} = 1;
-}
-my @tmp = @installed_pkgs;
-@installed_pkgs = ();
-for my $p (@tmp) {
- my $nvra = "$p->{name}-$->{version}.$p->{arch}";
- next if $new_pkgs{$p->{name}} || $remove_pkgs{$nvra};
- push(@installed_pkgs, $p);
-}
-
-# check for conflicts
-my %new_modules;
-for my $p (@new_pkgs) {
- next unless $p->{modules};
- for my $m (@{$p->{modules}}) {
- $new_modules{$m} = $p->{name};
- }
-}
-my @conflicting_pkgs;
-for my $p (@installed_pkgs) {
- next unless $p->{modules};
- for my $m (@{$p->{modules}}) {
- next unless exists($new_modules{$m});
- print "Package $p->{name} conflicts with new package
$new_modules{$m}\n";
- push(@conflicting_pkgs, $p);
- last;
- }
-}
-
-# Install new packages, removing conflicting installed packages
-my @cmd = (@zypper_cmd, "install", @ARGV);
-for my $p (@conflicting_pkgs) {
- push(@cmd, "!$p->{name}.$p->{arch}=$p->{version}");
-}
-print join(" ", "Running", @cmd), "\n";
-if (system(@cmd) != 0) {
- exit 1;
-}
-exit 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.39/suse-module-tools.spec
new/suse-module-tools-16.0.42/suse-module-tools.spec
--- old/suse-module-tools-16.0.39/suse-module-tools.spec 2023-12-14
20:58:45.000000000 +0100
+++ new/suse-module-tools-16.0.42/suse-module-tools.spec 2024-01-03
10:58:53.000000000 +0100
@@ -28,7 +28,7 @@
%global systemd_units %{?with_boot_sysctl:boot-sysctl.service}
%{?with_kernel_sysctl:kernel-sysctl.service}
# List of legacy file systems to be blacklisted by default
-%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs f2fs freevxfs
hfs hfsplus hpfs jffs2 jfs kafs minix nilfs2 ntfs ntfs3 omfs orangefs pstore
qnx4 qnx6 romfs sysv ufs zonefs
+%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs f2fs freevxfs
hfs hfsplus hpfs jffs2 jfs kafs minix nilfs2 ntfs ntfs3 omfs orangefs pstore
qnx4 qnx6 reiserfs romfs sysv ufs zonefs
# List of all files installed under modprobe.d
# Note: this list contains files installed by previous versions, like
00-system-937216.conf!
@@ -36,7 +36,7 @@
%global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^
]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
Name: suse-module-tools
-Version: 16.0.39
+Version: 16.0.42
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -127,7 +127,6 @@
done
install -d -m 755 "%{buildroot}%{_prefix}/bin"
-install -pm 755 kmp-install "%{buildroot}%{_bindir}/"
# systemd service(s) to load kernel-specific sysctl settings
install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
@@ -223,7 +222,6 @@
%dir %{_sysconfdir}/modprobe.d
%{depmod_dir}
%dir %{_sysconfdir}/depmod.d
-%{_bindir}/kmp-install
%dir /usr/lib/module-init-tools
/usr/lib/module-init-tools/driver-check.sh
/usr/lib/module-init-tools/lsinitrd-quick
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.39/udevrules/60-io-scheduler.rules
new/suse-module-tools-16.0.42/udevrules/60-io-scheduler.rules
--- old/suse-module-tools-16.0.39/udevrules/60-io-scheduler.rules
2023-12-14 20:58:45.000000000 +0100
+++ new/suse-module-tools-16.0.42/udevrules/60-io-scheduler.rules
2024-01-03 10:58:53.000000000 +0100
@@ -11,6 +11,7 @@
SUBSYSTEM!="block", GOTO="scheduler_end"
ACTION!="add|change", GOTO="scheduler_end"
ENV{DEVTYPE}!="disk", GOTO="scheduler_end"
+TEST!="%S%p/queue/scheduler", GOTO="scheduler_end"
# For dm devices, the relevant events are "change" events, see 10-dm.rules
ACTION!="change", KERNEL=="dm-*", GOTO="scheduler_end"
++++++ suse-module-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.NS2iaZ/_old 2024-01-04 15:58:28.454878970 +0100
+++ /var/tmp/diff_new_pack.NS2iaZ/_new 2024-01-04 15:58:28.458879116 +0100
@@ -1,5 +1,5 @@
name: suse-module-tools
-version: 16.0.39
-mtime: 1702583925
-commit: d2e769f1f4ed527b68a1a5894c7ffeb84e32d2a0
+version: 16.0.42
+mtime: 1704275933
+commit: 065d699b3b505b10a27efcb79acee44215615171
