Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2015-03-19 21:23:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-02-27 11:10:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes 2015-03-19 21:23:38.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 19 10:16:20 CET 2015 - [email protected] + +- stick to initrd compression format when extending initrd +- 1.15 + +------------------------------------------------------------------- Old: ---- mksusecd-1.14.tar.xz New: ---- mksusecd-1.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.1WkVNs/_old 2015-03-19 21:23:38.000000000 +0100 +++ /var/tmp/diff_new_pack.1WkVNs/_new 2015-03-19 21:23:38.000000000 +0100 @@ -29,7 +29,7 @@ Summary: Create SUSE Linux installation ISOs License: GPL-3.0+ Group: Hardware/Other -Version: 1.14 +Version: 1.15 Release: 0 Source: %{name}-%{version}.tar.xz Url: https://github.com/wfeldt/mksusecd ++++++ mksusecd-1.14.tar.xz -> mksusecd-1.15.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.14/VERSION new/mksusecd-1.15/VERSION --- old/mksusecd-1.14/VERSION 2015-02-26 15:18:26.000000000 +0100 +++ new/mksusecd-1.15/VERSION 2015-03-19 10:15:23.000000000 +0100 @@ -1 +1 @@ -1.14 +1.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.14/changelog new/mksusecd-1.15/changelog --- old/mksusecd-1.14/changelog 2015-02-26 15:18:26.000000000 +0100 +++ new/mksusecd-1.15/changelog 2015-03-19 10:15:23.000000000 +0100 @@ -1,3 +1,6 @@ +2015-03-19: 1.15 + - stick to initrd compression format when extending initrd + 2015-02-26: 1.14 - replace content.key with actual signing key used - handle duplicate filenames diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.14/mksusecd new/mksusecd-1.15/mksusecd --- old/mksusecd-1.14/mksusecd 2015-02-26 15:18:26.000000000 +0100 +++ new/mksusecd-1.15/mksusecd 2015-03-19 10:15:23.000000000 +0100 @@ -160,6 +160,7 @@ sub get_unpack_commands; sub create_initrd; sub update_initrd; +sub get_initrd_format; sub extract_installkeys; sub create_cd_ikr; sub isolinux_add_option; @@ -288,6 +289,7 @@ my $sign_key_pub; my $sign_key_dir; my $initrd_installkeys; +my $initrd_format; my $progress_start = 0; my $progress_end = 100; @@ -327,6 +329,7 @@ $files = build_filelist; $boot = analyze_boot; + get_initrd_format; update_boot_options; if($opt_sign && (@opt_initrds || update_content)) { extract_installkeys; @@ -1441,7 +1444,9 @@ print "initrd: linuxrc detected, renamed to /init\n"; } - system "( cd $tmp_dir; find . | cpio --quiet -o -H newc --owner 0:0 | gzip -9c ) >> $tmp_initrd"; + my $compr = $initrd_format eq "xz" ? "xz --check=crc32 -c" : "gzip -9c"; + + system "( cd $tmp_dir; find . | cpio --quiet -o -H newc --owner 0:0 | $compr ) >> $tmp_initrd"; # system "ls -lR $tmp_dir"; @@ -1466,6 +1471,37 @@ } +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +sub get_initrd_format +{ + my $f; + + return if $initrd_format; + + for my $b (sort keys %$boot) { + if($boot->{$b}{initrd}) { + my $c = get_unpack_commands fname($boot->{$b}{initrd}), ""; + $c = $c->[0]; + if($c =~ /^(gzip|xz) /) { + if($f) { + die "differing initrd formats: $f & $1\n" if $1 ne $f; + } + else { + $f = $1; + } + } + else { + die "$boot->{$b}{initrd}: invalid initrd format\n" + } + } + } + + # print "initrd format: $f\n"; + + $initrd_format = $f; +} + + # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sub extract_installkeys { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
