Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2019-03-05 12:16:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder"
Tue Mar 5 12:16:54 2019 rev:25 rq:679575 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-09-11 17:10:36.876029891 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.28833/product-builder.changes
2019-03-05 12:16:58.976994569 +0100
@@ -1,0 +2,6 @@
+Wed Jan 16 14:46:43 UTC 2019 - Adrian Schröter <adr...@suse.de>
+
+- 1.2.1
+ * Use RPi hybrid mode on aarch64 always (no config needed anymore)
+
+-------------------------------------------------------------------
Old:
----
product-builder-1.2.0.obscpio
New:
----
product-builder-1.2.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.gzeSOo/_old 2019-03-05 12:16:59.888994286 +0100
+++ /var/tmp/diff_new_pack.gzeSOo/_new 2019-03-05 12:16:59.892994284 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version: 1.2.0
+Version: 1.2.1
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.gzeSOo/_old 2019-03-05 12:16:59.912994278 +0100
+++ /var/tmp/diff_new_pack.gzeSOo/_new 2019-03-05 12:16:59.916994277 +0100
@@ -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.2.0</param>
- <param name="version">1.2.0</param>
+ <param name="revision">1.2.1</param>
+ <param name="version">1.2.1</param>
<param name="scm">git</param>
<param name="extract">rpm/product-builder.spec</param>
</service>
++++++ product-builder-1.2.0.obscpio -> product-builder-1.2.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.0/modules/KIWICollect.pm
new/product-builder-1.2.1/modules/KIWICollect.pm
--- old/product-builder-1.2.0/modules/KIWICollect.pm 2018-08-24
15:08:40.000000000 +0200
+++ new/product-builder-1.2.1/modules/KIWICollect.pm 2019-01-16
15:41:37.000000000 +0100
@@ -751,97 +751,96 @@
"Module KIWIIsoLinux not loadable: $@"
);
return 1;
- } else {
- my $iso;
- for my $cd ($this->getMediaNumbers()) {
- if ( $cd == 0 ) {
- next;
- }
- ( my $name = $this->{m_basesubdir}->{$cd} ) =~ s{.*/(.*)/*$}{$1};
- my $isoname = $this->{m_united}."/$name.iso";
- # construct volume id, no longer than 32 bytes allowed
- my $volid_maxlen = 32;
- my $vname = $name;
- $vname =~ s/-Media//;
- $vname =~ s/-Build// if length($vname) > ($volid_maxlen - 4);
- my $vid = substr($vname,0,($volid_maxlen));
- if ($this->{m_proddata}->getVar("MULTIPLE_MEDIA", "true") eq
"true") {
- $vid = sprintf(
- "%s.%03d",
- substr($vname,0,($volid_maxlen - 4)), $cd
- );
- }
- my $attr = "-r"; # RockRidge
- $attr .= " -pad"; # pad image by 150 sectors - needed for Linux
- $attr .= " -f"; # follow symlinks - really necessary?
- $attr .= " -J"; # Joilet extensions - only useful for i586/x86_64,
- $attr .= " -joliet-long"; # longer filenames for joilet filenames
- $attr .= " -p \"$this->{gdata}->{Preparer}\"";
- $attr .= " -publisher \"$this->{gdata}->{Publisher}\"";
- $attr .= " -A \"$name\"";
- $attr .= " -V \"$vid\"";
- my $checkmedia = '';
- if ( defined($this->{m_proddata}->getVar("RUN_MEDIA_CHECK"))
- && $this->{m_proddata}->getVar("RUN_MEDIA_CHECK") ne "false"
- ) {
- $checkmedia = "checkmedia";
- }
- my $hybridmedia;
- my $rpihybridmedia;
- if (defined($this->{m_proddata}->getVar("RUN_ISOHYBRID"))) {
- $hybridmedia = 1 if
$this->{m_proddata}->getVar("RUN_ISOHYBRID") eq "true";
- $rpihybridmedia = 1 if
$this->{m_proddata}->getVar("RUN_ISOHYBRID") eq "rpi"
- }
- $iso = KIWIIsoLinux -> new(
- $this->{m_basesubdir}->{$cd},
- $isoname, $attr, $checkmedia, $this->{cmdL}, $this->{m_xml}
+ }
+
+ my $iso;
+ for my $cd ($this->getMediaNumbers()) {
+ if ( $cd == 0 ) {
+ next;
+ }
+ ( my $name = $this->{m_basesubdir}->{$cd} ) =~ s{.*/(.*)/*$}{$1};
+ my $isoname = $this->{m_united}."/$name.iso";
+ # construct volume id, no longer than 32 bytes allowed
+ my $volid_maxlen = 32;
+ my $vname = $name;
+ $vname =~ s/-Media//;
+ $vname =~ s/-Build// if length($vname) > ($volid_maxlen - 4);
+ my $vid = substr($vname,0,($volid_maxlen));
+ if ($this->{m_proddata}->getVar("MULTIPLE_MEDIA", "true") eq "true") {
+ $vid = sprintf(
+ "%s.%03d",
+ substr($vname,0,($volid_maxlen - 4)), $cd
);
- # Just the first media is usually bootable at SUSE
- my $is_bootable = 0;
- if(-d "$this->{m_basesubdir}->{$cd}/boot") {
- if(!$iso->callBootMethods()) {
- my $msg = 'Creating boot methods failed, medium maybe '
- . 'not be bootable';
- $this->logMsg('W', $msg);
- } else {
- $this->logMsg('I', "Boot methods called successfully");
- $is_bootable = 1;
- }
- }
- if(!$iso->createISO()) {
- $this->logMsg('E', "Cannot create Iso image");
- return 1;
+ }
+ my $attr = "-r"; # RockRidge
+ $attr .= " -pad"; # pad image by 150 sectors - needed for Linux
+ $attr .= " -f"; # follow symlinks - really necessary?
+ $attr .= " -J"; # Joilet extensions - only useful for i586/x86_64,
+ $attr .= " -joliet-long"; # longer filenames for joilet filenames
+ $attr .= " -p \"$this->{gdata}->{Preparer}\"";
+ $attr .= " -publisher \"$this->{gdata}->{Publisher}\"";
+ $attr .= " -A \"$name\"";
+ $attr .= " -V \"$vid\"";
+ my $checkmedia = '';
+ if ( defined($this->{m_proddata}->getVar("RUN_MEDIA_CHECK"))
+ && $this->{m_proddata}->getVar("RUN_MEDIA_CHECK") ne "false"
+ ) {
+ $checkmedia = "checkmedia";
+ }
+ my $hybridmedia;
+ if (defined($this->{m_proddata}->getVar("RUN_ISOHYBRID"))) {
+ $hybridmedia = 1 if $this->{m_proddata}->getVar("RUN_ISOHYBRID")
eq "true";
+ }
+ $iso = KIWIIsoLinux -> new(
+ $this->{m_basesubdir}->{$cd},
+ $isoname, $attr, $checkmedia, $this->{cmdL}, $this->{m_xml}
+ );
+ # Just the first media is usually bootable at SUSE
+ my $is_bootable = 0;
+ if(-d "$this->{m_basesubdir}->{$cd}/boot") {
+ if(!$iso->callBootMethods()) {
+ my $msg = 'Creating boot methods failed, medium maybe '
+ . 'not be bootable';
+ $this->logMsg('W', $msg);
} else {
- $this->logMsg('I', "Created Iso image <$isoname>");
+ $this->logMsg('I', "Boot methods called successfully");
+ $is_bootable = 1;
}
- if ($is_bootable) {
- if (! $iso->relocateCatalog()) {
- return 1;
- }
- if (! $iso->fixCatalog()) {
- return 1;
- }
- if ($hybridmedia) {
- if(!$iso->createHybrid()) {
- $this->logMsg('W', "Isohybrid call failed");
- } else {
- $this->logMsg('I', "Isohybrid call successful");
- }
- }
- if ($rpihybridmedia) {
- if(!$iso->createRPiHybrid()) {
- $this->logMsg('W', "Failed to create RPi Hybrid ISO");
- } else {
- $this->logMsg('I', "Successfully created RPi Hybrid
ISO");
- }
- }
+ }
+ if(!$iso->createISO()) {
+ $this->logMsg('E', "Cannot create Iso image");
+ return 1;
+ } else {
+ $this->logMsg('I', "Created Iso image <$isoname>");
+ }
+ if ($is_bootable) {
+ if (! $iso->relocateCatalog()) {
+ return 1;
}
- if(!$iso->checkImage()) {
- $this->logMsg('E', "Tagmedia call failed");
+ if (! $iso->fixCatalog()) {
return 1;
- } else {
- $this->logMsg('I', "Tagmedia call successful");
}
+ if ($hybridmedia) {
+ if(-d "$this->{m_basesubdir}->{$cd}/boot/aarch64") {
+ if(!$iso->createRPiHybrid()) {
+ $this->logMsg('W', "createRPiHybrid call failed");
+ } else {
+ $this->logMsg('I', "createRPiHybrid call successful");
+ }
+ } else {
+ if(!$iso->createHybrid()) {
+ $this->logMsg('W', "Isohybrid call failed");
+ } else {
+ $this->logMsg('I', "Isohybrid call successful");
+ }
+ }
+ }
+ }
+ if(!$iso->checkImage()) {
+ $this->logMsg('E', "Tagmedia call failed");
+ return 1;
+ } else {
+ $this->logMsg('I', "Tagmedia call successful");
}
}
return 0;
++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.gzeSOo/_old 2019-03-05 12:17:00.036994240 +0100
+++ /var/tmp/diff_new_pack.gzeSOo/_new 2019-03-05 12:17:00.036994240 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.0
-mtime: 1535116120
-commit: 2eaf4a9a9d0ff1b8a6e40a45dce57c1640b75787
+version: 1.2.1
+mtime: 1547649697
+commit: 0682d806bcf6ea2a61b04ce10ad60b3c8149155f
