Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2021-02-23 20:21:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd" Tue Feb 23 20:21:02 2021 rev:66 rq:874374 version:1.78 Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2020-09-25 16:37:41.108217915 +0200 +++ /work/SRC/openSUSE:Factory/.mksusecd.new.2378/mksusecd.changes 2021-02-23 20:22:43.611778875 +0100 @@ -1,0 +2,7 @@ +Mon Feb 22 15:34:35 UTC 2021 - [email protected] + +- merge gh#openSUSE/mksusecd#53 +- handle .ko.xz modules (bsc#1182573) +- 1.78 + +-------------------------------------------------------------------- Old: ---- mksusecd-1.77.tar.xz New: ---- mksusecd-1.78.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.X2q3ly/_old 2021-02-23 20:22:44.183779380 +0100 +++ /var/tmp/diff_new_pack.X2q3ly/_new 2021-02-23 20:22:44.183779380 +0100 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 1.77 +Version: 1.78 Release: 0 Summary: Tool to create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-1.77.tar.xz -> mksusecd-1.78.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.77/VERSION new/mksusecd-1.78/VERSION --- old/mksusecd-1.77/VERSION 2020-09-25 12:39:23.000000000 +0200 +++ new/mksusecd-1.78/VERSION 2021-02-22 16:34:35.000000000 +0100 @@ -1 +1 @@ -1.77 +1.78 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.77/changelog new/mksusecd-1.78/changelog --- old/mksusecd-1.77/changelog 2020-09-25 12:39:23.000000000 +0200 +++ new/mksusecd-1.78/changelog 2021-02-22 16:34:35.000000000 +0100 @@ -1,3 +1,7 @@ +2021-02-22: 1.78 + - merge gh#openSUSE/mksusecd#53 + - handle .ko.xz modules (bsc#1182573) + 2020-09-25: 1.77 - merge gh#openSUSE/mksusecd#52 - fix add_on_products.xml handling (bsc#1176379) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.77/mksusecd new/mksusecd-1.78/mksusecd --- old/mksusecd-1.77/mksusecd 2020-09-25 12:39:23.000000000 +0200 +++ new/mksusecd-1.78/mksusecd 2021-02-22 16:34:35.000000000 +0100 @@ -137,6 +137,11 @@ my @boot_archs = qw ( x86_64 i386 s390x s390 ia64 aarch64 ppc ppc64 ppc64le ); my $magic_id = "7984fc91-a43f-4e45-bf27-6d3aa08b24cf"; +# valid kernel module extensions +my $kext_regexp = '\.ko(?:\.xz)?'; +my $kext_glob = '.ko{,.xz}'; +my @kext_list = qw ( .ko .ko.xz ); + sub usage; sub check_root; sub show_progress; @@ -3891,7 +3896,7 @@ File::Find::find({ wanted => sub { return if -l; # we don't want links - if(m#([^/]+)\.ko$#) { + if(m#([^/]+)${kext_regexp}$#) { $kernel->{initrd_modules}{$1} = 1; } if(m#/module\.config$#) { @@ -3973,7 +3978,7 @@ for my $m (@opt_kernel_modules) { for (split /,/, $m) { - s/\.ko$//; + s/${kext_regexp}$//; if(s/^-//) { $mods_remove{$_} = 1; } @@ -3992,13 +3997,13 @@ # older modutils put the full path into modules.dep # so remove the "/lib/modules/VERSION/" part if it exists @i = map { s#^/lib/modules/([^/]+)/##; $_ } @i; - if($i[0] =~ m#([^/]+)\.ko$#) { + if($i[0] =~ m#([^/]+)${kext_regexp}$#) { $kernel->{modules}{$1} = $i[0]; # resolve module deps if($kernel->{initrd_modules}{$1} && @i > 1) { shift @i; for my $m (@i) { - if($m =~ m#([^/]+)\.ko$#) { + if($m =~ m#([^/]+)${kext_regexp}$#) { $kernel->{initrd_modules}{$1} = 3 if !$kernel->{initrd_modules}{$1}; } } @@ -4049,14 +4054,16 @@ my %fw; - for my $m (glob("$kernel->{new_dir}/lib/modules/$kernel->{version}/initrd/*.ko")) { + for my $m (glob("$kernel->{new_dir}/lib/modules/$kernel->{version}/initrd/*${kext_glob}")) { chomp $m; + next unless -f $m; + my @l; chomp(@l = `modinfo -F firmware $m`); $m =~ s#.*/##; - $m =~ s#.ko$##; + $m =~ s#${kext_regexp}$##; $fw{$m} = [ @l ] if @l; } @@ -4116,7 +4123,11 @@ mkdir "$tmp_dir/lib/modules/$kernel->{version}/initrd", 0755; for (qw (loop squashfs lz4_decompress xxhash zstd_decompress)) { - rename "$kernel->{new_dir}/lib/modules/$kernel->{version}/initrd/$_.ko", "$tmp_dir/lib/modules/$kernel->{version}/initrd/$_.ko"; + for my $ext (@kext_list) { + if(-f "$kernel->{new_dir}/lib/modules/$kernel->{version}/initrd/$_$ext") { + rename "$kernel->{new_dir}/lib/modules/$kernel->{version}/initrd/$_$ext", "$tmp_dir/lib/modules/$kernel->{version}/initrd/$_$ext"; + } + } } my $err = system "mksquashfs $kernel->{new_dir} $tmp_dir/parts/$p" .
