Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2017-12-06 08:54:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder" Wed Dec 6 08:54:02 2017 rev:13 rq:547017 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2017-11-24 10:52:07.561423534 +0100 +++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes 2017-12-06 08:54:05.646857757 +0100 @@ -1,0 +2,6 @@ +Fri Dec 1 10:14:49 UTC 2017 - [email protected] + +- tag it as 1.0 +- fix UEFI secure boot (bsc#939456) + +------------------------------------------------------------------- Old: ---- product-builder-1.0~pre.1507277845.84ea077.obscpio New: ---- product-builder-1.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ product-builder.spec ++++++ --- /var/tmp/diff_new_pack.0XQQeY/_old 2017-12-06 08:54:06.654820858 +0100 +++ /var/tmp/diff_new_pack.0XQQeY/_new 2017-12-06 08:54:06.658820712 +0100 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0~pre.1507277845.84ea077 +Version: 1.0 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.0XQQeY/_old 2017-12-06 08:54:06.694819394 +0100 +++ /var/tmp/diff_new_pack.0XQQeY/_new 2017-12-06 08:54:06.694819394 +0100 @@ -1,7 +1,8 @@ <services> <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/openSUSE/product-builder.git</param> - <param name="versionprefix">1.0~pre</param> + <param name="revision">1.0</param> + <param name="version">1.0</param> <param name="scm">git</param> </service> <service mode="disabled" name="set_version"/> ++++++ product-builder-1.0~pre.1507277845.84ea077.obscpio -> product-builder-1.0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.0~pre.1507277845.84ea077/modules/KIWIIsoLinux.pm new/product-builder-1.0/modules/KIWIIsoLinux.pm --- old/product-builder-1.0~pre.1507277845.84ea077/modules/KIWIIsoLinux.pm 2017-08-11 15:22:47.000000000 +0200 +++ new/product-builder-1.0/modules/KIWIIsoLinux.pm 2017-12-01 11:12:17.000000000 +0100 @@ -242,6 +242,20 @@ return $this; } +sub block_size { + my $this = shift; + my $filename = shift; + if (! sysopen(fh,$filename,O_RDONLY) ) { + my $kiwi = $this->{kiwi}; + $kiwi -> error ("Cannot open file $filename: $!"); + $kiwi -> failed (); + return -1; + } + my $size = (stat(fh))[7]; + close(fh); + return ($size/512); +} + #========================================== # x86_64_legacy #------------------------------------------ @@ -294,7 +308,7 @@ my $loader= $base{$arch}{efi}; $para.= " -eltorito-alt-boot"; $para.= " -no-emul-boot"; - $para.= " -boot-load-size 1"; + $para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader); $para.= " -b $loader"; $this -> {params} = $para; return $this; @@ -312,7 +326,7 @@ my $loader= $base{$arch}{efi}; $para.= " -eltorito-alt-boot"; $para.= " -no-emul-boot"; - $para.= " -boot-load-size 1"; + $para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader); $para.= " -b $loader"; $this -> {params} = $para; return $this; @@ -331,7 +345,7 @@ my $sort = $this -> createLegacySortFile ("ia64"); $para.= " -no-emul-boot"; - $para.= " -boot-load-size 1"; + $para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader); $para.= " -sort $sort" if $sort; $para.= " -b $loader"; $para.= " -c $boot/boot.catalog"; ++++++ product-builder.obsinfo ++++++ --- /var/tmp/diff_new_pack.0XQQeY/_old 2017-12-06 08:54:06.874812805 +0100 +++ /var/tmp/diff_new_pack.0XQQeY/_new 2017-12-06 08:54:06.878812658 +0100 @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1507277845.84ea077 -mtime: 1507277845 -commit: 84ea077b51ba138f6c0acf9fdfaa8d6f316d32d1 +version: 1.0 +mtime: 1512123141 +commit: 887600a0d734a1201e8512395025a02bd908513e
