Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2016-08-03 11:45:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mksusecd" Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2016-07-15 12:55:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes 2016-08-03 11:45:30.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 2 12:35:20 UTC 2016 - snwint@suse.com + +- catch error when we fail to unpack squashfs images +- handle modules.order and modules.builtin when updating a kernel +- 1.41 + +------------------------------------------------------------------- Old: ---- mksusecd-1.40.tar.xz New: ---- mksusecd-1.41.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.teUYJy/_old 2016-08-03 11:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.teUYJy/_new 2016-08-03 11:45:31.000000000 +0200 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 1.40 +Version: 1.41 Release: 0 Summary: Create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-1.40.tar.xz -> mksusecd-1.41.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.40/VERSION new/mksusecd-1.41/VERSION --- old/mksusecd-1.40/VERSION 2016-07-15 10:10:59.000000000 +0200 +++ new/mksusecd-1.41/VERSION 2016-08-02 14:31:06.000000000 +0200 @@ -1 +1 @@ -1.40 +1.41 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.40/changelog new/mksusecd-1.41/changelog --- old/mksusecd-1.40/changelog 2016-07-15 10:10:59.000000000 +0200 +++ new/mksusecd-1.41/changelog 2016-08-02 14:31:06.000000000 +0200 @@ -1,3 +1,7 @@ +2016-08-02: 1.41 + - catch error when we fail to unpack squashfs images + - handle modules.order and modules.builtin when updating a kernel + 2016-07-14: 1.40 - tw support: also sign image files - sanitize function that removes files from iso diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.40/mksusecd new/mksusecd-1.41/mksusecd --- old/mksusecd-1.40/mksusecd 2016-07-15 10:10:59.000000000 +0200 +++ new/mksusecd-1.41/mksusecd 2016-08-02 14:31:06.000000000 +0200 @@ -2848,7 +2848,9 @@ if(-f "$orig_initrd/parts/00_lib") { rmdir $unpack_dir; - system "unsquashfs -n -d $unpack_dir $orig_initrd/parts/00_lib >/dev/null 2>&1"; + if(system "unsquashfs -n -d $unpack_dir $orig_initrd/parts/00_lib >/dev/null 2>&1") { + die "parts/00_lib: failed to unpack squashfs image - squashfs tools too old?\n"; + } } File::Find::find({ @@ -2965,6 +2967,24 @@ } } + # copy modules.order & modules.builtin + + if(-f "$kernel->{dir}/lib/modules/$kernel->{version}/modules.builtin") { + system "cp $kernel->{dir}/lib/modules/$kernel->{version}/modules.builtin $kernel->{new_dir}/lib/modules/$kernel->{version}/"; + } + + if(open my $f, "$kernel->{dir}/lib/modules/$kernel->{version}/modules.order") { + if(open my $w, ">$kernel->{new_dir}/lib/modules/$kernel->{version}/modules.order") { + while(<$f>) { + chomp; + s#.*/#initrd/#; + print $w "$_\n" if -f "$kernel->{new_dir}/lib/modules/$kernel->{version}/$_"; + } + close $w; + } + close $f; + } + system "depmod -a -b $kernel->{new_dir} $kernel->{version}"; # now get firmware files