rpms/kiwi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c10s
Branches Tags
rpms:c10s
rpms:a8
rpms:c8
rpms:imports/c10s/kiwi-10.2.45-1.el10_3
rpms:changed/a8/kiwi-9.25.22-2.el8
rpms:imports/c8/kiwi-9.25.22-1.el8
rpms:imports/c10s/kiwi-10.2.37-2.el10_2
...
pull from: rpms:a8
Branches Tags
rpms:c10s
rpms:a8
rpms:c8
rpms:imports/c10s/kiwi-10.2.45-1.el10_3
rpms:changed/a8/kiwi-9.25.22-2.el8
rpms:imports/c8/kiwi-9.25.22-1.el8
rpms:imports/c10s/kiwi-10.2.37-2.el10_2

No commits in common. "c10s" and "a8" have entirely different histories.
c10s ... a8

13 changed files with 1982 additions and 386 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
kiwi-10.2.45.tar.gz
SOURCES/kiwi-9.25.22.tar.gz

1
.kiwi.metadata Normal file
View File

@ -0,0 +1 @@
d3ef3bd043438b409a2d45d54a1520af5bb75a1c SOURCES/kiwi-9.25.22.tar.gz

39
1002-Use-isomd5sum-by-default-for-tagging-ISO-files.patch
View File

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

0
1001-Use-buildah-by-default-for-OCI-image-builds.patch → SOURCES/0001-Use-buildah-by-default-for-OCI-image-builds.patch
View File

53
SOURCES/0001-run-grub-mkconfig-with-os-prober-disable.patch Normal file
View File

