diff --git a/0ac41c08d48e7f011be20c82a08384739b75d648.patch b/0ac41c08d48e7f011be20c82a08384739b75d648.patch new file mode 100644 index 0000000000000000000000000000000000000000..5a029ef91a55ea09e265232a4dc02511501c8cc8 --- /dev/null +++ b/0ac41c08d48e7f011be20c82a08384739b75d648.patch @@ -0,0 +1,27 @@ +diff --git a/kiwi/package_manager/microdnf.py b/kiwi/package_manager/microdnf.py +index e91f1678c3..7301b24d4e 100644 +--- a/kiwi/package_manager/microdnf.py ++++ b/kiwi/package_manager/microdnf.py +@@ -102,7 +102,8 @@ def process_install_requests_bootstrap(self, root_bind=None): + bash_command = [ + 'microdnf' + ] + ['--refresh'] + self.dnf_args + [ +- '--installroot', self.root_dir, '--noplugins', ++ '--installroot', self.root_dir, ++ '--releasever=0', '--noplugins', + '--setopt=cachedir={0}'.format( + self.repository.shared_dnf_dir['cache-dir'] + ), +diff --git a/test/unit/package_manager/microdnf_test.py b/test/unit/package_manager/microdnf_test.py +index 3e5af666e0..5809655c3f 100644 +--- a/test/unit/package_manager/microdnf_test.py ++++ b/test/unit/package_manager/microdnf_test.py +@@ -52,7 +52,7 @@ def test_process_install_requests_bootstrap(self, mock_run, mock_call): + [ + 'bash', '-c', + 'microdnf --refresh --config /root-dir/dnf.conf -y ' +- '--installroot /root-dir --noplugins ' ++ '--installroot /root-dir --releasever=0 --noplugins ' + '--setopt=cachedir=cache ' + '--setopt=reposdir=repos ' + '--setopt=varsdir=vars ' diff --git a/kiwi.spec b/kiwi.spec index e59772ea8362d71e3616a30ce27bb204a27f4290..1ec8e633bd00060ffe6e4887fdc624ee76d6d188 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: 0ac41c08d48e7f011be20c82a08384739b75d648.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils @@ -189,6 +190,9 @@ done %{_mandir}/man8/%{name}* %changelog +* 20201119223007658939 patch-tracking 9.21.5-2 +- append patch file of upstream repository from <0ac41c08d48e7f011be20c82a08384739b75d648> to <0ac41c08d48e7f011be20c82a08384739b75d648> + * 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