From d8cc13f4dee8171df1f1fe4dfdc621c208e30920 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 20 Nov 2020 18:30:18 +0800 Subject: [PATCH 1/3] [patch tracking] 20201120183007660160 - https://github.com/OSInside/kiwi/commit/40dd2e0a60794df9761436aaf1646988bf5399e5 --- ...2e0a60794df9761436aaf1646988bf5399e5.patch | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 40dd2e0a60794df9761436aaf1646988bf5399e5.patch diff --git a/40dd2e0a60794df9761436aaf1646988bf5399e5.patch b/40dd2e0a60794df9761436aaf1646988bf5399e5.patch new file mode 100644 index 0000000..1d1e32a --- /dev/null +++ b/40dd2e0a60794df9761436aaf1646988bf5399e5.patch @@ -0,0 +1,109 @@ +diff --git a/build-tests/x86/fedora/test-image-microdnf/appliance.kiwi b/build-tests/x86/fedora/test-image-microdnf/appliance.kiwi +new file mode 100644 +index 0000000000..3a4c60f38a +--- /dev/null ++++ b/build-tests/x86/fedora/test-image-microdnf/appliance.kiwi +@@ -0,0 +1,59 @@ ++ ++ ++ ++ ++ Marcus Schaefer ++ ms@suse.com ++ Fedora Rawhide Appliance, Testing microdnf ++ ++ ++ 2.0.0 ++ microdnf ++ charge ++ breeze ++ en_US ++ us ++ UTC ++ false ++ ++ ++ ++ ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/build-tests/x86/fedora/test-image-microdnf/config.sh b/build-tests/x86/fedora/test-image-microdnf/config.sh +new file mode 100644 +index 0000000000..a35897c17f +--- /dev/null ++++ b/build-tests/x86/fedora/test-image-microdnf/config.sh +@@ -0,0 +1,38 @@ ++#!/bin/bash ++#================ ++# FILE : config.sh ++#---------------- ++# PROJECT : OpenSuSE KIWI Image System ++# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved ++# : ++# AUTHOR : Marcus Schaefer ++# : ++# BELONGS TO : Operating System images ++# : ++# DESCRIPTION : configuration script for SUSE based ++# : operating systems ++# : ++# : ++# STATUS : BETA ++#---------------- ++#====================================== ++# Functions... ++#-------------------------------------- ++test -f /.kconfig && . /.kconfig ++test -f /.profile && . /.profile ++ ++#====================================== ++# Greeting... ++#-------------------------------------- ++echo "Configure image: [$kiwi_iname]..." ++ ++#====================================== ++# Activate services ++#-------------------------------------- ++baseInsertService dbus-broker ++baseInsertService NetworkManager ++ ++#====================================== ++# Setup default target, multi-user ++#-------------------------------------- ++baseSetRunlevel 3 -- Gitee From 20e6386f66fc8fff1e04ee636c17732be26be6cb Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 20 Nov 2020 18:30:21 +0800 Subject: [PATCH 2/3] [patch tracking] 20201120183007660160 - https://github.com/OSInside/kiwi/commit/c71e0ce944318df9df895de63e7bfaf24251f471 --- ...0ce944318df9df895de63e7bfaf24251f471.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 c71e0ce944318df9df895de63e7bfaf24251f471.patch diff --git a/c71e0ce944318df9df895de63e7bfaf24251f471.patch b/c71e0ce944318df9df895de63e7bfaf24251f471.patch new file mode 100644 index 0000000..9b7e2dc --- /dev/null +++ b/c71e0ce944318df9df895de63e7bfaf24251f471.patch @@ -0,0 +1,35 @@ +diff --git a/.bumpversion.cfg b/.bumpversion.cfg +index fb13a911b6..3e49833907 100644 +--- a/.bumpversion.cfg ++++ b/.bumpversion.cfg +@@ -1,5 +1,5 @@ + [bumpversion] +-current_version = 9.21.25 ++current_version = 9.21.26 + commit = True + tag = True + +diff --git a/doc/source/conf.py b/doc/source/conf.py +index 25d8173a71..1364aaa3fa 100644 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -128,7 +128,7 @@ def setup(app): + # built documents. + # + # The short X.Y version. +-version = '9.21.25' ++version = '9.21.26' + # The full version, including alpha/beta/rc tags. + release = version + +diff --git a/kiwi/version.py b/kiwi/version.py +index 287666b350..8e7777f900 100644 +--- a/kiwi/version.py ++++ b/kiwi/version.py +@@ -18,5 +18,5 @@ + """ + Global version information used in kiwi and the package + """ +-__version__ = '9.21.25' ++__version__ = '9.21.26' + __githash__ = '$Format:%H$' -- Gitee From 68eed9bd2a6e67f60190282764883dc0d9ea660f Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 20 Nov 2020 18:30:22 +0800 Subject: [PATCH 3/3] [patch tracking] 20201120183007660160 - update spec file --- kiwi.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kiwi.spec b/kiwi.spec index e59772e..2a5dfd3 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -2,12 +2,14 @@ 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: 40dd2e0a60794df9761436aaf1646988bf5399e5.patch +Patch6001: c71e0ce944318df9df895de63e7bfaf24251f471.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils @@ -189,6 +191,9 @@ done %{_mandir}/man8/%{name}* %changelog +* 20201120183007660160 patch-tracking 9.21.5-2 +- append patch file of upstream repository from <40dd2e0a60794df9761436aaf1646988bf5399e5> to + * Tue Jul 28 2020 xinghe - 9.21.5-1 - update version to 9.21.5 @@ -208,4 +213,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