From 93ea3ef997f6934e5a82c4a1dfe3944355655aad33ef65ec1cab7db13c97d420 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Thu, 16 Apr 2020 10:28:11 +0000 Subject: [PATCH 1/2] =?UTF-8?q?-=20Bump=20version:=209.20.7=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.20.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed return value from _get_grub2_mkconfig_tool The method returned the basename of the tool if it could be found by Path.which(). But the method's scope has been changed in a way that the return value of the method must be the result from Path.which() to allow working on the full path name. - Bump version: 9.20.6 → 9.20.7 - Make CommandCapabilities.check_version take the longest match This commit ensures that when trying to parse the version of a tool the comparison is done with the longest match for the given regular expression. This solves cases such in `grub2` where the tool name already provides some digit that could be seen as a version. - Fixed check for grub mkconfig capabilities The check for the capabilities of the tool were applied to the tool installed on the host but the later call of the tool will be done with the tool inside the image root - Validate use of GRUB_USE_LINUXEFI On systems that uses GRUB_USE_LINUXEFI with grub2 version less than 2.04 there is no support for dynamic EFI environment checking. In this condition we extend the grub setup to add this support. The change kiwi does is as follows: * Apply only on grub < 2.04 1. Modify 10_linux to set linux/initrd as variables OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=168 --- python-kiwi.changes | 85 +++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 +-- 3 files changed, 88 insertions(+), 3 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 9e5790b..ba5a987 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,88 @@ +------------------------------------------------------------------- +Thu Apr 16 12:13:39 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.7 → 9.20.8 + +------------------------------------------------------------------- +Thu Apr 16 11:24:28 CEST 2020 - Marcus Schäfer + +- Fixed return value from _get_grub2_mkconfig_tool + + The method returned the basename of the tool if it could + be found by Path.which(). But the method's scope has been + changed in a way that the return value of the method must + be the result from Path.which() to allow working on the + full path name. + +------------------------------------------------------------------- +Thu Apr 16 10:26:29 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.6 → 9.20.7 + +------------------------------------------------------------------- +Wed Apr 15 15:53:48 CEST 2020 - David Cassany + +- Make CommandCapabilities.check_version take the longest match + + This commit ensures that when trying to parse the version of a tool + the comparison is done with the longest match for the given regular + expression. This solves cases such in `grub2` where the tool name + already provides some digit that could be seen as a version. + +------------------------------------------------------------------- +Wed Apr 15 11:20:45 CEST 2020 - Marcus Schäfer + +- Fixed check for grub mkconfig capabilities + + The check for the capabilities of the tool were applied to + the tool installed on the host but the later call of the + tool will be done with the tool inside the image root + +------------------------------------------------------------------- +Wed Apr 15 10:51:44 CEST 2020 - Marcus Schäfer + +- Validate use of GRUB_USE_LINUXEFI + + On systems that uses GRUB_USE_LINUXEFI with grub2 version + less than 2.04 there is no support for dynamic EFI + environment checking. In this condition we extend the grub + setup to add this support. The change kiwi does is as + follows: + + * Apply only on grub < 2.04 + 1. Modify 10_linux to set linux/initrd as variables + 2. Write hybrid setup as 01_efihybrid + + This Fixes bsc#1165960 and bsc#1168480 + +------------------------------------------------------------------- +Tue Apr 14 16:25:48 CEST 2020 - Jan Löser + +- Fixed typo in docstring + + Istall -> Install + +------------------------------------------------------------------- +Sat Apr 11 18:18:02 CEST 2020 - Marcus Schäfer + +- Create qcow2 images in two steps + + The creation of the qcow2 format was done in one qemu-img + convert call. That call instructs qemu to compress and + convert in one call. The downside of this approach is that + not all qcow2 options can be used. For example the setup + of: + + + + failed the build with an error message that compression and + preallocation is not possible at the same time. Thus this patch + changes the way the qcow2 image is created to be done in two + steps. The first step converts the format without compression + and therefore allows for any format option to be used. The + second call only applies the compression and leads to the + final result. + ------------------------------------------------------------------- Fri Apr 03 16:11:57 CEST 2020 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index fec4129..4c03b31 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.20.6 +Version: 9.20.8 Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index f6b654f..1daa784 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:755485f496b2b29128558b721bbfa79f549189ba263ed3cff2999fe028d486a8 -size 1654027 +oid sha256:bda608040faf657ca74967e4c2d6e9572ca6d598e1544e5211f679a3496bab11 +size 1654872 From bff191c9e7d88050b328728add5adccc8079cdba1dab4ee6e21584904d8cbf2d Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 17 Apr 2020 10:16:43 +0000 Subject: [PATCH 2/2] =?UTF-8?q?-=20Bump=20version:=209.20.8=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.20.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed _get_grub2_mkconfig_tool Last patch on this method breaks the search for alternative mkconfig names. It returns always on the first lookup which could be none. This breaks on systems that uses a different name than grub2-mkconfig, like on Ubuntu. - Increase spare space on disk repart The sizing of the virtual cylinders in parted seems to be unfavorable, as with some disks and SD cards here the device size is not a multiple of the cylinder size, so the last incomplete cylinder is wasted. If this wasted space is more than 5MiB, kiwi tries to resize indefinitely. Therefore min_additional_mbytes gets increased to prevent running into this situation. This Fixes bsc#1165823 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=169 --- python-kiwi.changes | 27 +++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index ba5a987..2498792 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,8 +1,35 @@ +------------------------------------------------------------------- +Fri Apr 17 11:06:19 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.8 → 9.20.9 + +------------------------------------------------------------------- +Fri Apr 17 10:21:57 CEST 2020 - Marcus Schäfer + +- Fixed _get_grub2_mkconfig_tool + + Last patch on this method breaks the search for alternative + mkconfig names. It returns always on the first lookup which + could be none. This breaks on systems that uses a different + name than grub2-mkconfig, like on Ubuntu. + ------------------------------------------------------------------- Thu Apr 16 12:13:39 CEST 2020 - Marcus Schäfer - Bump version: 9.20.7 → 9.20.8 +------------------------------------------------------------------- +Thu Apr 16 11:52:26 CEST 2020 - Marcus Schäfer + +- Increase spare space on disk repart + + The sizing of the virtual cylinders in parted seems to be unfavorable, + as with some disks and SD cards here the device size is not a multiple + of the cylinder size, so the last incomplete cylinder is wasted. + If this wasted space is more than 5MiB, kiwi tries to resize indefinitely. + Therefore min_additional_mbytes gets increased to prevent running + into this situation. This Fixes bsc#1165823 + ------------------------------------------------------------------- Thu Apr 16 11:24:28 CEST 2020 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 4c03b31..a3a02de 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.20.8 +Version: 9.20.9 Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 1daa784..2fa5946 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:bda608040faf657ca74967e4c2d6e9572ca6d598e1544e5211f679a3496bab11 -size 1654872 +oid sha256:3035d219b29af55f20847b0f27ffba149e7b279dd85d0230c0e00e6e0ee4e7d4 +size 1654683