From 289b31f48b82beaa7f3ce272542ef6081e51310fc8b428d98df00dfee0ad190e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Wed, 13 Mar 2024 14:12:52 +0000 Subject: [PATCH] =?UTF-8?q?-=20Bump=20version:=2010.0.4=20=E2=86=92=2010.0?= =?UTF-8?q?.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Followup fix for use of /boot/zipl The mounting of /boot/zipl is also only required if the bootloader is set to grub2_s390x_emu - Update schema version in spec file - Drop rpm-dir from allowed repository type Using an arbitrary list of rpm packages as repository is a zypper only feature, barely tested and from our pov not really needed as a simple createrepo call turns any custom list of packages into a clean rpm-md repo including metadata. This commit drops rpm-dir from the list of allowed repository types and auto converts those image descriptions which makes use of it. Please note this does not prevent users from using flat package directories with zypper, because the type argument in the repository section is an optional attribute. In case there is no type specification zypper auto-detects and handles the data as it handles it. This Fixes #1926 - Fixup use of /boot/zipl Only for the grub2_s390x_emu bootloader setup an optional boot partition setup must be put to /boot/zipl rather than to /boot - Lookup distro provided BLS entries for zipl Check if there is already an entry file name produced by the distribution logic/policy. If we can find an already present entry name, prefer this name over the kiwi naming policy OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=240 --- PKGBUILD | 4 ++-- python-kiwi.changes | 57 +++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 4 ++-- python-kiwi.tar.gz | 4 ++-- 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 93139fc..b7c9ed7 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.4 +pkgver=10.0.5 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=('176ae8ba6f6730071ad46f323b476f4f') +md5sums=('a7799c0c1057f6388dc412f712843d5d') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index fc2f186..3ea42a5 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Wed Mar 13 15:09:21 CET 2024 - Marcus Schäfer + +- Bump version: 10.0.4 → 10.0.5 + +------------------------------------------------------------------- +Wed Mar 13 08:41:02 CET 2024 - Marcus Schäfer + +- Followup fix for use of /boot/zipl + + The mounting of /boot/zipl is also only required if the + bootloader is set to grub2_s390x_emu + +------------------------------------------------------------------- +Wed Mar 13 08:35:17 CET 2024 - Marcus Schäfer + +- Update schema version in spec file + +------------------------------------------------------------------- +Tue Mar 12 16:23:40 CET 2024 - Marcus Schäfer + +- Drop rpm-dir from allowed repository type + + Using an arbitrary list of rpm packages as repository is a zypper + only feature, barely tested and from our pov not really needed + as a simple createrepo call turns any custom list of packages + into a clean rpm-md repo including metadata. This commit drops + rpm-dir from the list of allowed repository types and auto + converts those image descriptions which makes use of it. Please + note this does not prevent users from using flat package + directories with zypper, because the type argument in the + repository section is an optional attribute. In case there is + no type specification zypper auto-detects and handles the data + as it handles it. This Fixes #1926 + +------------------------------------------------------------------- +Tue Mar 12 12:35:12 CET 2024 - Marcus Schäfer + +- Fixup use of /boot/zipl + + Only for the grub2_s390x_emu bootloader setup an optional boot + partition setup must be put to /boot/zipl rather than to /boot + +------------------------------------------------------------------- +Mon Mar 11 15:23:02 CET 2024 - Marcus Schäfer + +- Lookup distro provided BLS entries for zipl + + Check if there is already an entry file name produced by the + distribution logic/policy. If we can find an already present + entry name, prefer this name over the kiwi naming policy + +------------------------------------------------------------------- +Mon Mar 11 14:58:39 CET 2024 - Marcus Schäfer + +- Install audit in s390 rawhide integration test + ------------------------------------------------------------------- Sun Mar 10 17:55:32 CET 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 2ce8a4e..1b4448c 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -44,8 +44,8 @@ %endif Name: python-kiwi -Version: 10.0.4 -Provides: kiwi-schema = 7.5 +Version: 10.0.5 +Provides: kiwi-schema = 8.1 Release: 0 Url: https://github.com/OSInside/kiwi Summary: KIWI - Appliance Builder Next Generation diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index e24c60b..2ff621e 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:2677464033c0cd3b9df10a40c9c15d1e50a3f37bd68630d99fd30df5aeba5952 -size 1005444 +oid sha256:acc6c96fdbbce3750f4b643ae6db26e7b62194140962f709735b38ee7c4aa813 +size 1004838