packages/kiwi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!87 update version to 9.21.7

Browse Source 
From: @tong_1001 
Reviewed-by: @zhuchunyi 
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2022-04-18 01:42:53 +00:00 committed by Gitee
commit 6ae071e20f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 47 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backport-Added-microdnf-support-in-XML-schema.patch
View File

@ -3,8 +3,10 @@ From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
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 +
@ -12,10 +14,10 @@ supported package manager
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc
index a9dc8d22c7..35f8750cb1 100644
index 2e296fe..03bfffe 100644
--- a/kiwi/schema/kiwi.rnc
+++ b/kiwi/schema/kiwi.rnc
@@ -812,7 +812,7 @@ div {
@@ -793,7 +793,7 @@ div {
#
div {
k.packagemanager.content =
@ -25,10 +27,10 @@ index a9dc8d22c7..35f8750cb1 100644
k.packagemanager =
## Name of the Package Manager
diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng
index 270e2eaa83..3d2a12595c 100644
index daaca9e..11a83aa 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/*</a:documentation>
@@ -1228,6 +1228,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
<value>zypper</value>
<value>yum</value>
<value>dnf</value>
@ -37,7 +39,7 @@ index 270e2eaa83..3d2a12595c 100644
</choice>
</define>
diff --git a/kiwi/xml_parse.py b/kiwi/xml_parse.py
index 79b52455f3..3f103b7655 100644
index d5677a5..43ccc0d 100644
--- a/kiwi/xml_parse.py
+++ b/kiwi/xml_parse.py
@@ -730,6 +730,7 @@ class k_packagemanager_content(object):
@ -46,4 +48,8 @@ index 79b52455f3..3f103b7655 100644
DNF='dnf'
+ MICRODNF='microdnf'
PACMAN='pacman'
--
2.33.0

29
backport-Cosmetic-update-for-build-status-helper.patch
View File

@ -9,7 +9,7 @@ Show disabled integration test builds with a clear indicator
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/helper/build_status.sh b/helper/build_status.sh
index 09af11c964..c740700076 100755
index 09af11c..c740700 100755
--- a/helper/build_status.sh
+++ b/helper/build_status.sh
@@ -23,9 +23,11 @@ do
@ -29,18 +29,18 @@ index 09af11c964..c740700076 100755
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
- 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
@ -56,3 +56,6 @@ index 09af11c964..c740700076 100755
? buildstatus not available
EOF
fi
--
2.33.0

108
backport-Simplify-build_status-helpe.patch
View File

@ -1,108 +0,0 @@
From 575f7788f2af100d7cc1e102637d3a8653caceea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
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

BIN
kiwi-9.21.5.tar.gz
View File

Binary file not shown.

BIN
kiwi-9.21.7.tar.gz Normal file
View File

Binary file not shown.

8
kiwi.spec
View File

@ -1,8 +1,8 @@
%{?python_enable_dependency_generator}
Name: kiwi
Version: 9.21.5
Release: 3
Version: 9.21.7
Release: 1
License: GPLv3+
Summary: Flexible operating system image builder
@ -10,7 +10,6 @@ URL: http://osinside.github.io/kiwi/
Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
Patch0: backport-Added-microdnf-support-in-XML-schema.patch
Patch1: backport-Simplify-build_status-helpe.patch
Patch2: backport-Include-box-plugin-images-to-build_status.patch
Patch3: backport-Added-s390-SLE15-integration-tests.patch
Patch4: backport-Cosmetic-update-for-build-status-helper.patch
@ -199,6 +198,9 @@ done
%{_mandir}/man8/%{name}*
%changelog
* Sat Apr 16 2022 shixuantong <shixuantong@h-partners.com> - 9.21.7-1
- update version to 9.21.7
* Sat Jan 22 2022 liudabo <liudabo1@huawei.com> - 9.21.5-3
- Type:bugfix
- ID:NA

28
openEuler-custom-make.patch
View File

@ -297,7 +297,7 @@ index a81be6a..cd28ec8 100644
#======================================
# suseService
#--------------------------------------
@@ -361,11 +389,59 @@ function baseStripDocs {
@@ -361,10 +389,58 @@ function baseStripDocs {
grep -iv "copying\|license\|copyright")
rm -f "${docfiles}"
done
@ -306,7 +306,7 @@ index a81be6a..cd28ec8 100644
rm -rf /usr/share/man
}
#======================================
+#======================================
+# baseStripcustomBep
+#--------------------------------------
+function baseStripcustomBep {
@ -353,14 +353,14 @@ index a81be6a..cd28ec8 100644
+ baseStripcustomBep $dbephookdir
+}
+
+#======================================
#======================================
# baseStripLocales
#--------------------------------------
function baseStripLocales {
@@ -375,12 +451,24 @@ function baseStripLocales {
@@ -374,13 +450,25 @@ function baseStripLocales {
baseStripAndKeep "${keepLocales}"
}
#======================================
+#======================================
+# baseStripGconv
+#--------------------------------------
+function baseStripGconv {
@ -373,7 +373,7 @@ index a81be6a..cd28ec8 100644
+ baseStripAndKeep ${keepGconv}
+}
+
+#======================================
#======================================
# baseStripTranslations
#--------------------------------------
function baseStripTranslations {
@ -394,10 +394,11 @@ index a81be6a..cd28ec8 100644
fi
done
}
@@ -508,6 +596,45 @@ function Debug {
@@ -507,6 +595,45 @@ function Debug {
echo "+++++> (caller:${FUNCNAME[1]}:${FUNCNAME[2]} ) $*"
fi
}
#======================================
+#======================================
+# baseSetupBusyBox
+#--------------------------------------
+function baseSetupBusyBox {
@ -436,10 +437,9 @@ index a81be6a..cd28ec8 100644
+ done
+}
+
+#======================================
#======================================
# stripUnusedLibs
#--------------------------------------
function baseStripUnusedLibs {
@@ -518,6 +645,8 @@ function baseStripUnusedLibs {
local needlibs
local found
@ -808,10 +808,10 @@ index a81be6a..cd28ec8 100644
+ return 0
+}
diff --git a/kiwi/path.py b/kiwi/path.py
index 44ff5cd..db99dac 100644
index b763211..b2ce909 100644
--- a/kiwi/path.py
+++ b/kiwi/path.py
@@ -145,7 +145,7 @@ class Path:
@@ -150,7 +150,7 @@ class Path:
)
path_elements = path.split(os.sep)
protected_elements = [
@ -894,5 +894,5 @@ index 90f7c45..426e79b 100644
'check_volume_setup_defines_reserved_labels': [],
'check_volume_setup_defines_multiple_fullsize_volumes': [],
--
1.8.3.1
2.33.0