import EPEL kiwi-10.2.37-2.el10_2

This commit is contained in:
Andrew Lukoshko 2026-03-02 12:38:13 +00:00
commit 58ad11836e
6 changed files with 1323 additions and 0 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
kiwi-10.2.37.tar.gz

View File

@ -0,0 +1,39 @@
From ff0028f6f60eba3038a765e4ea3c59addb52ccc2 Mon Sep 17 00:00:00 2001
From: Igor Raits <igor.raits@gmail.com>
Date: Sat, 6 May 2023 12:06:16 +0200
Subject: [PATCH] Use buildah by default for OCI image builds
---
kiwi.yml | 2 +-
kiwi/defaults.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kiwi.yml b/kiwi.yml
index 4c5922138..987898e2a 100644
--- a/kiwi.yml
+++ b/kiwi.yml
@@ -67,7 +67,7 @@
# # Specify OCI archive tool which should be used on creation of
# # container archives for OCI compliant images, e.g docker
# # Possible values are umoci and buildah
-# - archive_tool: umoci
+# - archive_tool: buildah
# Specify build constraints that applies during the image build
diff --git a/kiwi/defaults.py b/kiwi/defaults.py
index ae0251a71..b11deb968 100644
--- a/kiwi/defaults.py
+++ b/kiwi/defaults.py
@@ -1732,7 +1732,7 @@ class Defaults:
:rtype: str
"""
- return 'umoci'
+ return 'buildah'
@staticmethod
def get_part_mapper_tool():
--
2.40.1

View File

@ -0,0 +1,39 @@
From 78ae64ad0aa3ca274c6a94482d08d4e25a0d658e Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Mon, 26 Aug 2024 07:36:29 -0400
Subject: [PATCH] Use isomd5sum by default for tagging ISO files
---
kiwi.yml | 2 +-
kiwi/defaults.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kiwi.yml b/kiwi.yml
index 683e4e315..d40dce6b5 100644
--- a/kiwi.yml
+++ b/kiwi.yml
@@ -62,7 +62,7 @@
# - tool_category: xorriso
# # Specify media tag tool used to implant iso checksums
# # Possible values are checkmedia and isomd5sum
-# - media_tag_tool: checkmedia
+# - media_tag_tool: isomd5sum
# Setup process parameters for OCI toolchain
diff --git a/kiwi/defaults.py b/kiwi/defaults.py
index 7e1aad87b..4aaad7f27 100644
--- a/kiwi/defaults.py
+++ b/kiwi/defaults.py
@@ -1767,7 +1767,7 @@ class Defaults:
:rtype: str
"""
- return 'checkmedia'
+ return 'isomd5sum'
@staticmethod
def get_container_compression():
--
2.45.2

68
2937.patch Normal file
View File

@ -0,0 +1,68 @@
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(

1175
kiwi.spec Normal file

File diff suppressed because it is too large Load Diff

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (kiwi-10.2.37.tar.gz) = 43417b8e4d1a932fd86dab32ef42b406808d289539207b866f215d7700ebfae9771700a6ac491722bcff744ee5b51983479b85c2905acdab4d386a8a9c54b436