Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2021-04-14 10:11:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkdud"
Wed Apr 14 10:11:25 2021 rev:33 rq:885082 version:1.51
Changes:
--------
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2020-07-13
09:06:38.576260952 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new.2401/mkdud.changes 2021-04-14
10:11:54.149587242 +0200
@@ -1,0 +2,7 @@
+Tue Apr 13 15:00:45 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#35
+- adapt to support xz compressed kernel modules (bsc#1184550)
+- 1.51
+
+--------------------------------------------------------------------
Old:
----
mkdud-1.50.tar.xz
New:
----
mkdud-1.51.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkdud.spec ++++++
--- /var/tmp/diff_new_pack.5PfU5g/_old 2021-04-14 10:11:54.541587904 +0200
+++ /var/tmp/diff_new_pack.5PfU5g/_new 2021-04-14 10:11:54.545587911 +0200
@@ -30,7 +30,7 @@
Summary: Create driver update from rpms
License: GPL-3.0-or-later
Group: Hardware/Other
-Version: 1.50
+Version: 1.51
Release: 0
Source: %{name}-%{version}.tar.xz
Url: https://github.com/openSUSE/mkdud
++++++ mkdud-1.50.tar.xz -> mkdud-1.51.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.50/VERSION new/mkdud-1.51/VERSION
--- old/mkdud-1.50/VERSION 2020-07-10 15:28:59.000000000 +0200
+++ new/mkdud-1.51/VERSION 2021-04-13 17:00:45.000000000 +0200
@@ -1 +1 @@
-1.50
+1.51
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.50/changelog new/mkdud-1.51/changelog
--- old/mkdud-1.50/changelog 2020-07-10 15:28:59.000000000 +0200
+++ new/mkdud-1.51/changelog 2021-04-13 17:00:45.000000000 +0200
@@ -1,3 +1,7 @@
+2021-04-13: 1.51
+ - merge gh#openSUSE/mkdud#35
+ - adapt to support xz compressed kernel modules (bsc#1184550)
+
2020-07-10: 1.50
- merge gh#openSUSE/mkdud#34
- ensure DUD repos are removed at the end of the installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.50/mkdud new/mkdud-1.51/mkdud
--- old/mkdud-1.50/mkdud 2020-07-10 15:28:59.000000000 +0200
+++ new/mkdud-1.51/mkdud 2021-04-13 17:00:45.000000000 +0200
@@ -97,6 +97,11 @@
my @all_archs = qw ( x86_64 aarch64 armv7l i386 ia64 ppc ppc64 ppc64le s390
s390x );
my $REPLACEABLE_YAST = '3.1.135';
+# valid kernel module extensions
+my $kext_regexp = '\.ko(?:\.xz)?';
+my $kext_glob = '.ko{,.xz}';
+my @kext_list = qw ( .ko .ko.xz );
+
sub usage;
sub get_file_arch;
sub file_type;
@@ -436,6 +441,9 @@
#
# Return architecture for $file or undef if it couldn't be determined.
#
+# $file may optionally be xz or gzip compressed (with file extensions .xz
+# resp. .gz).
+#
sub get_file_arch
{
my $file = $_[0];
@@ -457,6 +465,14 @@
'elf64-x86-64' => 'x86_64',
};
+ if($file =~ /\.(gz|xz)$/) {
+ my $compr = 'gzip -dc';
+ $compr = 'xz -dc' if $1 eq 'xz';
+ my $tmp_file = $tmp->file();
+ system "$compr $file > $tmp_file";
+ $file = $tmp_file;
+ }
+
for (`objdump -f $file 2>/dev/null`) {
if(/ file format (\S+)$/) {
my $ar = $arch_map->{$1};
@@ -546,6 +562,23 @@
return;
}
}
+ elsif($_[0] =~ m#${kext_regexp}$#) {
+ my $ft = { file => $_[0] };
+
+ my $ar = get_file_arch $_[0];
+ $ft->{arch} = $ar if defined $ar;
+
+ $ft->{type} = 'module';
+ @i = split " ", `modinfo -F vermagic $_[0] 2>/dev/null`;
+ $ft->{version} = $i[0];
+ my $v = `modinfo -F version $_[0] 2>/dev/null`;
+ chomp $v;
+ $ft->{mod_version} = $v if $v !~ /^\s*$/;
+
+ push @files, $ft;
+
+ return;
+ }
elsif(/^ELF/) {
@i = split /\s*,\s*/;
@@ -562,16 +595,6 @@
$ft->{type} = 'lib';
push @files, $ft;
}
- elsif($_[0] =~ m#\.ko$#) {
- $ft->{type} = 'module';
- @i = split " ", `modinfo -F vermagic $_[0] 2>/dev/null`;
- $ft->{version} = $i[0];
- my $v = `modinfo -F version $_[0] 2>/dev/null`;
- chomp $v;
- $ft->{mod_version} = $v if $v !~ /^\s*$/;
-
- push @files, $ft;
- }
return;
}
@@ -1791,7 +1814,7 @@
# ----------------------------
# modules
- for (glob("$dir/modules/*.ko")) {
+ for (glob("$dir/modules/*${kext_glob}")) {
my $f = $_;
s#^.*/##;
my $n = $_;
