From 800c6e21bbbab1a858a80d58727c6ac1934844d9 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 10 Dec 2020 18:58:55 +0800
Subject: [PATCH 1/2] [patch tracking] 20201210185849779356 -
 https://github.com/OSInside/kiwi/commit/3106136afd588e8a49cf369765527eb49b2a4242

---
 ...136afd588e8a49cf369765527eb49b2a4242.patch | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 3106136afd588e8a49cf369765527eb49b2a4242.patch

diff --git a/3106136afd588e8a49cf369765527eb49b2a4242.patch b/3106136afd588e8a49cf369765527eb49b2a4242.patch
new file mode 100644
index 0000000..f763e0e
--- /dev/null
+++ b/3106136afd588e8a49cf369765527eb49b2a4242.patch
@@ -0,0 +1,39 @@
+diff --git a/build-tests/s390/sle15/test-image-disk/appliance.kiwi b/build-tests/s390/sle15/test-image-disk/appliance.kiwi
+index a3863a9e4f..f15b8f3c99 100644
+--- a/build-tests/s390/sle15/test-image-disk/appliance.kiwi
++++ b/build-tests/s390/sle15/test-image-disk/appliance.kiwi
+@@ -10,7 +10,8 @@
+     </description>
+     <profiles>
+         <profile name="Virtual" description="Image for use with kvm"/>
+-        <profile name="Physical" description="Image for physical storage disk CDL mode"/>
++        <profile name="Physical_DASD" description="Image for physical storage disk CDL mode"/>
++        <profile name="Physical_FBA" description="Image for physical storage disk FBA mode"/>
+     </profiles>
+     <preferences>
+         <version>1.15.1</version>
+@@ -29,7 +30,7 @@
+             <bootloader name="grub2_s390x_emu" console="serial"/>
+         </type>
+     </preferences>
+-    <preferences profiles="Physical">
++    <preferences profiles="Physical_DASD">
+         <type image="oem" filesystem="xfs" kernelcmdline="console=ttyS0 dasd_mod.dasd=ipldev" bootpartition="true" bootfilesystem="ext3" target_blocksize="4096">
+             <bootloader name="grub2_s390x_emu" console="serial" targettype="CDL"/>
+             <oemconfig>
+@@ -38,6 +39,15 @@
+             </oemconfig>
+         </type>
+     </preferences>
++    <preferences profiles="Physical_FBA">
++        <type image="oem" filesystem="xfs" kernelcmdline="console=ttyS0" bootpartition="true" bootfilesystem="ext3">
++            <bootloader name="grub2_s390x_emu" console="serial" targettype="FBA"/>
++            <oemconfig>
++                <oem-swap>true</oem-swap>
++                <oem-swapsize>512</oem-swapsize>
++            </oemconfig>
++        </type>
++    </preferences>
+     <users>
+         <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
+     </users>
-- 
Gitee


From d86ac2c75b0bc4fc85cdda9b57d1d834a4c563ec Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 10 Dec 2020 18:58:56 +0800
Subject: [PATCH 2/2] [patch tracking] 20201210185849779356 - update spec file

---
 kiwi.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kiwi.spec b/kiwi.spec
index a5ce47a..75a0d88 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -2,7 +2,7 @@
 
 Name:           kiwi
 Version:        9.21.5
-Release:        2
+Release:        3
 License:        GPLv3+
 Summary:        Flexible operating system image builder
 
@@ -15,6 +15,7 @@ Patch2:	Include-box-plugin-images-to-build_status.patch
 Patch3:	Added-s390-SLE15-integration-tests.patch
 Patch4:	Cosmetic-update-for-build-status-helper.patch
 Patch5:	Added-universal-box-to-build-status-helper.patch
+Patch6000: 3106136afd588e8a49cf369765527eb49b2a4242.patch
 
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils
@@ -196,6 +197,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 20201210185849779356 patch-tracking 9.21.5-3
+- append patch file of upstream repository from <3106136afd588e8a49cf369765527eb49b2a4242> to <3106136afd588e8a49cf369765527eb49b2a4242>
+
 * Thu Nov 26 2020 wuchaochao <wuchaochao4@huawei.com> - 9.21.5-2
 - Type:bugfix
 - ID:NA
@@ -221,4 +225,4 @@ done
 - Remove python2 dependency
 
 * Sat Sep 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 9.16.12-2
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee