From 611dd6aaaa138534d67923013e998c37d5558991 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 16 Oct 2020 21:30:14 +0800 Subject: [PATCH 1/2] [patch tracking] 20201016213007658894 - https://github.com/OSInside/kiwi/commit/2f4a515cf35e1099677ec3cbb7f60a278f361143 --- 2f4a515cf35e1099677ec3cbb7f60a278f361143.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 2f4a515cf35e1099677ec3cbb7f60a278f361143.patch diff --git a/2f4a515cf35e1099677ec3cbb7f60a278f361143.patch b/2f4a515cf35e1099677ec3cbb7f60a278f361143.patch new file mode 100644 index 0000000..73a6cf4 --- /dev/null +++ b/2f4a515cf35e1099677ec3cbb7f60a278f361143.patch @@ -0,0 +1,13 @@ +diff --git a/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh b/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh +index 51cef0392b..d900e76cb6 100755 +--- a/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh ++++ b/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh +@@ -137,7 +137,7 @@ function get_selected_disk { + local count=0 + local device_index=0 + for entry in ${disk_list};do +- if [ $((count % 3)) -eq 0 ];then ++ if [ $((count % 2)) -eq 0 ];then + device_array[${device_index}]=${entry} + device_index=$((device_index + 1)) + fi -- Gitee From d37e26196808d8ffd12333a47173470bca7a56e2 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 16 Oct 2020 21:30:15 +0800 Subject: [PATCH 2/2] [patch tracking] 20201016213007658894 - update spec file --- kiwi.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kiwi.spec b/kiwi.spec index e59772e..500c64b 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: 2f4a515cf35e1099677ec3cbb7f60a278f361143.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils @@ -189,6 +190,9 @@ done %{_mandir}/man8/%{name}* %changelog +* 20201016213007658894 patch-tracking 9.21.5-2 +- append patch file of upstream repository from <2f4a515cf35e1099677ec3cbb7f60a278f361143> to <2f4a515cf35e1099677ec3cbb7f60a278f361143> + * Tue Jul 28 2020 xinghe - 9.21.5-1 - update version to 9.21.5 @@ -208,4 +212,4 @@ done - Remove python2 dependency * Sat Sep 21 2019 openEuler Buildteam - 9.16.12-2 -- Package init +- Package init \ No newline at end of file -- Gitee