commit product-builder for openSUSE:Factory

8 Jun 2018

Hello community,

here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2018-06-08 23:20:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
 and      /work/SRC/openSUSE:Factory/.product-builder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "product-builder"

Fri Jun  8 23:20:04 2018 rev:23 rq:614497 version:1.1.3

Changes:
--------

--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes	2018-06-04 13:23:48.969794846 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes	2018-06-08 23:20:08.293936992 +0200
@@ -1,0 +2,30 @@
+Wed Jun  6 08:57:09 UTC 2018 - adrian@suse.de
+
+- 1.1.3
+  * Another fix needed for hybrid media on x86_64
+
+-------------------------------------------------------------------
+Tue Jun  5 12:46:51 UTC 2018 - adrian@suse.de
+
+- 1.1.2
+  * Do not generate Apple partion on ppc64le anymore
+  * Allow to build medias without meta packages again
+
+-------------------------------------------------------------------
+Mon Jun  4 13:35:16 UTC 2018 - adrian@suse.de
+
+- 1.1.1
+  * fix EFI boot sort order
+- drop factory skelcd hack (accept_old_meta_package.patch)
+
+-------------------------------------------------------------------
+Tue May 29 15:04:31 UTC 2018 - adrian@suse.de
+
+- 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:
----
  accept_old_meta_package.patch
  product-builder-1.0.9.obscpio

New:
----
  product-builder-1.1.3.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.bQVa4v/_old	2018-06-08 23:20:09.517892776 +0200
+++ /var/tmp/diff_new_pack.bQVa4v/_new	2018-06-08 23:20:09.521892631 +0200
@@ -23,12 +23,10 @@
 Name:           product-builder
 Conflicts:      kiwi
 Conflicts:      kiwi-instsource
-Version:        1.0.9
+Version:        1.1.3
 Release:        0
 Provides:       kiwi-schema = 6.2
 Source:         product-builder-%version.tar.xz
-# temporary hack for openSUSE:Factory only
-Patch1:         accept_old_meta_package.patch
 
 Requires:       libxslt
 Requires:       perl >= %{perl_version}
@@ -61,9 +59,6 @@
 
 %prep
 %setup -q
-%if 0%{?skelcd_compat}
-%patch1 -p1
-%endif
 
 %build
 test -e /.buildenv && . /.buildenv
@@ -77,9 +72,8 @@
 ./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
 
 %files
-%defattr(-, root, root)
 %dir %{_datadir}/kiwi
-%doc LICENSE
+%license LICENSE
 %{_datadir}/kiwi/.revision
 %{_datadir}/kiwi/metadata
 %{_datadir}/kiwi/modules

++++++ _service ++++++
--- /var/tmp/diff_new_pack.bQVa4v/_old	2018-06-08 23:20:09.557891331 +0200
+++ /var/tmp/diff_new_pack.bQVa4v/_new	2018-06-08 23:20:09.557891331 +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.0.9</param>
-    <param name="version">1.0.9</param>
+    <param name="revision">1.1.3</param>
+    <param name="version">1.1.3</param>
     <param name="scm">git</param>
     <param name="extract">rpm/product-builder.spec</param>
   </service>

++++++ product-builder-1.0.9.obscpio -> product-builder-1.1.3.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.0.9/modules/KIWICollect.pm new/product-builder-1.1.3/modules/KIWICollect.pm
--- old/product-builder-1.0.9/modules/KIWICollect.pm	2018-04-24 18:21:20.000000000 +0200
+++ new/product-builder-1.1.3/modules/KIWICollect.pm	2018-06-06 10:52:39.000000000 +0200
@@ -396,14 +396,12 @@
         $attr{source}    = $package -> getSourceLocation();
         $attr{script}    = $package -> getScriptPath();
         $attr{medium}    = $package -> getMediaID();
-        $metaPacks{$name} = \%attr;
+        push @{$this->{m_metaPacks}{$name}}, \%attr;
     }
-    %{$this->{m_metaPacks}}  = %metaPacks;
     if(!$this->{m_metaPacks}) {
         my $msg = 'KIWICollect::Init: getProductMetaPackages '
             . 'returned no information, no metadata specified.';
-        $this->logMsg('E', $msg);
-        return;
+        $this->logMsg('I', $msg);
     } else {
         $this->logMsg('I', "KIWICollect::Init: retrieved metapackage list.");
         if($this->{m_debug}) {
@@ -806,19 +804,6 @@
                         . '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;
                 }
@@ -1507,15 +1492,15 @@
     my $this = shift @packlist;
     METAPACKAGE:
     for my $metapack(@packlist) {
-        my %packOptions = %{$this->{m_metaPacks}->{$metapack}};
+      for 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
@@ -1529,16 +1514,17 @@
             return 1;
         }
         my $nofallback = 0;
+
         ARCH:
         for my $reqArch (
             $this->getArchList(
-                $this->{m_metaPacks}->{$metapack}, $metapack, \$nofallback
+                $packOptions, $metapack, \$nofallback
             )
         ) {
             if ($reqArch =~ m{(src|nosrc)}) {
                 next;
             }
-            if (defined($packOptions{$reqArch})) {
+            if (defined($packOptions->{$reqArch})) {
                 next;
             }
             my @fallbacklist;
@@ -1627,6 +1613,7 @@
              }
           }
         }
