back version to 9.25.1
(cherry picked from commit 9e618963cfc1d819ae98ea24c364004f69e3daf2)
This commit is contained in:
chen-huihan
openeuler-sync-bot
parent
b68d0e8cbd
commit
c186e613d5
@ -1,39 +0,0 @@
|
||||
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
|
||||
|
||||
BIN
kiwi-9.25.1.tar.gz
Normal file
BIN
kiwi-9.25.1.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,22 +0,0 @@
|
||||
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}"/>
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
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 = {
|
||||
@ -1,23 +0,0 @@
|
||||
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 = {
|
||||
20
kiwi.spec
20
kiwi.spec
@ -1,8 +1,8 @@
|
||||
%{?python_enable_dependency_generator}
|
||||
|
||||
Name: kiwi
|
||||
Version: 9.25.22
|
||||
Release: 1
|
||||
Version: 9.25.1
|
||||
Release: 3
|
||||
License: GPLv3+
|
||||
Summary: Flexible operating system image builder
|
||||
|
||||
@ -12,16 +12,12 @@ 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 python3-sphinx python3-simplejson
|
||||
BuildRequires: python3-six python3-pyyaml python3-requests
|
||||
|
||||
%description
|
||||
KIWI is an imaging solution that is based on an image XML description.
|
||||
@ -101,7 +97,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
|
||||
@ -136,11 +132,6 @@ 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
|
||||
@ -204,6 +195,9 @@ done
|
||||
%{_mandir}/man8/%{name}*
|
||||
|
||||
%changelog
|
||||
* Fri Mar 29 2024 chenhuihan <chenhuihan@huawei.com> - 9.25.1-3
|
||||
- back version to 9.25.1
|
||||
|
||||
* Mon Mar 18 2024 xuhe <xuhe@kylinos.cn> - 9.25.22-1
|
||||
- update version to 9.25.22
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user