diff --git a/Added-microdnf-support-in-XML-schema.patch b/Added-microdnf-support-in-XML-schema.patch deleted file mode 100644 index 132a23dbcf18b4ec01fdf0be34c796396920a7e8..0000000000000000000000000000000000000000 --- a/Added-microdnf-support-in-XML-schema.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2d6867c20825c2f021e91365fd6ed4b1ad5db813 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= -Date: Mon, 16 Nov 2020 16:37:58 +0100 -Subject: [PATCH] Added microdnf support in XML schema - -The XML schema did not allow to specify microdnf as -supported package manager ---- - kiwi/schema/kiwi.rnc | 2 +- - kiwi/schema/kiwi.rng | 1 + - kiwi/xml_parse.py | 1 + - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc -index a9dc8d22c7..35f8750cb1 100644 ---- a/kiwi/schema/kiwi.rnc -+++ b/kiwi/schema/kiwi.rnc -@@ -812,7 +812,7 @@ div { - # - div { - k.packagemanager.content = -- "apt-get" | "zypper" | "yum" | "dnf" | "pacman" -+ "apt-get" | "zypper" | "yum" | "dnf" | "microdnf" | "pacman" - k.packagemanager.attlist = empty - k.packagemanager = - ## Name of the Package Manager -diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng -index 270e2eaa83..3d2a12595c 100644 ---- a/kiwi/schema/kiwi.rng -+++ b/kiwi/schema/kiwi.rng -@@ -1250,6 +1250,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/* - zypper - yum - dnf -+ microdnf - pacman - - -diff --git a/kiwi/xml_parse.py b/kiwi/xml_parse.py -index 79b52455f3..3f103b7655 100644 ---- a/kiwi/xml_parse.py -+++ b/kiwi/xml_parse.py -@@ -730,6 +730,7 @@ class k_packagemanager_content(object): - ZYPPER='zypper' - YUM='yum' - DNF='dnf' -+ MICRODNF='microdnf' - PACMAN='pacman' - \ No newline at end of file diff --git a/Added-s390-SLE15-integration-tests.patch b/Added-s390-SLE15-integration-tests.patch deleted file mode 100644 index 843f8088bcf627278baaa29844dc2ad0fa57571a..0000000000000000000000000000000000000000 --- a/Added-s390-SLE15-integration-tests.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 863722fb63f4af7256f7a4d879933b79febf386d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= -Date: Wed, 19 Aug 2020 09:25:13 +0200 -Subject: [PATCH] Added s390 SLE15 integration tests - ---- - .../sle15/test-image-vmx-oem/appliance.kiwi | 84 +++++++++++++++++++ - .../s390/sle15/test-image-vmx-oem/config.sh | 42 ++++++++++ - helper/build_status.sh | 1 + - 3 files changed, 127 insertions(+) - create mode 100644 build-tests/s390/sle15/test-image-vmx-oem/appliance.kiwi - create mode 100644 build-tests/s390/sle15/test-image-vmx-oem/config.sh - -diff --git a/build-tests/s390/sle15/test-image-vmx-oem/appliance.kiwi b/build-tests/s390/sle15/test-image-vmx-oem/appliance.kiwi -new file mode 100644 -index 0000000000..cdc859f387 ---- /dev/null -+++ b/build-tests/s390/sle15/test-image-vmx-oem/appliance.kiwi -@@ -0,0 +1,84 @@ -+ -+ -+ -+ -+ -+ -+ Marcus Schäfer -+ ms@suse.com -+ Virtual and Physical disk image test -+ -+ -+ -+ -+ -+ -+ 1.15.1 -+ zypper -+ en_US -+ us -+ Europe/Berlin -+ true -+ false -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ true -+ 4096 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/build-tests/s390/sle15/test-image-vmx-oem/config.sh b/build-tests/s390/sle15/test-image-vmx-oem/config.sh -new file mode 100644 -index 0000000000..3f41e7cf8e ---- /dev/null -+++ b/build-tests/s390/sle15/test-image-vmx-oem/config.sh -@@ -0,0 +1,42 @@ -+#!/bin/bash -+#================ -+# FILE : config.sh -+#---------------- -+# PROJECT : OpenSuSE KIWI Image System -+# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved -+# : -+# AUTHOR : Marcus Schaefer -+# : -+# BELONGS TO : Operating System images -+# : -+# DESCRIPTION : configuration script for SUSE based -+# : operating systems -+# : -+# : -+# STATUS : BETA -+#---------------- -+#====================================== -+# Functions... -+#-------------------------------------- -+test -f /.kconfig && . /.kconfig -+test -f /.profile && . /.profile -+ -+#====================================== -+# Greeting... -+#-------------------------------------- -+echo "Configure image: [$kiwi_iname]..." -+ -+#====================================== -+# Setup baseproduct link -+#-------------------------------------- -+suseSetupProduct -+ -+#====================================== -+# Activate services -+#-------------------------------------- -+suseInsertService sshd -+ -+#====================================== -+# Setup default target, multi-user -+#-------------------------------------- -+baseSetRunlevel 3 -diff --git a/helper/build_status.sh b/helper/build_status.sh -index b8fe0ea8da..09af11c964 100755 ---- a/helper/build_status.sh -+++ b/helper/build_status.sh -@@ -9,6 +9,7 @@ for project in \ - Virtualization:Appliances:Images:Testing_x86:fedora \ - Virtualization:Appliances:Images:Testing_x86:ubuntu \ - Virtualization:Appliances:Images:Testing_s390:suse \ -+ Virtualization:Appliances:Images:Testing_s390:sle15 \ - Virtualization:Appliances:Images:Testing_arm:suse \ - Virtualization:Appliances:Images:Testing_arm:fedora \ - Virtualization:Appliances:Images:Testing_ppc:suse \ diff --git a/Added-universal-box-to-build-status-helper.patch b/Added-universal-box-to-build-status-helper.patch deleted file mode 100644 index 5e03597d2f6aac4d9f12a0a053c4c84dea3b21fa..0000000000000000000000000000000000000000 --- a/Added-universal-box-to-build-status-helper.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0d473758bc13a622b9b0aa57c7474fea4de5574d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= -Date: Sun, 8 Nov 2020 20:43:35 +0100 -Subject: [PATCH] Added universal box to build status helper - ---- - helper/build_status.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/helper/build_status.sh b/helper/build_status.sh -index c740700076..177aaf34fa 100755 ---- a/helper/build_status.sh -+++ b/helper/build_status.sh -@@ -4,6 +4,7 @@ for project in \ - Virtualization:Appliances:SelfContained:fedora \ - Virtualization:Appliances:SelfContained:suse \ - Virtualization:Appliances:SelfContained:ubuntu \ -+ Virtualization:Appliances:SelfContained:universal \ - Virtualization:Appliances:Images:Testing_x86:suse \ - Virtualization:Appliances:Images:Testing_x86:centos \ - Virtualization:Appliances:Images:Testing_x86:fedora \ diff --git a/Cosmetic-update-for-build-status-helper.patch b/Cosmetic-update-for-build-status-helper.patch deleted file mode 100644 index d7a212929ea213c6d421c809593f1587536d5e6e..0000000000000000000000000000000000000000 --- a/Cosmetic-update-for-build-status-helper.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0d006cf1225bd6ca76057ae11e731ff7b4cd0d97 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= -Date: Mon, 21 Sep 2020 17:04:08 +0200 -Subject: [PATCH] Cosmetic update for build status helper - -Show disabled integration test builds with a clear indicator ---- - helper/build_status.sh | 28 +++++++++++++++------------- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/helper/build_status.sh b/helper/build_status.sh -index 09af11c964..c740700076 100755 ---- a/helper/build_status.sh -+++ b/helper/build_status.sh -@@ -23,9 +23,11 @@ do - echo -e "$(echo $line |\ - sed -e s@^F@'\\033[31mF\\e[0m'@ |\ - sed -e s@^U@'\\033[33mU\\e[0m'@ |\ -+ sed -e s@^D@'\\033[36mD\\e[0m'@ |\ - sed -e s@^\\.@'\\033[32m.\\e[0m'@)" - done < <(osc -A https://api.opensuse.org \ -- results -V "${project}" | grep -B100 Legend | grep -v Legend -+ results -V "${project}" | sed -e 's@^ @ D @' |\ -+ grep -B100 Legend | grep -v Legend - ) - else - for package in $(osc -A https://api.opensuse.org list "${project}");do -@@ -43,18 +45,18 @@ if [ ! "$1" = "refresh" ];then - cat << EOF - Legend: - . succeeded -- disabled -- U unresolvable -- F failed -- B broken -- b blocked -- % building -- f finished -- s scheduled -- L locked -- x excluded -- d dispatching -- S signing -+ D Disabled -+ U unresolvable -+ F failed -+ B broken -+ b blocked -+ % building -+ f finished -+ s scheduled -+ L locked -+ x excluded -+ d dispatching -+ S signing - ? buildstatus not available - EOF - fi diff --git a/Include-box-plugin-images-to-build_status.patch b/Include-box-plugin-images-to-build_status.patch deleted file mode 100644 index ca038347f8f1bdf026fd6360e476defdf7d80e69..0000000000000000000000000000000000000000 --- a/Include-box-plugin-images-to-build_status.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 49d09e9667e90562470d58ab369614f2db8c5c0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= -Date: Thu, 13 Aug 2020 11:17:33 +0200 -Subject: [PATCH] Include box plugin images to build_status - -Also show some colors for failed and unresolvable builds ---- - helper/build_status.sh | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/helper/build_status.sh b/helper/build_status.sh -index ef93ee847c..b8fe0ea8da 100755 ---- a/helper/build_status.sh -+++ b/helper/build_status.sh -@@ -1,6 +1,9 @@ - #!/bin/bash - - for project in \ -+ Virtualization:Appliances:SelfContained:fedora \ -+ Virtualization:Appliances:SelfContained:suse \ -+ Virtualization:Appliances:SelfContained:ubuntu \ - Virtualization:Appliances:Images:Testing_x86:suse \ - Virtualization:Appliances:Images:Testing_x86:centos \ - Virtualization:Appliances:Images:Testing_x86:fedora \ -@@ -9,13 +12,20 @@ for project in \ - Virtualization:Appliances:Images:Testing_arm:suse \ - Virtualization:Appliances:Images:Testing_arm:fedora \ - Virtualization:Appliances:Images:Testing_ppc:suse \ -+ Virtualization:Appliances:Images:Testing_ppc:sle15 \ - Virtualization:Appliances:Images:Testing_ppc:fedora \ - Virtualization:Appliances:Images:Testing_x86:archlinux - do - echo "${project}" - if [ ! "$1" = "refresh" ];then -- osc -A https://api.opensuse.org \ -+ while read -r line;do -+ echo -e "$(echo $line |\ -+ sed -e s@^F@'\\033[31mF\\e[0m'@ |\ -+ sed -e s@^U@'\\033[33mU\\e[0m'@ |\ -+ sed -e s@^\\.@'\\033[32m.\\e[0m'@)" -+ done < <(osc -A https://api.opensuse.org \ - results -V "${project}" | grep -B100 Legend | grep -v Legend -+ ) - else - for package in $(osc -A https://api.opensuse.org list "${project}");do - if [[ "${package}" =~ ^test- ]];then -~ -~ -~ diff --git a/Simplify-build_status-helpe.patch b/Simplify-build_status-helpe.patch deleted file mode 100644 index 89cfb84f68c1676d36242810b27bacdeffe2b5b9..0000000000000000000000000000000000000000 --- a/Simplify-build_status-helpe.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 575f7788f2af100d7cc1e102637d3a8653caceea Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= -Date: Tue, 11 Aug 2020 11:54:50 +0200 -Subject: [PATCH] Simplify build_status helper - -Instead of a static list with all integration test build names -only maintain a list of integration test build project names ---- - helper/build_status.sh | 86 +++++++++++++++++++++--------------------- - 1 file changed, 43 insertions(+), 43 deletions(-) - -diff --git a/helper/build_status.sh b/helper/build_status.sh -index 670c5b161f..ef93ee847c 100755 ---- a/helper/build_status.sh -+++ b/helper/build_status.sh -@@ -1,49 +1,49 @@ - #!/bin/bash - --for image in \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-azure \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-docker \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-docker-derived\ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-ec2 \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-gce \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-iso \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-luks \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-MicroOS \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-oem \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-oem-legacy \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-orthos-oem \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-overlayroot \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-pxe \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-qcow-openstack\ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-tbz \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-vmx \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-vmx-lvm \ -- Virtualization:Appliances:Images:Testing_x86:suse/test-image-custom-partitions \ -- Virtualization:Appliances:Images:Testing_x86:centos/test-image-iso-oem-vmx \ -- Virtualization:Appliances:Images:Testing_x86:fedora/test-image-iso-oem-vmx \ -- Virtualization:Appliances:Images:Testing_x86:ubuntu/test-image-iso-oem-vmx \ -- Virtualization:Appliances:Images:Testing_s390:suse/test-image-oem \ -- Virtualization:Appliances:Images:Testing_s390:suse/test-image-vmx \ -- Virtualization:Appliances:Images:Testing_arm:suse/test-image-iso \ -- Virtualization:Appliances:Images:Testing_arm:suse/test-image-rpi-oem \ -- Virtualization:Appliances:Images:Testing_arm:fedora/test-image-iso \ -- Virtualization:Appliances:Images:Testing_ppc:suse/test-image-vmx \ -- Virtualization:Appliances:Images:Testing_ppc:fedora/test-image-vmx \ -- Virtualization:Appliances:Images:Testing_x86:archlinux/test-image-iso-oem-vmx-kis -+for project in \ -+ Virtualization:Appliances:Images:Testing_x86:suse \ -+ Virtualization:Appliances:Images:Testing_x86:centos \ -+ Virtualization:Appliances:Images:Testing_x86:fedora \ -+ Virtualization:Appliances:Images:Testing_x86:ubuntu \ -+ Virtualization:Appliances:Images:Testing_s390:suse \ -+ Virtualization:Appliances:Images:Testing_arm:suse \ -+ Virtualization:Appliances:Images:Testing_arm:fedora \ -+ Virtualization:Appliances:Images:Testing_ppc:suse \ -+ Virtualization:Appliances:Images:Testing_ppc:fedora \ -+ Virtualization:Appliances:Images:Testing_x86:archlinux - do -- project=$(echo "${image}" | cut -f1 -d/) -- package=$(echo "${image}" | cut -f2 -d/) -- if [ "${project_last}" != "${project}" ];then -- echo -- echo "$project" -- fi -- echo "${package}" -- osc -A https://api.opensuse.org \ -- results "${project}" "${package}" -- if [ "$1" = "refresh" ];then -- echo -n "[refresh requested: ]" -+ echo "${project}" -+ if [ ! "$1" = "refresh" ];then - osc -A https://api.opensuse.org \ -- service remoterun "${project}" "${package}" -+ results -V "${project}" | grep -B100 Legend | grep -v Legend -+ else -+ for package in $(osc -A https://api.opensuse.org list "${project}");do -+ if [[ "${package}" =~ ^test- ]];then -+ echo -n "[refresh requested for ${package}: ]" -+ osc -A https://api.opensuse.org \ -+ service remoterun "${project}" "${package}" -+ fi -+ done -+ echo - fi -- project_last="${project}" - done -+ -+if [ ! "$1" = "refresh" ];then -+cat << EOF -+Legend: -+ . succeeded -+ disabled -+ U unresolvable -+ F failed -+ B broken -+ b blocked -+ % building -+ f finished -+ s scheduled -+ L locked -+ x excluded -+ d dispatching -+ S signing -+ ? buildstatus not available -+EOF -+fi diff --git a/kiwi-9.21.5.tar.gz b/kiwi-9.21.5.tar.gz deleted file mode 100644 index 7e60638d3e0d3173ce05ae1010250bcc805f4ec6..0000000000000000000000000000000000000000 Binary files a/kiwi-9.21.5.tar.gz and /dev/null differ diff --git a/kiwi-9.23.34.tar.gz b/kiwi-9.23.34.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..48d6abe77d010f9c8e9e52964fe4ed3640d9181f Binary files /dev/null and b/kiwi-9.23.34.tar.gz differ diff --git a/kiwi.spec b/kiwi.spec index a5ce47a982ee54f1c9419621cedf40edbd4231b3..91fb4a7e73029de21d889eee5b7ad014c23ac021 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -1,21 +1,14 @@ %{?python_enable_dependency_generator} Name: kiwi -Version: 9.21.5 -Release: 2 +Version: 9.23.34 +Release: 1 License: GPLv3+ Summary: Flexible operating system image builder URL: http://osinside.github.io/kiwi/ Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz -Patch0: Added-microdnf-support-in-XML-schema.patch -Patch1: Simplify-build_status-helpe.patch -Patch2: Include-box-plugin-images-to-build_status.patch -Patch3: Added-s390-SLE15-integration-tests.patch -Patch4: Cosmetic-update-for-build-status-helper.patch -Patch5: Added-universal-box-to-build-status-helper.patch - BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils @@ -142,6 +135,8 @@ make CFLAGS="%{build_cflags}" tools make buildroot=%{buildroot}/ install make buildroot=%{buildroot}/ install_dracut +mkdir -p %{buildroot}%{_datadir}/bash-completion/completions + rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d rm -rf %{buildroot}%{_docdir}/packages @@ -176,7 +171,7 @@ done %files cli %defattr(-,root,root) %{_bindir}/%{name}* -%{_datadir}/bash-completion/completions/%{name}-ng.sh +%{_datadir}/bash-completion/completions/%{name}-ng %config(noreplace) %{_sysconfdir}/kiwi.yml %ifarch %{ix86} x86_64 @@ -196,6 +191,9 @@ done %{_mandir}/man8/%{name}* %changelog +* Wed Jan 12 2022 liudabo - 9.23.34-1 +- update version to 9.23.34 + * Thu Nov 26 2020 wuchaochao - 9.21.5-2 - Type:bugfix - ID:NA