From c492db8580c3da2279db7f10d72d672dbd7de6b08ab9f0ae6c34f17651cc4584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Tue, 4 Jun 2024 07:22:44 +0000 Subject: [PATCH 1/2] - Fix TW integration test to build outside OBS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Make sure BootLoaderConfig fixes are effective The BootLoaderConfigGrub2 class has methods to fix the grub-mkconfig generated files. It does that by mounting the system and changing the respective files after the mkconfig call. However, after the change the class instance stays open in combination with BootLoaderInstallGrub2 instance which itself under certain circumstances also mounts the system to call grub-install. At the time grub-install is called it cannot be guaranteed that all changes has been written unless an explicit umount in the BootLoaderConfigGrub2 class instance happened. This commit address the potential race condition. - Bump version: 10.0.19 → 10.0.20 - Update rawhide integration test Use new arch attribute for testing in the repository element of the rawhide/test-image-live-disk integration test. - Add support for arch attr in repository element Allow to provide different repository sections per architecture - Add --list-profiles to image info Allow to list available profiles from the processed image description OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=253 --- PKGBUILD | 4 ++-- python-kiwi.changes | 49 +++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 4e67d57..7e3ef2b 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=10.0.19 +pkgver=10.0.20 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(make gcc python-build python-docopt python-installer python-lxml py provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('57e3c2063f957f448bd085685fa1358a') +md5sums=('92879b7842c6e0baad6b824c067259c0') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index ad9163c..adcb3dd 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Mon Jun 03 17:59:18 CEST 2024 - Marcus Schäfer + +- Fix TW integration test to build outside OBS + +------------------------------------------------------------------- +Mon Jun 03 17:46:52 CEST 2024 - Marcus Schäfer + +- Make sure BootLoaderConfig fixes are effective + + The BootLoaderConfigGrub2 class has methods to fix the grub-mkconfig + generated files. It does that by mounting the system and changing the + respective files after the mkconfig call. However, after the change + the class instance stays open in combination with BootLoaderInstallGrub2 + instance which itself under certain circumstances also mounts the + system to call grub-install. At the time grub-install is called it + cannot be guaranteed that all changes has been written unless an + explicit umount in the BootLoaderConfigGrub2 class instance happened. + This commit address the potential race condition. + +------------------------------------------------------------------- +Mon Jun 03 09:22:00 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.19 → 10.0.20 + +------------------------------------------------------------------- +Mon Jun 03 08:25:11 CEST 2024 - Marcus Schäfer + +- Update rawhide integration test + + Use new arch attribute for testing in the repository + element of the rawhide/test-image-live-disk integration + test. + +------------------------------------------------------------------- +Sat Jun 01 20:55:02 CEST 2024 - Marcus Schäfer + +- Add support for arch attr in repository element + + Allow to provide different repository sections per architecture + +------------------------------------------------------------------- +Fri May 31 12:38:04 CEST 2024 - Marcus Schäfer + +- Add --list-profiles to image info + + Allow to list available profiles from the processed image + description + ------------------------------------------------------------------- Thu May 30 21:55:20 CEST 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 7019dd8..fef228e 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -44,7 +44,7 @@ %endif Name: python-kiwi -Version: 10.0.19 +Version: 10.0.20 Provides: kiwi-schema = 8.1 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 0e0a0de..66de4c5 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:7e82753e7ab32c9d10a2741b6f51fb44698e4a4d47eceb4cf8767444e14d8538 -size 1024756 +oid sha256:66b9145060bac8d7d686d7474c1781bece9d9482b85d107bb387e66a15401bec +size 1021092 From 7663391cc53248b894d6491e0840825e196741d84c5e066d02ddc980ec3ad3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Tue, 4 Jun 2024 09:16:14 +0000 Subject: [PATCH 2/2] =?UTF-8?q?-=20Bump=20version:=2010.0.20=20=E2=86=92?= =?UTF-8?q?=2010.0.21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add missing write_meta_data method to BLS base The standard bootloader interface class provided a method named write_meta_data which is expected to be implemented in the specialized bootloader implementation. For BLS bootloaders this method was missing in the BLS base class. write_meta_data can provide additional cmdline options for booting. If not covered some boot options might be missing. This patch fixes it OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=254 --- PKGBUILD | 4 ++-- python-kiwi.changes | 18 ++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7e3ef2b..a3cade7 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=10.0.20 +pkgver=10.0.21 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(make gcc python-build python-docopt python-installer python-lxml py provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('92879b7842c6e0baad6b824c067259c0') +md5sums=('7a57fc01393c8e62449d1899cb185642') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index adcb3dd..766b69e 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Jun 04 11:13:01 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.20 → 10.0.21 + +------------------------------------------------------------------- +Mon Jun 03 21:30:46 CEST 2024 - Marcus Schäfer + +- Add missing write_meta_data method to BLS base + + The standard bootloader interface class provided a method + named write_meta_data which is expected to be implemented + in the specialized bootloader implementation. For BLS + bootloaders this method was missing in the BLS base class. + write_meta_data can provide additional cmdline options + for booting. If not covered some boot options might be + missing. This patch fixes it + ------------------------------------------------------------------- Mon Jun 03 17:59:18 CEST 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index fef228e..6faa549 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -44,7 +44,7 @@ %endif Name: python-kiwi -Version: 10.0.20 +Version: 10.0.21 Provides: kiwi-schema = 8.1 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 66de4c5..23822bd 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:66b9145060bac8d7d686d7474c1781bece9d9482b85d107bb387e66a15401bec -size 1021092 +oid sha256:ab45ce2f9ca677515be17ed440a7c4eab70be54b4a960b6af5d3c7ccca1eea90 +size 1021124