@ -0,0 +1,53 @@
From 6218bb8e503e0d620f322f022207336d918949e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <marcus.schaefer@gmail.com>
Date: Wed, 10 Sep 2025 16:32:15 +0200
Subject: [PATCH] Run grub mkconfig with os-prober disabled
Set GRUB_DISABLE_OS_PROBER=true to the caller environment
such that it gets consumed via /etc/grub.d/30_os-prober
This Fixes #2883
---
kiwi/bootloader/config/grub2.py | 5 ++++-
test/unit/bootloader/config/grub2_test.py | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py
index 982556fcd87..955a5a24c02 100644
--- a/kiwi/bootloader/config/grub2.py
+++ b/kiwi/bootloader/config/grub2.py
@@ -300,12 +300,15 @@ def setup_disk_image_config(
self.boot_directory_name, 'grub.cfg'
]
)
+ # Disable os-prober, it takes information from the host it
+ # runs on which is not necessarily matching with the image
+ os.environ.update({'GRUB_DISABLE_OS_PROBER': 'true'})
Command.run(
[
'chroot', self.root_mount.mountpoint,
os.path.basename(self._get_grub2_mkconfig_tool()), '-o',
config_file.replace(self.root_mount.mountpoint, '')
- ]
+ ], os.environ
)
if boot_options.get('root_device') != boot_options.get('boot_device'):
# Create a boot -> . link on the boot partition.
diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py
index 0b11b0b9acd..ea2c600e832 100644
--- a/test/unit/bootloader/config/grub2_test.py
+++ b/test/unit/bootloader/config/grub2_test.py
@@ -1219,12 +1219,13 @@ def open_file(filename, mode=None):
mock_mount_system.assert_called_once_with(
'rootdev', 'bootdev', None, None, None
)
+ os.environ.update({'GRUB_DISABLE_OS_PROBER': 'true'})
assert mock_Command_run.call_args_list == [
call(
[
'chroot', self.bootloader.root_mount.mountpoint,
'grub2-mkconfig', '-o', '/boot/grub2/grub.cfg'
- ]
+ ], os.environ
),
call(
[

54
SOURCES/0002-Fixed-missing-selinux-context-setup-for-live-ISOs.patch Normal file
View File

@ -0,0 +1,54 @@
From 3a989d0e357cbc6cc4464c4bbca5b1ce6baf75d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <marcus.schaefer@gmail.com>
Date: Fri, 6 Mar 2026 16:21:06 +0100
Subject: [PATCH] Fixed missing selinux context setup for live ISOs
When building live ISO images the selinux context was not created
for eventually new created files during the live ISO creation
process. This Fixes OSInside/kiwi-boxed-plugin#99
---
kiwi/builder/live.py | 5 +++++
test/unit/builder/live_test.py | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/kiwi/builder/live.py b/kiwi/builder/live.py
index 7f09082b1..20adc2399 100644
--- a/kiwi/builder/live.py
+++ b/kiwi/builder/live.py
@@ -189,6 +189,8 @@ class LiveImageBuilder:
working_directory=self.root_dir
)
+ self.system_setup.setup_selinux_file_contexts()
+
# prepare dracut initrd call
self.boot_image.prepare()
@@ -251,6 +253,9 @@ class LiveImageBuilder:
'mount_options': self.xml_state.get_fs_mount_option_list(),
'create_options': self.xml_state.get_fs_create_option_list()
}
+
+ self.system_setup.setup_selinux_file_contexts()
+
filesystem_setup = FileSystemSetup(
self.xml_state, self.root_dir
)
diff --git a/test/unit/builder/live_test.py b/test/unit/builder/live_test.py
index 4773f735b..c661caed0 100644
--- a/test/unit/builder/live_test.py
+++ b/test/unit/builder/live_test.py
@@ -227,6 +227,10 @@ class TestLiveImageBuilder:
self.setup.import_cdroot_files.assert_called_once_with('temp_media_dir')
+ assert self.setup.setup_selinux_file_contexts.call_args_list == [
+ call(), call()
+ ]
+
assert kiwi.builder.live.FileSystem.new.call_args_list == [
call(
device_provider=self.loop, name='ext4',
--
2.53.0

1666
SOURCES/0003-Backport-zipl-bootloader-support-from-upstream-kiwi.patch Normal file
View File

File diff suppressed because it is too large Load Diff

67
SOURCES/0004-Fix-BLS-entries-not-corrected-before-grub2-mkconfig.patch Normal file
View File

@ -0,0 +1,67 @@
From 881bb46fcbefac0be9e7540b078a4dbe4f0f5891 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Fri, 13 Mar 2026 01:12:40 +0100
Subject: [PATCH] Fix BLS entries not corrected before grub2-mkconfig on RHEL 8
On RHEL 8-based distributions, grub2-mkconfig uses the
grub.d/10_linux_bls script which reads Boot Loader Specification
(BLS) entries from /boot/loader/entries/ and inlines them as
menuentry blocks directly in grub.cfg. This is different from
RHEL 9+ where grub.d/10_linux uses the blscfg command to load
BLS entries at boot time.
When kiwi builds a disk image, kernel packages are installed into
a chroot (the image root). The BLS entries created by the kernel
scriptlets at that point contain:
- linux/initrd paths prefixed with the build host's image root
path (e.g. /var/tmp/kiwi-build/build/image-root/boot/vmlinuz-...)
- an options line from the build host's /proc/cmdline
Previously, kiwi corrected these BLS entries only *after* running
grub2-mkconfig. On RHEL 9+ this works fine because grub.cfg just
contains blscfg and reads the (now corrected) BLS entries at boot
time. On RHEL 8, however, grub2-mkconfig had already inlined the
*uncorrected* BLS entries into grub.cfg, resulting in wrong kernel
paths and boot options that caused the image to fail to boot.
This commit adds calls to _fix_grub_loader_entries_boot_cmdline()
and _fix_grub_loader_entries_linux_and_initrd_paths() before
grub2-mkconfig, so that BLS entries are corrected before they get
inlined into grub.cfg. The existing post-grub2-mkconfig calls are
retained because grub2-mkconfig itself may re-create or modify BLS
entries on some distributions.
Fixes boot failure on AlmaLinux 8 ppc64le GenericCloud images built
with kiwi where grub.cfg contained build-root paths like:
linux /var/tmp/kiwi-build/build/image-root/boot/vmlinuz-4.18.0-...
instead of:
linux /vmlinuz-4.18.0-...
---
kiwi/bootloader/config/grub2.py | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py
index 58f0c6e5..58568755 100644
--- a/kiwi/bootloader/config/grub2.py
+++ b/kiwi/bootloader/config/grub2.py
@@ -281,6 +281,16 @@ class BootLoaderConfigGrub2(BootLoaderConfigBase):
self.boot_directory_name, 'grub.cfg'
]
)
+ # Fix BLS entries before running grub2-mkconfig. On RHEL 8
+ # the grub.d/10_linux_bls script reads BLS entries and inlines
+ # them as menuentry blocks in grub.cfg rather than emitting a
+ # blscfg command. BLS entries created during package install in
+ # the kiwi image root contain the build host path prefix in
+ # linux/initrd paths and the host /proc/cmdline in options.
+ # Those must be corrected before grub2-mkconfig reads them.
+ self._fix_grub_loader_entries_boot_cmdline()
+ self._fix_grub_loader_entries_linux_and_initrd_paths()
+
# Disable os-prober, it takes information from the host it
# runs on which is not necessarily matching with the image
os.environ.update({'GRUB_DISABLE_OS_PROBER': 'true'})
--
2.43.7

