Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2025-02-06 22:10:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new.2316 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd" Thu Feb 6 22:10:48 2025 rev:85 rq:1243921 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2025-02-04 18:15:11.986139209 +0100 +++ /work/SRC/openSUSE:Factory/.mksusecd.new.2316/mksusecd.changes 2025-02-06 22:12:00.482391841 +0100 @@ -1,0 +2,8 @@ +Thu Feb 6 16:10:24 UTC 2025 - [email protected] + +- merge gh#openSUSE/mksusecd#78 +- make a more determined attempt to create the UEFI boot image if + it is missing (bsc#1236828) +- 3.2 + +-------------------------------------------------------------------- Old: ---- mksusecd-3.1.tar.xz New: ---- mksusecd-3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.C2XPkj/_old 2025-02-06 22:12:01.154419532 +0100 +++ /var/tmp/diff_new_pack.C2XPkj/_new 2025-02-06 22:12:01.158419696 +0100 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 3.1 +Version: 3.2 Release: 0 Summary: Tool to create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-3.1.tar.xz -> mksusecd-3.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-3.1/VERSION new/mksusecd-3.2/VERSION --- old/mksusecd-3.1/VERSION 2025-02-04 14:00:44.000000000 +0100 +++ new/mksusecd-3.2/VERSION 2025-02-06 17:10:24.000000000 +0100 @@ -1 +1 @@ -3.1 +3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-3.1/changelog new/mksusecd-3.2/changelog --- old/mksusecd-3.1/changelog 2025-02-04 14:00:44.000000000 +0100 +++ new/mksusecd-3.2/changelog 2025-02-06 17:10:24.000000000 +0100 @@ -1,3 +1,8 @@ +2025-02-06: 3.2 + - merge gh#openSUSE/mksusecd#78 + - make a more determined attempt to create the UEFI boot image if + it is missing (bsc#1236828) + 2025-02-04: 3.1 - merge gh#openSUSE/mksusecd#77 - s390x: re-create initrd.off if needed (bsc#1236781) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-3.1/mksusecd new/mksusecd-3.2/mksusecd --- old/mksusecd-3.1/mksusecd 2025-02-04 14:00:44.000000000 +0100 +++ new/mksusecd-3.2/mksusecd 2025-02-06 17:10:24.000000000 +0100 @@ -616,6 +616,9 @@ $media_style = get_media_style \@sources; $media_variant = get_media_variant \@sources; + + print "media style $media_style, variant $media_variant\n" if $opt_verbose >= 1; + analyze_products \@sources; build_filelist \@sources; $boot = analyze_boot; @@ -714,10 +717,15 @@ prepare_mkisofs; # print "sources = ", Dumper(\@sources); - # print "boot = ", Dumper($boot); - # print "todo = ", Dumper($todo); # print "mkisofs = ", Dumper($mkisofs); + if($opt_verbose >= 2) { + print "analyzed boot config:\n"; + print Dumper($boot); + print "creating boot config:\n"; + print Dumper($todo); + } + if($opt_verbose >= 3) { print "mkisofs files:\n"; print Dumper($mkisofs->{filelist}); @@ -1186,9 +1194,33 @@ if(-d fname("EFI/BOOT")) { $boot->{efi} = { base => "EFI/BOOT" }; - } - print Dumper $boot if $opt_verbose >= 2; + # Ensure there will be a UEFI boot image if it is currently missing, + # guessing its name if necessary. + # + # This is for media where the UEFI image is 'hidden' in the file system and + # cannot be accessed. + # + # The image will be auto-generated based on the content of the 'EFI' directory. + + for my $arch (@boot_archs) { + next unless $boot->{$arch}; + next if $boot->{$arch}{bl} && $boot->{$arch}{bl}{efi}; + next unless $arch eq 'x86_64' || $arch eq 'i386' || $arch eq 'aarch64'; + next unless -d fname("boot/$arch"); + if($media_variant eq 'live') { + next unless -d fname("boot/$arch/loader"); + $boot->{$arch}{bl}{efi} = { base => "boot/$arch/loader/efiboot.img", arch => $arch }; + if(-f fname("boot/$arch/loader/boot_hybrid.img")) { + $hybrid_mbr_code = fname("boot/$arch/loader/boot_hybrid.img"); + $hybrid_grub = 1; + } + } + else { + $boot->{$arch}{bl}{efi} = { base => "boot/$arch/efi", arch => $arch }; + } + } + } return $boot; } @@ -1210,10 +1242,11 @@ # In theory more than one entry could be created, but BIOSes don't really # expect that... for (sort keys %$boot) { - if($boot->{$_}{bl}{isolinux} && (!$opt_loader || $opt_loader eq "isolinux")) { + if($boot->{$_}{bl} && $boot->{$_}{bl}{isolinux} && (!$opt_loader || $opt_loader eq "isolinux")) { push @legacy_eltorito, { eltorito => $boot->{$_}{bl}{isolinux} }; } if( + $boot->{$_}{bl} && $boot->{$_}{bl}{grub2} && !$boot->{$_}{bl}{chrp} && (!$opt_loader || $opt_loader eq "grub") @@ -1233,7 +1266,7 @@ # standard UEFI boot for (sort keys %$boot) { - if($boot->{$_}{bl}{efi}) { + if($boot->{$_}{bl} && $boot->{$_}{bl}{efi}) { push @$todo, { efi => $boot->{$_}{bl}{efi} }; } } @@ -1263,14 +1296,14 @@ print "zIPL bootable (s390x)\n"; } } - if($boot->{$_}{bl}{ikr}) { + if($boot->{$_}{bl} && $boot->{$_}{bl}{ikr}) { push @$todo, { ikr => $boot->{$_}{bl}{ikr} }; } } # chrp: just ensure we get a proper partition table for (sort keys %$boot) { - if($boot->{$_}{bl}{chrp}) { + if($boot->{$_}{bl} && $boot->{$_}{bl}{chrp}) { print "CHRP bootable ($_)\n"; $hybrid_part_type = 0x96; $opt_hybrid = 1;
