Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2021-03-16 15:43:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder" Tue Mar 16 15:43:12 2021 rev:35 rq:879192 version:1.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2021-02-11 12:46:19.681396334 +0100 +++ /work/SRC/openSUSE:Factory/.product-builder.new.2401/product-builder.changes 2021-03-16 15:44:16.653025004 +0100 @@ -1,0 +2,6 @@ +Mon Mar 15 12:26:31 UTC 2021 - Adrian Schr??ter <adr...@suse.de> + +- 1.3.3 + * armv7l support + +------------------------------------------------------------------- Old: ---- product-builder-1.3.2.obscpio New: ---- product-builder-1.3.3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ product-builder.spec ++++++ --- /var/tmp/diff_new_pack.IpvqeD/_old 2021-03-16 15:44:17.181025848 +0100 +++ /var/tmp/diff_new_pack.IpvqeD/_new 2021-03-16 15:44:17.181025848 +0100 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.3.2 +Version: 1.3.3 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.IpvqeD/_old 2021-03-16 15:44:17.209025893 +0100 +++ /var/tmp/diff_new_pack.IpvqeD/_new 2021-03-16 15:44:17.209025893 +0100 @@ -1,8 +1,8 @@ <services> <service name="obs_scm" mode="manual"> <param name="url">https://github.com/openSUSE/product-builder.git</param> - <param name="revision">1.3.2</param> - <param name="version">1.3.2</param> + <param name="revision">1.3.3</param> + <param name="version">1.3.3</param> <param name="scm">git</param> <param name="extract">rpm/product-builder.spec</param> </service> ++++++ product-builder-1.3.2.obscpio -> product-builder-1.3.3.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.3.2/modules/KIWIIsoLinux.pm new/product-builder-1.3.3/modules/KIWIIsoLinux.pm --- old/product-builder-1.3.2/modules/KIWIIsoLinux.pm 2021-02-08 16:54:51.000000000 +0100 +++ new/product-builder-1.3.3/modules/KIWIIsoLinux.pm 2021-03-15 13:23:44.000000000 +0100 @@ -147,6 +147,10 @@ $base{aarch64}{boot} = "boot/aarch64"; $base{aarch64}{loader} = "undef"; $base{aarch64}{efi} = "boot/aarch64/efi"; + # armv7l + $base{armv7l}{boot} = "boot/armv7l"; + $base{armv7l}{loader} = "undef"; + $base{armv7l}{efi} = "boot/armv7l/efi"; # riscv64 $base{riscv64}{boot} = "boot/riscv64"; $base{riscv64}{loader} = "undef"; @@ -205,6 +209,9 @@ if ($arch eq "aarch64") { push (@catalog, "aarch64_efi"); } + if ($arch eq "armv7l") { + push (@catalog, "armv7l_efi"); + } if ($arch eq "riscv64") { push (@catalog, "riscv64_efi"); } @@ -493,6 +500,36 @@ } #========================================== +# armv7l_efi +#------------------------------------------ +sub armv7l_efi { + my $this = shift; + my $arch = shift; + my %base = %{$this->{base}}; + my $para = $this -> {params}; + my $magicID= $this -> {magicID}; + my $boot = $base{$arch}{boot}; + my $loader= $base{$arch}{efi}; + my $sort = $this -> createLegacySortFile ("armv7l"); + my $src = $this -> {source}; + KIWIQX::qxx ("echo $src/boot/$arch/efi 1000001 >> $sort"); + #========================================== + # add end-of-header marker + #------------------------------------------ + KIWIQX::qxx ("echo $magicID > ".$this->{tmpdir}."/glump"); + KIWIQX::qxx ("echo ".$this->{tmpdir}."/glump 1000000 >> $sort") if $sort; + $para.= " -hide glump -hide-joliet glump"; + $para.= " -sort $sort" if $sort; + $para.= " -no-emul-boot"; + # do not add -boot-load-size 1 here + $para.= " -b $loader"; + $para.= " -c $boot/boot.catalog"; + $para.= " -hide $boot/boot.catalog -hide-joliet $boot/boot.catalog"; + $this -> {params} = $para; + return $this; +} + +#========================================== # riscv64_efi #------------------------------------------ sub riscv64_efi { @@ -570,7 +607,7 @@ $this -> cleanISO(); return; } - if ($arch ne "aarch64" && $arch ne "riscv64") { + if ($arch ne "aarch64" && $arch ne "armv7l" && $arch ne "riscv64") { find ({wanted => $wref,follow => 0 },$src."/".$base{$arch}{boot}."/loader"); } print $FD "$ldir/".$base{$arch}{boot}."/boot.catalog 3"."\n"; ++++++ product-builder.obsinfo ++++++ --- /var/tmp/diff_new_pack.IpvqeD/_old 2021-03-16 15:44:17.365026143 +0100 +++ /var/tmp/diff_new_pack.IpvqeD/_new 2021-03-16 15:44:17.369026149 +0100 @@ -1,5 +1,5 @@ name: product-builder -version: 1.3.2 -mtime: 1612799691 -commit: 91ccd6db15efcab3020bb1e9b90ed63a01a8d164 +version: 1.3.3 +mtime: 1615811024 +commit: 52509a6375ae663e93d0997085a969dcada02b36