Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2018-06-04 13:22:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder" Mon Jun 4 13:22:50 2018 rev:22 rq: version:1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2018-06-02 11:48:18.112464878 +0200 +++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes 2018-06-04 13:23:48.969794846 +0200 @@ -2,10 +1,0 @@ -Tue May 29 15:04:31 UTC 2018 - [email protected] - -- 1.1.0 - * fixed handling of metapackages with multiple lines for one package - filtered via required architecture - * execute mk_listings when configured (bsc#1094929) - + drop promo / live boot code - * Add riscv64 architecture - -------------------------------------------------------------------- Old: ---- product-builder-1.1.0.obscpio New: ---- product-builder-1.0.9.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ product-builder.spec ++++++ --- /var/tmp/diff_new_pack.PBqT8n/_old 2018-06-04 13:23:49.881761450 +0200 +++ /var/tmp/diff_new_pack.PBqT8n/_new 2018-06-04 13:23:49.885761304 +0200 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.1.0 +Version: 1.0.9 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.PBqT8n/_old 2018-06-04 13:23:49.917760132 +0200 +++ /var/tmp/diff_new_pack.PBqT8n/_new 2018-06-04 13:23:49.921759986 +0200 @@ -1,8 +1,8 @@ <services> <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/openSUSE/product-builder.git</param> - <param name="revision">1.1.0</param> - <param name="version">1.1.0</param> + <param name="revision">1.0.9</param> + <param name="version">1.0.9</param> <param name="scm">git</param> <param name="extract">rpm/product-builder.spec</param> </service> ++++++ product-builder-1.1.0.obscpio -> product-builder-1.0.9.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.1.0/modules/KIWICollect.pm new/product-builder-1.0.9/modules/KIWICollect.pm --- old/product-builder-1.1.0/modules/KIWICollect.pm 2018-05-29 17:02:45.000000000 +0200 +++ new/product-builder-1.0.9/modules/KIWICollect.pm 2018-04-24 18:21:20.000000000 +0200 @@ -396,8 +396,9 @@ $attr{source} = $package -> getSourceLocation(); $attr{script} = $package -> getScriptPath(); $attr{medium} = $package -> getMediaID(); - push @{$this->{m_metaPacks}{$name}}, \%attr; + $metaPacks{$name} = \%attr; } + %{$this->{m_metaPacks}} = %metaPacks; if(!$this->{m_metaPacks}) { my $msg = 'KIWICollect::Init: getProductMetaPackages ' . 'returned no information, no metadata specified.'; @@ -805,6 +806,19 @@ . 'not be bootable'; $this->logMsg('W', $msg); } else { + my $firmware = 'bios'; + my $xmlFirmWare = $this->{m_xml} + -> getImageType() -> getFirmwareType(); + if ($xmlFirmWare) { + $firmware = $xmlFirmWare; + } + if ($firmware eq "efi" || $firmware eq "uefi") { + my @archs = $this->{m_archlist}->headList(); + if (grep {"x86_64" eq $_} @archs) { + $this->logMsg('I', "Add Live setup"); + $iso -> addBootLive(); + } + } $this->logMsg('I', "Boot methods called successfully"); $is_bootable = 1; } @@ -1493,15 +1507,15 @@ my $this = shift @packlist; METAPACKAGE: for my $metapack(@packlist) { - for my $packOptions(@{$this->{m_metaPacks}->{$metapack}}) { + my %packOptions = %{$this->{m_metaPacks}->{$metapack}}; my $poolPackages = $this->{m_packagePool}->{$metapack}; my $medium = 1; my $nokeep = 0; - if (defined($packOptions->{'medium'})) { - if($packOptions->{'medium'} == 0) { + if (defined($packOptions{'medium'})) { + if($packOptions{'medium'} == 0) { $nokeep = 1; } else { - $medium = $packOptions->{'medium'}; + $medium = $packOptions{'medium'}; } } # regular handling: unpack, put everything from CD1..CD<n> to @@ -1515,17 +1529,16 @@ return 1; } my $nofallback = 0; - ARCH: for my $reqArch ( $this->getArchList( - $packOptions, $metapack, \$nofallback + $this->{m_metaPacks}->{$metapack}, $metapack, \$nofallback ) ) { if ($reqArch =~ m{(src|nosrc)}) { next; } - if (defined($packOptions->{$reqArch})) { + if (defined($packOptions{$reqArch})) { next; } my @fallbacklist; @@ -1614,7 +1627,6 @@ } } } - } } # cleanup old files: for my $index($this->getMediaNumbers()) { @@ -2134,25 +2146,7 @@ chomp $_; $this->logMsg('I', "\t$_"); } - - # LISTINGS, aka ARCHIVES.gz - $this->logMsg('I', "Calling mk_listings:"); - my $listings = "/usr/bin/mk_listings"; - if(! (-f $listings or -x $listings)) { - my $msg = "[createMetadata] excutable `$listings` not found. " - . 'Maybe package `inst-source-utils` is not installed?'; - $this->logMsg('E', $msg); - return; - } - my $cmd = "$listings ".$this->{m_basesubdir}->{'1'}; - my @data = qx($cmd); - undef $cmd; - $this->logMsg('I', "[createMetadata] $listings output:"); - for my $item (@data) { - chomp $item; - $this->logMsg('I', "\t$item"); - } - @data = (); # clear list + @data = (); } # retrieve a complete list of all loaded plugins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.1.0/modules/KIWIIsoLinux.pm new/product-builder-1.0.9/modules/KIWIIsoLinux.pm --- old/product-builder-1.1.0/modules/KIWIIsoLinux.pm 2018-05-29 17:02:45.000000000 +0200 +++ new/product-builder-1.0.9/modules/KIWIIsoLinux.pm 2018-04-24 18:21:20.000000000 +0200 @@ -448,6 +448,65 @@ } #========================================== +# addBootLive +#------------------------------------------ +sub addBootLive { + my $this = shift; + my $size = $this->{bootloadsize}; + my $para = $this->{params}; + my $sort = $this->{sortfile}; + my $src = $this->{source}; + my $tmpdir = $this->{tmpdir}; + my $magicID = $this->{magicID}; + my $xml = $this->{xml}; + my $firmware= 'efi'; + my $arch; + if ($size) { + $size = ($size + 2047) >> 11 << 2; + } + if (! -f $sort) { + return; + } + if (-d "$src/boot/x86_64") { + $arch = 'x86_64'; + } elsif (-d "$src/boot/i386") { + $arch = 'i386'; + } else { + return; + } + #========================================== + # Lookup firmware setup + #------------------------------------------ + if ($xml) { + my $type = $xml -> getImageType(); + my $xmlFirmWare = $type -> getFirmwareType(); + if ($xmlFirmWare) { + $firmware = $xmlFirmWare; + } + } + #========================================== + # update sort file + #------------------------------------------ + KIWIQX::qxx ("echo $src/boot/$arch/efi 1000001 >> $sort"); + #========================================== + # add end-of-header marker + #------------------------------------------ + KIWIQX::qxx ("echo $magicID > $tmpdir/glump"); + KIWIQX::qxx ("echo $tmpdir/glump 1000000 >> $sort"); + #========================================== + # update parameter list + #------------------------------------------ + if (($firmware ne 'bios') && (-e "$src/boot/$arch/efi")) { + $para.= ' -eltorito-alt-boot '; + $para.= " -eltorito-platform efi"; + $para.= " -b boot/$arch/efi"; + } + $para.= ' -no-emul-boot -joliet-long -hide glump -hide-joliet glump'; + $this -> {params} = $para; + return $this; +} + +#========================================== # callBootMethods #------------------------------------------ sub callBootMethods { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.1.0/modules/KIWIXML.pm new/product-builder-1.0.9/modules/KIWIXML.pm --- old/product-builder-1.1.0/modules/KIWIXML.pm 2018-05-29 17:02:45.000000000 +0200 +++ new/product-builder-1.0.9/modules/KIWIXML.pm 2018-04-24 18:21:20.000000000 +0200 @@ -268,7 +268,6 @@ ppc ppc64 ppc64le - riscv64 s390 s390x x86_64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.1.0/modules/KIWIXMLDataBase.pm new/product-builder-1.0.9/modules/KIWIXMLDataBase.pm --- old/product-builder-1.1.0/modules/KIWIXMLDataBase.pm 2018-05-29 17:02:45.000000000 +0200 +++ new/product-builder-1.0.9/modules/KIWIXMLDataBase.pm 2018-04-24 18:21:20.000000000 +0200 @@ -72,7 +72,6 @@ ppc ppc64 ppc64le - riscv64 s390 s390x x86_64 ++++++ product-builder.obsinfo ++++++ --- /var/tmp/diff_new_pack.PBqT8n/_old 2018-06-04 13:23:50.421741676 +0200 +++ /var/tmp/diff_new_pack.PBqT8n/_new 2018-06-04 13:23:50.421741676 +0200 @@ -1,5 +1,5 @@ name: product-builder -version: 1.1.0 -mtime: 1527606165 -commit: 9bdc4b5843aefb749e593a73b6077da1a759e47d +version: 1.0.9 +mtime: 1524586880 +commit: ac313bf62d317dba12acbd1f8446242924dca473
