Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2017-03-17 15:07:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd" Fri Mar 17 15:07:27 2017 rev:32 rq:479996 version:1.44 Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2016-08-13 18:30:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes 2017-03-17 15:07:28.481987335 +0100 @@ -1,0 +2,12 @@ +Thu Mar 16 12:42:33 UTC 2017 - [email protected] + +- support old mksquashfs version +- 1.44 + +------------------------------------------------------------------- +Thu Mar 16 10:55:16 UTC 2017 - [email protected] + +- fix to work with older modules.dep format (bsc#1027636) +- 1.43 + +------------------------------------------------------------------- Old: ---- mksusecd-1.42.tar.xz New: ---- mksusecd-1.44.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.t7E3bA/_old 2017-03-17 15:07:29.529839451 +0100 +++ /var/tmp/diff_new_pack.t7E3bA/_new 2017-03-17 15:07:29.537838322 +0100 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 1.42 +Version: 1.44 Release: 0 Summary: Create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-1.42.tar.xz -> mksusecd-1.44.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.42/VERSION new/mksusecd-1.44/VERSION --- old/mksusecd-1.42/VERSION 2016-08-12 16:56:20.000000000 +0200 +++ new/mksusecd-1.44/VERSION 2017-03-16 13:21:55.000000000 +0100 @@ -1 +1 @@ -1.42 +1.44 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.42/changelog new/mksusecd-1.44/changelog --- old/mksusecd-1.42/changelog 2016-08-12 16:56:20.000000000 +0200 +++ new/mksusecd-1.44/changelog 2017-03-16 13:21:55.000000000 +0100 @@ -1,3 +1,9 @@ +2017-03-16: 1.44 + - support old mksquashfs version + +2017-03-16: 1.43 + - fix to work with older modules.dep format (bsc #1027636) + 2016-08-12: 1.42 - extended help text and added some small fixes - fix choosing an add-on name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.42/mksusecd new/mksusecd-1.44/mksusecd --- old/mksusecd-1.42/mksusecd 2016-08-12 16:56:20.000000000 +0200 +++ new/mksusecd-1.44/mksusecd 2017-03-16 13:21:55.000000000 +0100 @@ -195,6 +195,7 @@ sub replace_kernel_mods; sub new_products_xml; sub prepare_addon; +sub check_mksquashfs_comp; my %config; my $sudo; @@ -346,6 +347,7 @@ my $kernel; my $warned; my $read_write; +my $mksquashfs_has_comp; my $progress_start = 0; my $progress_end = 100; @@ -355,6 +357,8 @@ die "mkisofs: command not found\n" if ! -x $mkisofs->{command}; +$mksquashfs_has_comp = check_mksquashfs_comp; + if($opt_create) { # if(@opt_kernel_rpms) { # die "Sorry, you must run mksusecd as root to replace kernel modules." if $>; @@ -3020,6 +3024,9 @@ for (<$f>) { my @i = split; $i[0] =~ s/:$//; + # 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$#) { $kernel->{modules}{$1} = $i[0]; # resolve module deps @@ -3140,7 +3147,10 @@ rename "$kernel->{new_dir}/lib/modules/$kernel->{version}/initrd/$_", "$tmp_dir/lib/modules/$kernel->{version}/initrd/$_"; } - system "mksquashfs $kernel->{new_dir} $tmp_dir/parts/$p -comp xz -noappend -no-progress >/dev/null 2>&1"; + my $err = system "mksquashfs $kernel->{new_dir} $tmp_dir/parts/$p" . + ($mksquashfs_has_comp ? " -comp xz" : "") . + " -noappend -no-progress >/dev/null 2>&1"; + die "mksquashfs failed\n" if $err; } else { $tmp_dir = $kernel->{new_dir}; @@ -3335,3 +3345,25 @@ build_filelist [ $new_source ]; } + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# check_mksquashfs_comp() +# +# Return 1 if mksquahsfs supports '-comp' option, else 0. +# +sub check_mksquashfs_comp +{ + my $comp_ok = 0; + + if(open my $f, "mksquashfs -help 2>&1 |") { + while(<$f>) { + $comp_ok = 1, last if /^\s*-comp\s/; + } + close $f; + } + + print "mksquashfs has '-comp': $comp_ok\n" if $opt_verbose >= 2; + + return $comp_ok; +} +