22
SOURCES/kiwi-9.25.7-doc-use-xml-highlight.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/doc/source/concept_and_workflow/customize_the_boot_process.rst b/doc/source/concept_and_workflow/customize_the_boot_process.rst
index d2c1b6bc4..5146b508b 100644
--- a/doc/source/concept_and_workflow/customize_the_boot_process.rst
+++ b/doc/source/concept_and_workflow/customize_the_boot_process.rst
@@ -55,7 +55,7 @@ of {kiwi} the following dracut modules are used:
and ``pxe``. The use of a custom boot image is activated by setting the
following attribute in the image description:
- .. code:: none
+ .. code:: xml
<type ... initrd_system="kiwi"/>
@@ -63,7 +63,7 @@ of {kiwi} the following dracut modules are used:
a boot image description in the ``boot`` attribute like in the
following example:
- .. code:: none
+ .. code:: xml
<type ... boot="{exc_netboot}"/>

12
SOURCES/kiwi-9.25.7-no-sphinx-custom-css.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/doc/source/conf.py b/doc/source/conf.py
index cfcbd563b..1f846fc08 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -59,7 +59,6 @@ def setup(app):
app.add_config_value('prolog_replacements', {}, True)
app.connect('source-read', prologReplace)
app.connect("autodoc-process-docstring", remove_module_docstring)
- app.add_css_file('css/custom.css')
prolog_replacements = {

23
SOURCES/kiwi-9.25.7-no-sphinx-rtd-theme.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/doc/source/conf.py b/doc/source/conf.py
index fbbba0074..cfcbd563b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -6,7 +6,6 @@
import sys
from os.path import abspath, dirname, join, normpath
import shlex
-import sphinx_rtd_theme
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -193,10 +192,6 @@ html_sidebars = {
]
}
-html_theme = "sphinx_rtd_theme"
-
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
html_static_path = ['.static']
html_theme_options = {

428
kiwi.spec → SPECS/kiwi.spec
View File

@ -1,3 +1,6 @@
# Enable Python dependency generation
%{?python_enable_dependency_generator}
# Disable mangling shebangs for dracut module files as it breaks initramfs
%global __brp_mangle_shebangs_exclude_from ^%{_prefix}/lib/dracut/modules.d/.*$
@ -6,36 +9,36 @@ 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.45
Release: 1%{?dist}
Version: 9.25.22
Release: 2%{?dist}
URL: http://osinside.github.io/kiwi/
Summary: Flexible operating system image builder
License: GPL-3.0-or-later
# We must use the version uploaded to pypi, as it contains all the required files.
Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
# qemu-img dependency is not available
ExcludeArch: %{ix86}
# Backports from upstream
# Proposed upstream
## From https://github.com/OSInside/kiwi/commit/6218bb8e503e0d620f322f022207336d918949e4
Patch0001: 0001-run-grub-mkconfig-with-os-prober-disable.patch
## From https://github.com/OSInside/kiwi/commit/8a11be75232691fdb790b687d57c875f1ef66045
Patch0002: 0002-Fixed-missing-selinux-context-setup-for-live-ISOs.patch
## From https://github.com/AlmaLinux/kiwi-el8/commit/f5799d404d79476ffce6253a7ab7fbe510f4673e
Patch0003: 0003-Backport-zipl-bootloader-support-from-upstream-kiwi.patch
## From https://github.com/AlmaLinux/kiwi-el8/commit/881bb46fcbefac0be9e7540b078a4dbe4f0f5891
Patch0004: 0004-Fix-BLS-entries-not-corrected-before-grub2-mkconfig.patch
# Fedora-specific patches
## Use buildah instead of umoci by default for OCI image builds
## TODO: Consider getting umoci into Fedora?
Patch1001: 1001-Use-buildah-by-default-for-OCI-image-builds.patch
## Use isomd5sum instead of checkmedia by default for tagging ISO files
## TODO: Consider getting checkmedia into Fedora?
Patch1002: 1002-Use-isomd5sum-by-default-for-tagging-ISO-files.patch
Patch1001: 0001-Use-buildah-by-default-for-OCI-image-builds.patch
## Remove usage of the rtd sphinx theme (unpackaged)
Patch1002: kiwi-9.25.7-no-sphinx-rtd-theme.patch
## Remove usage of the custom css (EL8 compatibility)
Patch1003: kiwi-9.25.7-no-sphinx-custom-css.patch
## Use xml instead of none for code block highlights (EL8 compatibility)
Patch1004: kiwi-9.25.7-doc-use-xml-highlight.patch
BuildRequires: bash-completion
BuildRequires: dracut
@ -43,18 +46,18 @@ BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: pyproject-rpm-macros
BuildRequires: python3-setuptools
BuildRequires: shadow-utils
# doc build requirements
BuildRequires: python3dist(docopt) >= 0.6.2
BuildRequires: python3dist(lxml)
BuildRequires: python3dist(pyyaml)
BuildRequires: python3dist(requests)
BuildRequires: python3dist(simplejson)
BuildRequires: python3dist(six)
BuildRequires: python3dist(sphinx)
BuildRequires: python3dist(sphinx-rtd-theme)
%if %{with check}
# for tests
BuildRequires: python3dist(pytest) >= 7
%if 0%{?fedora}
BuildRequires: python3dist(pytest-xdist)
%endif
%endif
BuildRequires: python3dist(typing-extensions)
%description %{desc}
@ -66,30 +69,29 @@ Obsoletes: kiwi-image-tbz-requires < %{version}-%{release}
Provides: kiwi-image:tbz
# tools used by kiwi
# For building Fedora, RHEL/CentOS, and Mageia based images
%if 0%{?fedora} >= 39 || 0%{?rhel} >= 11
Requires: dnf
%if 0%{?fedora} >= 39
Requires: dnf5
Provides: kiwi-packagemanager:dnf5
%endif
%if 0%{?fedora} || (0%{?rhel} >= 8 && 0%{?rhel} < 11)
%if 0%{?rhel}
# Backward compatibility for OBS
Requires: dnf
%endif
Requires: dnf4
Provides: kiwi-packagemanager:dnf
Provides: kiwi-packagemanager:dnf4
Provides: kiwi-packagemanager:yum
%endif
%if (0%{?rhel} >= 8 && 0%{?rhel} < 11)
%if (0%{?fedora} && 0%{?fedora} < 39) || 0%{?rhel} >= 8
# For building Fedora, RHEL/CentOS, and Mageia based minimal images
Requires: microdnf
Provides: kiwi-packagemanager:microdnf
%endif
%if 0%{?fedora}
# For building (open)SUSE based images
Requires: zypper
Provides: kiwi-packagemanager:zypper
%endif
# Offers GPG public keys for various RPM distros and third party repositories
Recommends: distribution-gpg-keys
%if 0%{?fedora} || 0%{?rhel} >= 8
# For building Debian/Ubuntu based images
Recommends: apt
Recommends: debootstrap
Recommends: dpkg
Recommends: gnupg2
# Keyrings for bootstrap
@ -101,44 +103,25 @@ Recommends: ubu-keyring
Recommends: pacman
Recommends: archlinux-keyring
%endif
Requires: file
Requires: %{name}-tools = %{version}-%{release}
Requires: lsof
Requires: mtools
Requires: rsync
Requires: sed
Requires: screen
Requires: tar >= 1.2.7
Requires: openssl
Requires: xz
# Python 2 module is no longer available
Obsoletes: python2-%{name} < %{version}-%{release}
# legacy kiwi initramfs tools are no longer available
Obsoletes: %{name}-tools < %{version}-%{release}
%description systemdeps-core
This metapackage installs the necessary system dependencies
to run KIWI.
%if 0%{?fedora}
%package systemdeps-pkgmgr-zypper
Summary: KIWI - Zypper package manager support
# For building (open)SUSE based images
Requires: zypper
Provides: kiwi-packagemanager:zypper
Requires: %{name}-systemdeps-core = %{version}-%{release}
%description systemdeps-pkgmgr-zypper
This metapackage exposes support for Zypper as a package
manager for image builds in KIWI.
%endif
%ifnarch ppc64 %{ix86}
%package systemdeps-containers
Summary: KIWI - host requirements for container images
Provides: kiwi-image:docker
Provides: kiwi-image:oci
Provides: kiwi-image:appx
Provides: kiwi-image:wsl
Provides: kiwi-image-docker-requires = %{version}-%{release}
Obsoletes: kiwi-image-docker-requires < %{version}-%{release}
Provides: kiwi-image-wsl-requires = %{version}-%{release}
@ -152,24 +135,12 @@ Host setup helper to pull in all packages required/useful on
the build host to build container images e.g docker, wsl.
%endif
%if 0%{?fedora}
%package systemdeps-enclaves
Summary: KIWI - host requirements for enclave images
Provides: kiwi-image:enclave
Requires: eif_build
%description systemdeps-enclaves
Host setup helper to pull in all packages required/useful on
the build host to build secure enclave images (e.g. AWS Nitro).
%endif
%package systemdeps-iso-media
Summary: KIWI - host requirements for live and install iso images
Provides: kiwi-image:iso
Provides: kiwi-image-iso-requires = %{version}-%{release}
Obsoletes: kiwi-image-iso-requires < %{version}-%{release}
Requires: xorriso
Requires: isomd5sum
%ifarch %{ix86} x86_64
# Pull in syslinux when it's x86
%if 0%{?fedora} || 0%{?rhel} >= 8
@ -250,11 +221,9 @@ the build host for configuring bootloaders on images.
Summary: KIWI - host requirements for filesystems
Provides: kiwi-image:pxe
Provides: kiwi-image:kis
Provides: kiwi-image:erofs
%if ! (0%{?rhel} >= 8)
Provides: kiwi-filesystem:btrfs
%endif
Provides: kiwi-filesystem:erofs
Provides: kiwi-filesystem:ext2
Provides: kiwi-filesystem:ext3
Provides: kiwi-filesystem:ext4
@ -266,7 +235,6 @@ Provides: kiwi-filesystem-requires = %{version}-%{release}
Obsoletes: kiwi-filesystem-requires < %{version}-%{release}
Requires: dosfstools
Requires: e2fsprogs
Requires: erofs-utils
Requires: xfsprogs
%if ! (0%{?rhel} >= 8)
Requires: btrfs-progs
@ -296,7 +264,6 @@ Requires: parted
Requires: kpartx
Requires: cryptsetup
Requires: mdadm
Requires: open-vmdk
Requires: util-linux
%description systemdeps-disk-images
@ -335,10 +302,6 @@ Requires: kiwi-systemdeps-iso-media = %{version}-%{release}
%if ! 0%{?rhel}
Requires: kiwi-systemdeps-image-validation = %{version}-%{release}
%endif
%if 0%{?fedora}
Requires: kiwi-systemdeps-enclaves = %{version}-%{release}
Recommends: kiwi-systemdeps-pkgmgr-zypper = %{version}-%{release}
%endif
%description systemdeps
Host setup helper to pull in all packages required/useful to
@ -349,12 +312,11 @@ leverage all functionality in KIWI.
Summary: KIWI - Python 3 implementation
# Only require core dependencies, and allow OBS to pull the rest through magic Provides
Requires: kiwi-systemdeps-core = %{version}-%{release}
%if ! 0%{?el7}
# Retain default expectation for local installations
Recommends: kiwi-systemdeps = %{version}-%{release}
# Enable support for alternative markups
Recommends: python%{python3_version}dist(anymarkup-core) >= 0.8.0
Recommends: python%{python3_version}dist(xmltodict) >= 0.12.0
%endif
Requires: python3-setuptools
BuildArch: noarch
%{?python_provide:%python_provide python3-%{name}}
@ -363,6 +325,15 @@ Python 3 library of 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.
%package tools
Summary: KIWI - Collection of Boot Helper Tools
%description tools
This package contains a small set of helper tools used for the
kiwi created initial ramdisk which is used to control the very
first boot of an appliance. The tools are not meant to be used
outside of the scope of kiwi appliance building.
%ifarch %{ix86} x86_64
%package pxeboot
Summary: KIWI - PXE boot structure
@ -471,7 +442,7 @@ type attribute.
%package cli
Summary: Flexible operating system appliance image builder
Provides: kiwi-schema = 8.2
Provides: kiwi-schema = 7.6
# So we can reference it by the source package name while permitting this to be noarch
Provides: %{name} = %{version}-%{release}
Requires: python3-%{name} = %{version}-%{release}
@ -484,37 +455,25 @@ BuildArch: noarch
%prep
%autosetup -p1
# Temporarily switch things back to docopt for everything but Fedora 41+
# FIXME: Drop this hack as soon as we can...
%if ! (0%{?fedora} >= 41 || 0%{?rhel} >= 10)
sed -e 's/docopt-ng.*/docopt = ">=0.6.2"/' -i pyproject.toml
%endif
# Drop shebang for kiwi/xml_parse.py, as we don't intend to use it as an independent script
sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py
%generate_buildrequires
%pyproject_buildrequires
%build
# Required for some parts
# Because there are some compiled stuff
%set_build_flags
%pyproject_wheel
%py3_build
# Build man pages
make -C doc man
# Build C-Tools
make CFLAGS="%{build_cflags}" tools
%install
# Required for some parts
%set_build_flags
%py3_install
%pyproject_install
# Install man-pages, completion and kiwi default configuration (yes, the slash is needed!)
# Install C-Tools, man-pages, completion and kiwi default configuration (yes, the slash is needed!)
make buildroot=%{buildroot}/ install
# Install dracut modules (yes, the slash is needed!)
@ -525,10 +484,12 @@ rm -rf %{buildroot}%{_docdir}/packages
# Rename unversioned binaries
mv %{buildroot}%{_bindir}/kiwi-ng %{buildroot}%{_bindir}/kiwi-ng-3
mv %{buildroot}%{_bindir}/kiwicompat %{buildroot}%{_bindir}/kiwicompat-3
# Create symlinks for correct binaries
ln -sr %{buildroot}%{_bindir}/kiwi-ng %{buildroot}%{_bindir}/kiwi
ln -sr %{buildroot}%{_bindir}/kiwi-ng-3 %{buildroot}%{_bindir}/kiwi-ng
ln -sr %{buildroot}%{_bindir}/kiwicompat-3 %{buildroot}%{_bindir}/kiwicompat
# kiwi pxeboot directory structure to be packed in kiwi-pxeboot
%ifarch %{ix86} x86_64
@ -538,47 +499,22 @@ done
%fdupes %{buildroot}%{_sharedstatedir}/tftpboot
%endif
%post cli
if [ -x /usr/sbin/semanage -a -x /usr/sbin/restorecon ]; then
# file contexts
semanage fcontext --add --type install_exec_t '%{_bindir}/kiwi' 2> /dev/null || :
semanage fcontext --add --type install_exec_t '%{_bindir}/kiwi-ng(.*)' 2> /dev/null || :
restorecon -r %{_bindir}/kiwi %{_bindir}/kiwi-ng* || :
fi
%postun cli
if [ $1 -eq 0 ]; then
if [ -x /usr/sbin/semanage ]; then
# file contexts
semanage fcontext --delete --type install_exec_t '%{_bindir}/kiwi' 2> /dev/null || :
semanage fcontext --delete --type install_exec_t '%{_bindir}/kiwi-ng(.*)' 2> /dev/null || :
fi
fi
%if %{with check}
%check
pushd test/unit
# skipped tests require anymarkup which was retired from Fedora
# we patch the code of default ISO tagging method, hence skip test_config_sections_* too
%pytest %{?fedora:-n auto} --ignore markup/any_test.py -k \
"not test_process_image_info_print_yaml and not test_process_image_info_print_toml \
and not test_config_sections_defaults and not test_config_sections_invalid"
popd
%endif
%files -n python3-%{name}
%license LICENSE
%{_bindir}/kiwi-ng-3*
%{_bindir}/kiwicompat-3*
%{python3_sitelib}/kiwi*/
%dir %{_datadir}/kiwi
%{_datadir}/kiwi/xsl_to_v74/
%files tools
%license LICENSE
%{_bindir}/dcounter
%{_bindir}/isconsole
%{_bindir}/utimer
%files cli
%{_bindir}/kiwi
%{_bindir}/kiwi-ng
%{_bindir}/kiwicompat
%{_datadir}/bash-completion/completions/kiwi-ng
%{_mandir}/man8/kiwi*
%config(noreplace) %{_sysconfdir}/kiwi.yml
@ -591,37 +527,32 @@ popd
%files -n dracut-kiwi-lib
%license LICENSE
%{_prefix}/lib/dracut/modules.d/59kiwi-lib/
%{_prefix}/lib/dracut/modules.d/99kiwi-lib/
%files -n dracut-kiwi-oem-repart
%license LICENSE
%{_prefix}/lib/dracut/modules.d/55kiwi-repart/
%{_prefix}/lib/dracut/modules.d/90kiwi-repart/
%files -n dracut-kiwi-oem-dump
%license LICENSE
%{_prefix}/lib/dracut/modules.d/55kiwi-dump/
%{_prefix}/lib/dracut/modules.d/59kiwi-dump-reboot/
%{_prefix}/lib/dracut/modules.d/90kiwi-dump/
%{_prefix}/lib/dracut/modules.d/99kiwi-dump-reboot/
%files -n dracut-kiwi-live
%license LICENSE
%{_prefix}/lib/dracut/modules.d/55kiwi-live/
%{_prefix}/lib/dracut/modules.d/90kiwi-live/
%files -n dracut-kiwi-overlay
%license LICENSE
%{_prefix}/lib/dracut/modules.d/55kiwi-overlay/
%{_prefix}/lib/dracut/modules.d/90kiwi-overlay/
%files -n dracut-kiwi-verity
%{_usr}/lib/dracut/modules.d/50kiwi-verity
%{_usr}/lib/dracut/modules.d/80kiwi-verity
%{_bindir}/kiwi-parse-verity
%files systemdeps-core
# Empty metapackage
%if 0%{?fedora}
%files systemdeps-pkgmgr-zypper
# Empty metapackage
%endif
%files systemdeps-bootloaders
# Empty metapackage
@ -630,11 +561,6 @@ popd
# Empty metapackage
%endif
%if 0%{?fedora}
%files systemdeps-enclaves
# Empty metapackage
%endif
%files systemdeps-iso-media
# Empty metapackage
@ -650,205 +576,17 @@ popd
%files systemdeps
# Empty metapackage
%changelog
* Fri Mar 13 2026 Neal Gompa <ngompa@fedoraproject.org> - 10.2.45-1
- Update to 10.2.45
* Fri Mar 13 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 9.25.22-2
- Backport zipl bootloader support from upstream kiwi v10
- Fix BLS entries not corrected before grub2-mkconfig on RHEL 8
* Thu Mar 12 2026 Neal Gompa <ngompa@fedoraproject.org> - 10.2.44-1
- Update to 10.2.44
* Thu Mar 12 2026 Neal Gompa <ngompa@fedoraproject.org> - 9.25.22-1
- Update to 9.25.22
- Backport fix for SELinux in live ISOs
* 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
* Mon Jan 26 2026 Neal Gompa <ngompa@fedoraproject.org> - 10.2.37-1
- Update to 10.2.37
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.33-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Nov 14 2025 Daniel P. Berrangé <berrange@redhat.com> - 10.2.33-3
- Add ExcludeArch to remove dep on i686 QEMU
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 10.2.33-2
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Sep 12 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.33-1
- Update to 10.2.33
* Fri Aug 15 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.32-1
- Update to 10.2.32
* Fri Aug 15 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.31-3
- Backport fix for setting up live filesystems correctly
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 10.2.31-2
- Rebuilt for Python 3.14.0rc2 bytecode
* Sat Aug 02 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.31-1
- Update to 10.2.31
- Turn check section off by default
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jul 10 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.27-1
- Update to 10.2.27
* Mon Jun 16 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.24-3
- Backport support for running on overlayfs and allowing /boot as a subvolume
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 10.2.24-2
- Rebuilt for Python 3.14
* Wed May 28 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.24-1
- Update to 10.2.24
* Fri May 16 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.22-1
- Update to 10.2.22
* Thu May 01 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.19-1
- Update to 10.2.19
* Tue Apr 29 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.18-1
- Update to 10.2.18
* Tue Apr 22 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.17-1
- Update to 10.2.17
- Drop all upstream patches
* Wed Apr 16 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.16-4
- Add kiwi-image:oci provides for OBS compatibility
- Backport fix for filename extension for container images
- Refresh patch with upstreamed version for allowing C locale in images
- Backport support for filtering files from embedded ESP images
* Sat Mar 29 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.16-3
- Add patch to allow the C locale in images
* Fri Mar 28 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.16-2
- Apply install_exec_t SELinux file context to kiwi executables
* Tue Mar 25 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.16-1
- Update to 10.2.16
* Fri Feb 28 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.12-1
- Update to 10.2.12
- Backport fix to configure CHRP properly for ppc64le live images
* Tue Feb 25 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.11-1
- Update to 10.2.11
- Backport fix to configure grub2 properly for ppc64le live images
* Mon Feb 03 2025 Neal Gompa <ngompa@fedoraproject.org> - 10.2.9-1
- Update to 10.2.9
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Dec 14 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.2.4-1
- Update to 10.2.4
* Wed Dec 04 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.2.3-1
- Update to 10.2.3
* Thu Nov 21 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.2.0-1
- Update to 10.2.0
* Thu Sep 26 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.1.13-1
- Update to 10.1.13
* Tue Sep 17 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.1.12-1
- Update to 10.1.12
* Fri Sep 13 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.1.11-1
- Update to 10.1.11
* Mon Sep 02 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.1.3-1
- Update to 10.1.3
- Drop patches part of this release
* Mon Aug 26 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.1.2-4
- Backport support for using isomd5sum for tagging ISO files
- Refresh patch stack
* Sat Aug 24 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.1.2-3
- Add fixes for live media creation
* Sat Aug 24 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.1.2-2
- Reconcile dependency information with upstream
* Fri Aug 23 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.1.2-1
- Update to 10.1.2
- Backport various fixes queued for the next release
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jul 12 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.24-1
- Update to 10.0.24
- Backport support for Application ID in ISOs
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 10.0.21-2
- Rebuilt for Python 3.13
* Wed Jun 05 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.21-1
- Update to 10.0.21
* Fri May 10 2024 Romain Geissler <romain.geissler@amadeus.com> - 10.0.11-5
- Backport "Add support for stopsignal in containerconfig" (RH#2278884)
* Thu May 09 2024 Romain Geissler <romain.geissler@amadeus.com> - 10.0.11-4
- Backport upstream removing the leaking versionlock.conf (RH#2270364)
* Thu May 09 2024 Adam Williamson <awilliam@redhat.com> - 10.0.11-3
- Backport PR #2549 to fix dnf5 config settings
* Fri Apr 26 2024 Adam Williamson <awilliam@redhat.com> - 10.0.11-2
- Backport PR #2546 to fix package removal with dnf5
* Thu Apr 04 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.11-1
- Update to 10.0.11
* Thu Mar 28 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.10-1
- Update to 10.0.10
* Sat Mar 23 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.8-1
- Update to 10.0.8
* Wed Mar 20 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.7-1
- Update to 10.0.7
- Drop fixes included in this release
* Wed Mar 13 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.4-5
- Add dependency on xz
* Wed Mar 13 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.4-4
- Add one more fix for s390x image builds
* Tue Mar 12 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.4-3
- Backport fixes for s390x images
* Mon Mar 11 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.4-2
- Fix kiwi-schema provides
* Mon Mar 11 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.4-1
- Update to 10.0.4
* Wed Mar 06 2024 Neal Gompa <ngompa@fedoraproject.org> - 10.0.2-1
- Rebase to 10.0.2
* Sat Feb 17 2024 Neal Gompa <ngompa@fedoraproject.org> - 9.25.21-5
- Break out Zypper support into a subpackage
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.25.21-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.25.21-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Sep 12 2025 Steve Traylen <steve.traylen@cern.ch> - 9.25.21-3
- Backport fix for disabling os-prober
* Fri Dec 29 2023 Neal Gompa <ngompa@fedoraproject.org> - 9.25.21-2
- Backport fix for detecting setfiles properly

1
sources
View File

@ -1 +0,0 @@
SHA512 (kiwi-10.2.45.tar.gz) = 71699847c26456b7d3d3ed7f0f1ccc11bfe03f4636e17d5335efa0496602a0282d23efd5d0782a69326e2727cfa66e1c562c28424c240b2753c0d6e6b8de6ce9