import EPEL kiwi-10.2.45-1.el10_3
This commit is contained in:
parent
58ad11836e
commit
09cc739cb1
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
kiwi-10.2.37.tar.gz
|
||||
kiwi-10.2.45.tar.gz
|
||||
|
||||
68
2937.patch
68
2937.patch
@ -1,68 +0,0 @@
|
||||
From b522bae980d85fef7465d3943bcb616f7c213357 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <marcus.schaefer@gmail.com>
|
||||
Date: Mon, 26 Jan 2026 13:10:08 +0100
|
||||
Subject: [PATCH 1/2] Fix s390 unit test
|
||||
|
||||
Forgot to mock the architecture properly. This commit fixes it
|
||||
---
|
||||
test/unit/bootloader/config/zipl_test.py | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/test/unit/bootloader/config/zipl_test.py b/test/unit/bootloader/config/zipl_test.py
|
||||
index cba6da75d84..e624e12566c 100644
|
||||
--- a/test/unit/bootloader/config/zipl_test.py
|
||||
+++ b/test/unit/bootloader/config/zipl_test.py
|
||||
@@ -54,6 +54,7 @@ def setup(self, mock_FirmWare):
|
||||
self.bootloader.get_menu_entry_title = Mock(
|
||||
return_value='title'
|
||||
)
|
||||
+ self.bootloader.arch = 's390x'
|
||||
|
||||
@patch('kiwi.bootloader.config.bootloader_spec_base.FirmWare')
|
||||
def setup_method(self, cls, mock_FirmWare):
|
||||
@@ -177,17 +178,17 @@ def test_setup_loader(
|
||||
assert mock_shutil_move.call_args_list == [
|
||||
call(
|
||||
'system_root_mount/secure_execution_header.bin',
|
||||
- 'target_dir/image-name.x86_64-image-version.'
|
||||
+ 'target_dir/image-name.s390x-image-version.'
|
||||
'secure_execution_header.bin'
|
||||
),
|
||||
call(
|
||||
'system_root_mount/attestation_request.bin',
|
||||
- 'target_dir/image-name.x86_64-image-version.'
|
||||
+ 'target_dir/image-name.s390x-image-version.'
|
||||
'attestation_request.bin'
|
||||
),
|
||||
call(
|
||||
'system_root_mount/attestation_response.key',
|
||||
- 'target_dir/image-name.x86_64-image-version.'
|
||||
+ 'target_dir/image-name.s390x-image-version.'
|
||||
'attestation_response.key'
|
||||
)
|
||||
]
|
||||
|
||||
From 40f8da5f5b017a741430a3ab68f5bdcd7200dc0d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <marcus.schaefer@gmail.com>
|
||||
Date: Mon, 26 Jan 2026 14:14:13 +0100
|
||||
Subject: [PATCH 2/2] Fix platform mock for kis builder unit testing
|
||||
|
||||
---
|
||||
test/unit/builder/kis_test.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/unit/builder/kis_test.py b/test/unit/builder/kis_test.py
|
||||
index 0cd031591df..e5ca7a8f993 100644
|
||||
--- a/test/unit/builder/kis_test.py
|
||||
+++ b/test/unit/builder/kis_test.py
|
||||
@@ -19,7 +19,9 @@ def inject_fixtures(self, caplog):
|
||||
|
||||
@patch('kiwi.builder.kis.FileSystemBuilder')
|
||||
@patch('kiwi.builder.kis.BootImage')
|
||||
- def setup(self, mock_boot, mock_filesystem):
|
||||
+ @patch('kiwi.builder.kis.Defaults.get_platform_name')
|
||||
+ def setup(self, mock_get_platform_name, mock_boot, mock_filesystem):
|
||||
+ mock_get_platform_name.return_value = 'x86_64'
|
||||
self.setup = Mock()
|
||||
self.runtime_config = Mock()
|
||||
self.runtime_config.get_max_size_constraint = Mock(
|
||||
22
kiwi.spec
22
kiwi.spec
@ -6,11 +6,16 @@ The KIWI Image System provides an operating system image builder \
|
||||
for Linux supported hardware platforms as well as for virtualization \
|
||||
and cloud systems like Xen, KVM, VMware, EC2 and more.
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} < 10
|
||||
%bcond check 0
|
||||
%else
|
||||
%bcond check 1
|
||||
%endif
|
||||
|
||||
|
||||
Name: kiwi
|
||||
Version: 10.2.37
|
||||
Release: 2%{?dist}
|
||||
Version: 10.2.45
|
||||
Release: 1%{?dist}
|
||||
URL: http://osinside.github.io/kiwi/
|
||||
Summary: Flexible operating system image builder
|
||||
License: GPL-3.0-or-later
|
||||
@ -20,8 +25,6 @@ Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
# Backports from upstream
|
||||
## Fix unit tests for aarch64 and ppc64le
|
||||
Patch0001: https://github.com/OSInside/kiwi/pull/2937.patch
|
||||
|
||||
# Proposed upstream
|
||||
|
||||
@ -47,7 +50,7 @@ BuildRequires: python3dist(sphinx)
|
||||
BuildRequires: python3dist(sphinx-rtd-theme)
|
||||
%if %{with check}
|
||||
# for tests
|
||||
BuildRequires: python3dist(pytest)
|
||||
BuildRequires: python3dist(pytest) >= 7
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: python3dist(pytest-xdist)
|
||||
%endif
|
||||
@ -649,6 +652,15 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 13 2026 Neal Gompa <ngompa@fedoraproject.org> - 10.2.45-1
|
||||
- Update to 10.2.45
|
||||
|
||||
* Thu Mar 12 2026 Neal Gompa <ngompa@fedoraproject.org> - 10.2.44-1
|
||||
- Update to 10.2.44
|
||||
|
||||
* Mon Feb 02 2026 Adam Williamson <awilliam@redhat.com> - 10.2.37-3
|
||||
- Backport fix for crash when dracut doesn't have --printconfig option
|
||||
|
||||
* Mon Jan 26 2026 Neal Gompa <ngompa@fedoraproject.org> - 10.2.37-2
|
||||
- Backport fix for aarch64 and ppc64le tests
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (kiwi-10.2.37.tar.gz) = 43417b8e4d1a932fd86dab32ef42b406808d289539207b866f215d7700ebfae9771700a6ac491722bcff744ee5b51983479b85c2905acdab4d386a8a9c54b436
|
||||
SHA512 (kiwi-10.2.45.tar.gz) = 71699847c26456b7d3d3ed7f0f1ccc11bfe03f4636e17d5335efa0496602a0282d23efd5d0782a69326e2727cfa66e1c562c28424c240b2753c0d6e6b8de6ce9
|
||||
|
||||
Loading…
Reference in New Issue
Block a user