Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2015-06-04 11:25:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-18 22:31:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes 2015-06-04 11:25:27.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 3 16:50:56 CEST 2015 - [email protected] + +- work properly when different iso sources are specified +- 1.22 + +------------------------------------------------------------------- Old: ---- mksusecd-1.21.tar.xz New: ---- mksusecd-1.22.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.w8XMp1/_old 2015-06-04 11:25:27.000000000 +0200 +++ /var/tmp/diff_new_pack.w8XMp1/_new 2015-06-04 11:25:27.000000000 +0200 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 1.21 +Version: 1.22 Release: 0 Summary: Create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-1.21.tar.xz -> mksusecd-1.22.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.21/VERSION new/mksusecd-1.22/VERSION --- old/mksusecd-1.21/VERSION 2015-05-18 10:34:33.000000000 +0200 +++ new/mksusecd-1.22/VERSION 2015-06-03 16:45:57.000000000 +0200 @@ -1 +1 @@ -1.21 +1.22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.21/changelog new/mksusecd-1.22/changelog --- old/mksusecd-1.21/changelog 2015-05-18 10:34:33.000000000 +0200 +++ new/mksusecd-1.22/changelog 2015-06-03 16:45:57.000000000 +0200 @@ -1,3 +1,6 @@ +2015-06-03: 1.22 + - work properly when different iso sources are specified + 2015-05-18: 1.21 - get isohybrid binary location right diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.21/mksusecd new/mksusecd-1.22/mksusecd --- old/mksusecd-1.21/mksusecd 2015-05-18 10:34:33.000000000 +0200 +++ new/mksusecd-1.22/mksusecd 2015-06-03 16:45:57.000000000 +0200 @@ -360,6 +360,8 @@ # print "todo = ", Dumper($todo); # print "mkisofs = ", Dumper($mkisofs); + # print Dumper($mkisofs->{exclude}); + if($two_runs) { if($opt_hybrid_fs eq 'iso') { $progress_end = 50; @@ -604,7 +606,7 @@ File::Find::find({ wanted => sub { if(m#^$s->{dir}/(.+)#) { - push @{$mkisofs->{exclude}}, "$files->{$1}/$1" if $files->{$1}; + push @{$mkisofs->{exclude}}, "$files->{$1}/$1" if $files->{$1} && -f "$files->{$1}/$1"; $files->{$1} = $s->{dir}; } }, @@ -1691,34 +1693,26 @@ # wipe files we really don't want sub prepare_normal { - my $p = $files->{boot}; - # try harder, just in case - $p = $files->{suse} unless defined $p; + # cleaning up KIWI isos a bit + for ( "glump" ) { + my $f = fname($_); + push @{$mkisofs->{exclude}}, $f if $f; + } - push @{$mkisofs->{exclude}}, ( - "$p/glump", - ); + push @{$mkisofs->{exclude}}, "TRANS.TBL"; } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sub prepare_micro { - my $p = $files->{boot}; - # try harder, just in case - $p = $files->{suse} unless defined $p; - - push @{$mkisofs->{exclude}}, "$p/suse/$_" for (@boot_archs, "i586", "noarch"); - - push @{$mkisofs->{exclude}}, ( - "$p/docu", - "$p/ls-lR.gz", - "$p/INDEX.gz", - "$p/ARCHIVES.gz", - "$p/ChangeLog", - "$p/updates", - "$p/linux", - ); + for ( + (map { "suse/$_" } @boot_archs, "i586", "noarch"), + "docu", "ls-lR.gz", "INDEX.gz", "ARCHIVES.gz", "ChangeLog", "updates", "linux" + ) { + my $f = fname($_); + push @{$mkisofs->{exclude}}, $f if $f; + } } @@ -1727,31 +1721,30 @@ { prepare_micro; - my $p = $files->{boot}; - # try harder, just in case - $p = $files->{suse} unless defined $p; - - return unless defined $p; - - push @{$mkisofs->{exclude}}, ( - "$p/suse", - "$p/boot/*/*.rpm", - "$p/boot/*/bind", - "$p/boot/*/common", - "$p/boot/*/gdb", - "$p/boot/*/rescue", - "$p/boot/*/root", - "$p/boot/*/sax2", - "$p/boot/*/branding", - "$p/boot/*/openSUSE", - "$p/boot/*/SLES", - "$p/boot/*/SLED", - "$p/boot/*/*-xen", - "$p/control.xml", - "$p/gpg-*", - "$p/NEWS", - "TRANS.TBL", + my $ex = join "|", ( + "boot/.*/.*\\.rpm", + "boot/.*/bind", + "boot/.*/common", + "boot/.*/gdb", + "boot/.*/rescue", + "boot/.*/root", + "boot/.*/sax2", + "boot/.*/branding", + "boot/.*/openSUSE", + "boot/.*/SLES", + "boot/.*/SLED", + "boot/.*/.*-xen", + "control.xml", + "gpg-.*", + "NEWS", ); + + for (sort keys %$files) { + if(m#^suse(/|$)|^$ex$#) { + my $f = fname($_); + push @{$mkisofs->{exclude}}, $f if $f; + } + } } @@ -1760,21 +1753,32 @@ { prepare_nano; - my $p = $files->{boot}; - # try harder, just in case - $p = $files->{suse} unless defined $p; - - return unless defined $p; - - push @{$mkisofs->{exclude}}, ( - "$p/boot/*/*/linux", - "$p/boot/*/*/initrd", - "$p/boot/*/*/biostest", - "$p/boot/*/*/en.tlk", - "$p/EFI", - "$p/boot/*/efi", - "$p/boot/*/grub2*", + my $ex = join "|", ( + "boot/.*/linux", + "boot/.*/initrd", + "boot/.*/biostest", + "boot/.*/en.tlk", ); + + if(!$opt_efi) { + $ex .= "|" . join "|", ( + "boot/.*/efi", + "boot/.*/grub2.*", + ) + } + + $ex = "^$ex\$"; + + if(!$opt_efi) { + $ex .= "|^EFI(/|\$)"; + } + + for (sort keys %$files) { + if(m#$ex#) { + my $f = fname($_); + push @{$mkisofs->{exclude}}, $f if $f; + } + } }