+      }
     }
     # cleanup old files:
     for my $index($this->getMediaNumbers()) {
@@ -2146,7 +2133,25 @@
             chomp $_;
             $this->logMsg('I', "\t$_");
         }
-        @data = ();
+
+        # 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
     }
 
     # retrieve a complete list of all loaded plugins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.0.9/modules/KIWIIsoLinux.pm new/product-builder-1.1.3/modules/KIWIIsoLinux.pm
--- old/product-builder-1.0.9/modules/KIWIIsoLinux.pm	2018-04-24 18:21:20.000000000 +0200
+++ new/product-builder-1.1.3/modules/KIWIIsoLinux.pm	2018-06-06 10:52:39.000000000 +0200
@@ -307,8 +307,18 @@
     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 ("x86_64");
+    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.= " -sort $sort" if $sort;
     $para.= " -eltorito-alt-boot";
     $para.= " -eltorito-platform efi";
     $para.= " -no-emul-boot";
@@ -328,6 +338,7 @@
     my $para  = $this -> {params};
     my $boot  = $base{$arch}{boot};
     my $loader= $base{$arch}{efi};
+
     $para.= " -eltorito-alt-boot";
     $para.= " -eltorito-platform efi";
     $para.= " -no-emul-boot";
@@ -425,7 +436,21 @@
 sub ppc64le_default {
     my $this = shift;
     my $arch = shift;
-    $this->ppc64_default($arch);
+
+    my %base  = %{$this->{base}};
+    my $para  = $this -> {params};
+    my $src   = $this -> {source};
+    my $boot  = $base{$arch}{boot};
+    my $volid = $this -> createVolumeID();
+
+    $para.= " -chrp-boot";
+    $para.= " -hfs-bless $src/$boot/grub2-ieee1275";
+    $para.= " -hfs-volid '$volid'";
+    $para.= " -l";
+    $para.= " -part";
+    $para.= " -U";
+    $this -> {params} = $para;
+    return $this;
 }
 
 #==========================================
@@ -446,65 +471,6 @@
     $this -> {params} = $para;
     return $this;
 }
-
-#==========================================
-# 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.0.9/modules/KIWIXML.pm new/product-builder-1.1.3/modules/KIWIXML.pm
--- old/product-builder-1.0.9/modules/KIWIXML.pm	2018-04-24 18:21:20.000000000 +0200
+++ new/product-builder-1.1.3/modules/KIWIXML.pm	2018-06-06 10:52:39.000000000 +0200
@@ -268,6 +268,7 @@
         ppc
         ppc64
         ppc64le
+        riscv64
         s390
         s390x
         x86_64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.0.9/modules/KIWIXMLDataBase.pm new/product-builder-1.1.3/modules/KIWIXMLDataBase.pm
--- old/product-builder-1.0.9/modules/KIWIXMLDataBase.pm	2018-04-24 18:21:20.000000000 +0200
+++ new/product-builder-1.1.3/modules/KIWIXMLDataBase.pm	2018-06-06 10:52:39.000000000 +0200
@@ -72,6 +72,7 @@
         ppc
         ppc64
         ppc64le
+        riscv64
         s390
         s390x
         x86_64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.0.9/rpm/product-builder.spec new/product-builder-1.1.3/rpm/product-builder.spec
--- old/product-builder-1.0.9/rpm/product-builder.spec	2018-04-24 18:21:20.000000000 +0200
+++ new/product-builder-1.1.3/rpm/product-builder.spec	2018-06-06 10:52:39.000000000 +0200
@@ -23,12 +23,10 @@
 Name:           product-builder
 Conflicts:      kiwi
 Conflicts:      kiwi-instsource
-Version:        1.0.7
+Version:        1.1.1
 Release:        0
 Provides:       kiwi-schema = 6.2
 Source:         product-builder-%version.tar.xz
-# temporary hack for openSUSE:Factory only
-Patch1:         accept_old_meta_package.patch
 
 Requires:       libxslt
 Requires:       perl >= %{perl_version}
@@ -61,9 +59,6 @@
 
 %prep
 %setup -q
-%if 0%{?skelcd_compat}
-%patch1 -p1
-%endif
 
 %build
 test -e /.buildenv && . /.buildenv
@@ -77,9 +72,8 @@
 ./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
 
 %files
-%defattr(-, root, root)
 %dir %{_datadir}/kiwi
-%doc LICENSE
+%license LICENSE
 %{_datadir}/kiwi/.revision
 %{_datadir}/kiwi/metadata
 %{_datadir}/kiwi/modules

++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.bQVa4v/_old	2018-06-08 23:20:09.965876592 +0200
+++ /var/tmp/diff_new_pack.bQVa4v/_new	2018-06-08 23:20:09.965876592 +0200
@@ -1,5 +1,5 @@
 name: product-builder
-version: 1.0.9
-mtime: 1524586880
-commit: ac313bf62d317dba12acbd1f8446242924dca473
+version: 1.1.3
+mtime: 1528275159
+commit: 717e1875568f05082a116dc015563f7bde4ec255

    