From 9ab070cacab498bb77e4ad19bb619441cf2ea3b42f7add8e03903fb3e209c11c Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 22 Sep 2020 08:11:03 +0000 Subject: [PATCH] =?UTF-8?q?-=20Bump=20version:=209.21.11=20=E2=86=92=209.2?= =?UTF-8?q?1.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Added consistency runtime check for the type setup multiple type sections within one preferences section is allowed in a kiwi image description. However, if multiple type sections for the same image attribute are configured only the last type configuration will be ever reachable. The proposed runtime check in this commit detects this situation and raises an exception showing the conflicting types including a solution suggestion which needs to be based on profiles to distinguish between types of the same image type name. - Get default maintainer and author from image description This commit sets the maintainer and author metadata from the description section of the image in they are not explicitly specified in container-config section. In addition it sets the default container name to `system-container` instead of `systemContainer` as uppercase letters are not valid for docker container references. Fixes #1419 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=181 --- PKGBUILD | 4 ++-- python-kiwi.changes | 34 ++++++++++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2b2f6ce..7b04502 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=9.21.11 +pkgver=9.21.12 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep) provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('7189cf0fe4fd84ba754e59ada692870e') +md5sums=('4a53060035ad977dd7633997d13401ce') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index 75863a1..6d5a896 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Mon Sep 21 15:54:33 CEST 2020 - Marcus Schäfer + +- Bump version: 9.21.11 → 9.21.12 + +------------------------------------------------------------------- +Mon Sep 21 15:21:21 CEST 2020 - Marcus Schäfer + +- Added consistency runtime check for the type setup + + multiple type sections within one preferences section is allowed + in a kiwi image description. However, if multiple type sections + for the same image attribute are configured only the last type + configuration will be ever reachable. The proposed runtime check + in this commit detects this situation and raises an exception + showing the conflicting types including a solution suggestion + which needs to be based on profiles to distinguish between + types of the same image type name. + +------------------------------------------------------------------- +Mon Sep 21 09:09:29 CEST 2020 - David Cassany + +- Get default maintainer and author from image description + + This commit sets the maintainer and author metadata from the description + section of the image in they are not explicitly specified in + container-config section. + + In addition it sets the default container name to `system-container` + instead of `systemContainer` as uppercase letters are not valid for + docker container references. + + Fixes #1419 + ------------------------------------------------------------------- Fri Sep 18 16:06:02 CEST 2020 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 82d18b9..5046dca 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.21.11 +Version: 9.21.12 Provides: kiwi-schema = 7.2 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 9f4678a..4e8a47d 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be3cd386ea84ef563bded4feb045182017f9425190e7bc17eb42884b808d66f4 -size 1722077 +oid sha256:7b67487fcd6bb0a4635b9f38c44e2b5e73117474802ae4e39a7617a67d9b153b +size 1723989