diff --git a/0001-Use-buildah-by-default-for-OCI-image-builds.patch b/0001-Use-buildah-by-default-for-OCI-image-builds.patch new file mode 100644 index 0000000000000000000000000000000000000000..ece17a05a24947bac190b623a51dad52922d6f3a --- /dev/null +++ b/0001-Use-buildah-by-default-for-OCI-image-builds.patch @@ -0,0 +1,39 @@ +From ff0028f6f60eba3038a765e4ea3c59addb52ccc2 Mon Sep 17 00:00:00 2001 +From: Igor Raits +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 + diff --git a/kiwi-9.25.1.tar.gz b/kiwi-9.25.1.tar.gz deleted file mode 100644 index 67323c601003295961f2184d79859a8b11ea2e87..0000000000000000000000000000000000000000 Binary files a/kiwi-9.25.1.tar.gz and /dev/null differ diff --git a/kiwi-9.25.22.tar.gz b/kiwi-9.25.22.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..583ff62beee8f5408dec697c36e0dc73723e53dd Binary files /dev/null and b/kiwi-9.25.22.tar.gz differ diff --git a/kiwi-9.25.7-doc-use-xml-highlight.patch b/kiwi-9.25.7-doc-use-xml-highlight.patch new file mode 100644 index 0000000000000000000000000000000000000000..29421eb65b865943f8f77515544c892af73a4c60 --- /dev/null +++ b/kiwi-9.25.7-doc-use-xml-highlight.patch @@ -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 + + + +@@ -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 + + + diff --git a/kiwi-9.25.7-no-sphinx-custom-css.patch b/kiwi-9.25.7-no-sphinx-custom-css.patch new file mode 100644 index 0000000000000000000000000000000000000000..f324b1e24dcbaf64635f5cfbc0d5b0cf3b15bd3e --- /dev/null +++ b/kiwi-9.25.7-no-sphinx-custom-css.patch @@ -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 = { diff --git a/kiwi-9.25.7-no-sphinx-rtd-theme.patch b/kiwi-9.25.7-no-sphinx-rtd-theme.patch new file mode 100644 index 0000000000000000000000000000000000000000..0b6b28c1a4821a76a04e4a031b2690422c225aab --- /dev/null +++ b/kiwi-9.25.7-no-sphinx-rtd-theme.patch @@ -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 = { diff --git a/kiwi.spec b/kiwi.spec index d65e841502a8f87f5b8ced5e952ac47e44c2a405..128965026cc1b26300d6166ca2e800cdfb94fcf7 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -1,8 +1,8 @@ %{?python_enable_dependency_generator} Name: kiwi -Version: 9.25.1 -Release: 2 +Version: 9.25.22 +Release: 1 License: GPLv3+ Summary: Flexible operating system image builder @@ -12,12 +12,16 @@ Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name} Patch0: openEuler-use-rsync-link.patch Patch1: openEuler-custom-make.patch Patch2: huawei-sync-support-for-building-with-clang.patch +Patch3: kiwi-9.25.7-no-sphinx-rtd-theme.patch +Patch4: kiwi-9.25.7-no-sphinx-custom-css.patch +Patch5: kiwi-9.25.7-doc-use-xml-highlight.patch +Patch6: 0001-Use-buildah-by-default-for-OCI-image-builds.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils BuildRequires: python3-docopt python3-future python3-lxml python3-pyxattr -BuildRequires: python3-six python3-pyyaml python3-requests +BuildRequires: python3-six python3-pyyaml python3-requests python3-sphinx python3-simplejson %description KIWI is an imaging solution that is based on an image XML description. @@ -97,7 +101,7 @@ Requires: python3-%{name} = %{version}-%{release} Requires: bash-completion BuildArch: noarch -%description cli +%description cli %{name} is an imaging solution that is based on an image XML description. Such a description is represented by a directory which includes at least one config.xml or .kiwi file and may as well include other files like @@ -132,6 +136,11 @@ sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py %set_build_flags %py3_build + +# Build man pages +make -C doc man + +# Build C-Tools make CFLAGS="%{build_cflags}" tools %install @@ -195,6 +204,9 @@ done %{_mandir}/man8/%{name}* %changelog +* Mon Mar 18 2024 xuhe - 9.25.22-1 +- update version to 9.25.22 + * Thu Feb 22 2024 luofng - 9.25.1-2 - Type: enhencement - CVE:NA