Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2024-07-18 19:19:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd" Thu Jul 18 19:19:27 2024 rev:82 rq:1188252 version:2.19 Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2024-06-07 15:04:16.001739804 +0200 +++ /work/SRC/openSUSE:Factory/.mksusecd.new.17339/mksusecd.changes 2024-07-18 19:19:29.478649613 +0200 @@ -1,0 +2,7 @@ +Wed Jul 17 19:02:32 UTC 2024 - [email protected] + +- merge gh#openSUSE/mksusecd#75 +- update El-Torito UEFI image to match 'EFI' directory (bsc#1227668) +- 2.19 + +-------------------------------------------------------------------- Old: ---- mksusecd-2.18.tar.xz New: ---- mksusecd-2.19.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.fZzSeJ/_old 2024-07-18 19:19:30.126675550 +0200 +++ /var/tmp/diff_new_pack.fZzSeJ/_new 2024-07-18 19:19:30.126675550 +0200 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 2.18 +Version: 2.19 Release: 0 Summary: Tool to create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-2.18.tar.xz -> mksusecd-2.19.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-2.18/VERSION new/mksusecd-2.19/VERSION --- old/mksusecd-2.18/VERSION 2024-06-06 20:21:29.000000000 +0200 +++ new/mksusecd-2.19/VERSION 2024-07-17 21:02:32.000000000 +0200 @@ -1 +1 @@ -2.18 +2.19 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-2.18/changelog new/mksusecd-2.19/changelog --- old/mksusecd-2.18/changelog 2024-06-06 20:21:29.000000000 +0200 +++ new/mksusecd-2.19/changelog 2024-07-17 21:02:32.000000000 +0200 @@ -1,3 +1,7 @@ +2024-07-17: 2.19 + - merge gh#openSUSE/mksusecd#75 + - update El-Torito UEFI image to match 'EFI' directory (bsc#1227668) + 2024-06-06: 2.18 - merge gh#openSUSE/mksusecd#74 - fix --no-joliet option and add warning about too long Joliet file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-2.18/mksusecd new/mksusecd-2.19/mksusecd --- old/mksusecd-2.18/mksusecd 2024-06-06 20:21:29.000000000 +0200 +++ new/mksusecd-2.19/mksusecd 2024-07-17 21:02:32.000000000 +0200 @@ -227,6 +227,7 @@ sub read_ini; sub write_ini; sub create_efi_image; +sub rebuild_efi_image; my %config; my $sudo; @@ -1372,7 +1373,7 @@ elsif($opt_efi && $t eq 'efi') { $has_efi = 1; my $f = fname($_->{$t}{base}); - if(!$f) { + if(!$f || ! -s $f || rebuild_efi_image) { create_efi_image $_->{$t}{base}; $f = fname($_->{$t}{base}); } @@ -5965,11 +5966,19 @@ # sub create_efi_image { - my $file = new_file($_[0]); + return unless fname "EFI"; - my $efi_dir = fname "EFI"; + print "updating UEFI image $_[0]\n"; - return if ! $efi_dir; + my $file = copy_or_new_file($_[0]); + + my $efi_dir = $tmp->dir(); + + for my $x (sort keys %$files) { + if($x =~ m#^EFI($|/)#) { + system "tar -C '$files->{$x}' --mode=u+w -cf - '$x' | tar -C '$efi_dir' -xpf -"; + } + } # efi image size in 512 byte blocks; giving one extra MiB free space my $efi_size = ((split " ", `du --apparent-size -x -B 1M -s $efi_dir`)[0] + 1) << 11; @@ -5981,5 +5990,29 @@ system "mformat -i '$file' -s 32 -h 64 -c 1 -d 1 -v 'EFIBOOT' ::"; # copy files - system "mcopy -i '$file' -s -D o $efi_dir ::"; + system "mcopy -i '$file' -s -D o '$efi_dir/EFI' ::"; +} + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# rebuild_efi_image() +# +# Check whether there were changes to the 'EFI' directory and we need to +# rebuild the el-torito efi image. +# +# Return 1 if the image needs to be rebuilt. +# +sub rebuild_efi_image +{ + my $source_list; + + for my $x (sort keys %$files) { + if($x =~ m#^EFI($|/)#) { + $source_list->{$files->{$x}} = 1; + } + } + + my $count = keys %$source_list; + + return 1 if $count > 1; }
