From 4e9d5d1437d05da6137738f1edf4acb83777e531 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sun, 25 Oct 2020 04:30:14 +0800
Subject: [PATCH 1/2] [patch tracking] 20201025043007659989 -
 https://github.com/OSInside/kiwi/commit/b63ec543ba72212583cfa6467211cb24ec22c8e9

---
 ...c543ba72212583cfa6467211cb24ec22c8e9.patch | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 b63ec543ba72212583cfa6467211cb24ec22c8e9.patch

diff --git a/b63ec543ba72212583cfa6467211cb24ec22c8e9.patch b/b63ec543ba72212583cfa6467211cb24ec22c8e9.patch
new file mode 100644
index 0000000..24b5aac
--- /dev/null
+++ b/b63ec543ba72212583cfa6467211cb24ec22c8e9.patch
@@ -0,0 +1,34 @@
+diff --git a/kiwi/config/functions.sh b/kiwi/config/functions.sh
+index 2b82636af5..60ba90efe0 100644
+--- a/kiwi/config/functions.sh
++++ b/kiwi/config/functions.sh
+@@ -296,27 +296,14 @@ function baseGetProfilesUsed {
+ # baseCleanMount
+ #--------------------------------------
+ function baseCleanMount {
+-    for path in /proc/sys/fs/binfmt_misc /proc /dev/pts /sys;do
+-        [ -d "${path}" ] && umount "${path}" &>/dev/null
+-    done
++    echo "DEPRECATED: ${FUNCNAME[0]} is obsolete and only exists as noop method"
+ }
+ 
+ #======================================
+ # baseMount
+ #--------------------------------------
+ function baseMount {
+-    if [ ! -e /proc/cmdline ];then
+-        mount -t proc proc /proc
+-    fi
+-    if [ ! -e /sys/kernel ];then
+-        mount -t sysfs sysfs /sys
+-    fi
+-    if [ ! -e /proc/sys/fs/binfmt_misc/register ];then
+-        mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
+-    fi
+-    if [ ! -e /dev/pts/0 ];then
+-        mount -t devpts -o mode=0620,gid=5 devpts /dev/pts
+-    fi
++    echo "DEPRECATED: ${FUNCNAME[0]} is obsolete and only exists as noop method"
+ }
+ 
+ #======================================
-- 
Gitee


From 7902e200ba4b07391581e51581407536a790ebf6 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sun, 25 Oct 2020 04:30:14 +0800
Subject: [PATCH 2/2] [patch tracking] 20201025043007659989 - update spec file

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

diff --git a/kiwi.spec b/kiwi.spec
index e59772e..befcaec 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -2,12 +2,13 @@
 
 Name:           kiwi
 Version:        9.21.5
-Release:        1
+Release:        2
 License:        GPLv3+
 Summary:        Flexible operating system image builder
 
 URL:            http://osinside.github.io/kiwi/
 Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
+Patch6000: b63ec543ba72212583cfa6467211cb24ec22c8e9.patch
 
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils
@@ -189,6 +190,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 20201025043007659989 patch-tracking 9.21.5-2
+- append patch file of upstream repository from <b63ec543ba72212583cfa6467211cb24ec22c8e9> to <b63ec543ba72212583cfa6467211cb24ec22c8e9>
+
 * Tue Jul 28 2020 xinghe <xinghe1@huawei.com> - 9.21.5-1
 - update version to 9.21.5
 
@@ -208,4 +212,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