Hello community,
here is the log from the commit of package
kiwi-instsource-plugins-openSUSE-13-2 for openSUSE:Factory checked in at
2017-06-16 10:53:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-13-2 (Old)
and /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-13-2.new
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-instsource-plugins-openSUSE-13-2"
Fri Jun 16 10:53:54 2017 rev:8 rq:503308 version:0.9
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-13-2/kiwi-instsource-plugins-openSUSE-13-2.changes
2015-11-24 22:31:29.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-13-2.new/kiwi-instsource-plugins-openSUSE-13-2.changes
2017-06-16 10:53:55.650727952 +0200
@@ -1,0 +2,7 @@
+Thu Jun 8 12:44:24 UTC 2017 - [email protected]
+
+- mini iso: Pass kexec=1 to linuxrc (boo#990374)
+ (0001-mini-iso-Pass-kexec-1-to-linuxrc-boo-990374.patch,
+ 0001-Fix-syntax-error-introduced-by-d52ba98d384650e9325ce.patch)
+
+-------------------------------------------------------------------
New:
----
0001-Fix-syntax-error-introduced-by-d52ba98d384650e9325ce.patch
0001-mini-iso-Pass-kexec-1-to-linuxrc-boo-990374.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-instsource-plugins-openSUSE-13-2.spec ++++++
--- /var/tmp/diff_new_pack.5p9Wux/_old 2017-06-16 10:53:56.458614224 +0200
+++ /var/tmp/diff_new_pack.5p9Wux/_new 2017-06-16 10:53:56.462613660 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-instsource-plugins-openSUSE-13-2
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -25,6 +25,8 @@
Version: 0.9
Release: 0
Source: %{name}.tar.xz
+Patch0: 0001-mini-iso-Pass-kexec-1-to-linuxrc-boo-990374.patch
+Patch1: 0001-Fix-syntax-error-introduced-by-d52ba98d384650e9325ce.patch
Provides: kiwi-instsource-plugin
Requires: inst-source-utils >= 2011.5.5
Requires: kiwi-instsource
@@ -44,6 +46,8 @@
%prep
%setup -q -n kiwi-instsource-plugins-openSUSE-13-2
+%patch0 -p1
+%patch1 -p1
%build
# empty because of rpmlint warning rpm-buildroot-usage
++++++ 0001-Fix-syntax-error-introduced-by-d52ba98d384650e9325ce.patch ++++++
>From a25d2cbb378879d49cee8de1a240176fe19f95e4 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <[email protected]>
Date: Tue, 13 Jun 2017 09:15:35 +0200
Subject: [PATCH] Fix syntax error introduced by
d52ba98d384650e9325ce5aeb6569f3ecd3de9cc
---
.../KIWIMiniIsoPlugin.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/KIWIMiniIsoPlugin.pm b/KIWIMiniIsoPlugin.pm
index 2a0d4ebfa..09ea6aac2 100644
--- a/KIWIMiniIsoPlugin.pm
+++ b/KIWIMiniIsoPlugin.pm
@@ -346,7 +346,7 @@ sub updateInitRDNET {
$this -> logMsg("E", "no initrds found!") unless @initrdfiles;
for my $initrd (@initrdfiles) {
- $this -> logMsg("I", "updating $initrd with $repoloc");
+ $this -> logMsg("I", "updating $initrd with $content");
my $fh = FileHandle -> new();
if (! $fh -> open("|$zipper -c >> $initrd")) {
#if (! $fh -> open(">$initrd.append")) {
--
2.12.2
++++++ 0001-mini-iso-Pass-kexec-1-to-linuxrc-boo-990374.patch ++++++
>From d52ba98d384650e9325ce5aeb6569f3ecd3de9cc Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <[email protected]>
Date: Wed, 27 Jul 2016 12:43:49 +0200
Subject: [PATCH] mini iso: Pass kexec=1 to linuxrc (boo#990374)
---
.../KIWIMiniIsoPlugin.pm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/distribution/kiwi-instsource-plugins-openSUSE-Tumbleweed/KIWIMiniIsoPlugin.pm
b/distribution/kiwi-instsource-plugins-openSUSE-Tumbleweed/KIWIMiniIsoPlugin.pm
index 99bd0b71b..2a0d4ebfa 100644
--- a/KIWIMiniIsoPlugin.pm
+++ b/KIWIMiniIsoPlugin.pm
@@ -142,7 +142,8 @@ sub execute {
$this->removeMediaCheck($isolxfiles[0]);
}
- $this -> updateInitRDNET($repoloc);
+ $this -> updateInitRDNET("./etc/linuxrc.d/10_repo",
"defaultrepo=$repoloc\n");
+ $this -> updateInitRDNET("./etc/linuxrc.d/15_kexec", "kexec=1\n");
my @gfxbootfiles;
find(
@@ -320,7 +321,7 @@ sub _makecpiohead {
# download.opensuse.org
# https://bugzilla.opensuse.org/show_bug.cgi?id=916175
sub updateInitRDNET {
- my ($this, $repoloc) = @_;
+ my ($this, $file, $content) = @_;
$this -> logMsg("I", "prepare initrd for NET iso");
@@ -331,10 +332,8 @@ sub updateInitRDNET {
# hardcode for now
$zipper = "xz --check=crc32";
- my $linuxrc = "defaultrepo=$repoloc\n";
-
- my ($cpio, $pad) = _makecpiohead('./etc/linuxrc.d/10_repo', [0, 0,
oct(644), 1, 0, 0, 0, length($linuxrc), 0, 0, 0]);
- $cpio .= $linuxrc;
+ my ($cpio, $pad) = _makecpiohead($file, [0, 0, oct(644), 1, 0, 0, 0,
length($content), 0, 0, 0]);
+ $cpio .= $content;
$cpio .= $pad if $pad;
$cpio .= _makecpiohead();
--
2.12.2
