diff --git a/PKGBUILD b/PKGBUILD index f2dabaa..4e67d57 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.12 +pkgver=10.0.19 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=('443063a6b75cb04057fedb1fdc9ae49e') +md5sums=('57e3c2063f957f448bd085685fa1358a') build() { diff --git a/kiwi-revert-bls-default-for-suse.patch b/kiwi-revert-bls-default-for-suse.patch new file mode 100644 index 0000000..26b8ac2 --- /dev/null +++ b/kiwi-revert-bls-default-for-suse.patch @@ -0,0 +1,67 @@ +From b0d850842b0c8d4c98f0486f66ffd7c6e8f1a685 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Thu, 2 May 2024 06:23:45 -0400 +Subject: [PATCH] Revert "kiwi/bootloader: restore backward compatibility for + grub2 with bls" + +For the time being, SUSE distributions cannot handle KIWI's default to use +BLS with GRUB2. Until they catch up, revert this. + +This reverts commit 155d969d7752d92c90c69044bdd69be70f0a1c24. +--- + kiwi/xml_state.py | 2 +- + test/unit/bootloader/config/grub2_test.py | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/kiwi/xml_state.py b/kiwi/xml_state.py +index eb39163cd..8c3fd45f3 100644 +--- a/kiwi/xml_state.py ++++ b/kiwi/xml_state.py +@@ -1009,7 +1009,7 @@ class XMLState: + bootloader = self.get_build_type_bootloader_section() + if bootloader: + return bootloader.get_bls() +- return True ++ return False + + def get_build_type_bootloader_console(self) -> List[str]: + """ +diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py +index e9189a609..d81d76ec7 100644 +--- a/test/unit/bootloader/config/grub2_test.py ++++ b/test/unit/bootloader/config/grub2_test.py +@@ -600,7 +600,6 @@ class TestBootLoaderConfigGrub2: + 'GRUB_BACKGROUND': '/boot/grub2/themes/openSUSE/background.png', + 'GRUB_CMDLINE_LINUX_DEFAULT': '"some-cmdline"', + 'GRUB_DISTRIBUTOR': '"Bob"', +- 'GRUB_ENABLE_BLSCFG': 'true', + 'GRUB_ENABLE_CRYPTODISK': 'y', + 'GRUB_GFXMODE': '800x600', + 'GRUB_SERIAL_COMMAND': '"serial --speed=38400"', +@@ -643,7 +642,6 @@ class TestBootLoaderConfigGrub2: + call('GRUB_CMDLINE_LINUX', '"root=LABEL=some-label"'), + call('GRUB_DISABLE_LINUX_UUID', 'true'), + call('GRUB_DISTRIBUTOR', '"Bob"'), +- call('GRUB_ENABLE_BLSCFG', 'true'), + call('GRUB_ENABLE_CRYPTODISK', 'y'), + call('GRUB_ENABLE_LINUX_LABEL', 'true'), + call('GRUB_GFXMODE', '800x600'), +@@ -688,7 +686,6 @@ class TestBootLoaderConfigGrub2: + call('GRUB_DISABLE_LINUX_PARTUUID', 'false'), + call('GRUB_DISABLE_LINUX_UUID', 'true'), + call('GRUB_DISTRIBUTOR', '"Bob"'), +- call('GRUB_ENABLE_BLSCFG', 'true'), + call('GRUB_ENABLE_CRYPTODISK', 'y'), + call('GRUB_GFXMODE', '800x600'), + call( +@@ -732,7 +729,6 @@ class TestBootLoaderConfigGrub2: + call('GRUB_CMDLINE_LINUX_DEFAULT', '"abcd console=tty0"'), + call('GRUB_DISABLE_LINUX_UUID', 'true'), + call('GRUB_DISTRIBUTOR', '"Bob"'), +- call('GRUB_ENABLE_BLSCFG', 'true'), + call('GRUB_ENABLE_CRYPTODISK', 'y'), + call('GRUB_ENABLE_LINUX_LABEL', 'true'), + call('GRUB_GFXMODE', '800x600'), +-- +2.44.0 + diff --git a/python-kiwi.changes b/python-kiwi.changes index 4b2f43e..ad9163c 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,321 @@ +------------------------------------------------------------------- +Thu May 30 21:55:20 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.18 → 10.0.19 + +------------------------------------------------------------------- +Wed May 29 21:22:38 CEST 2024 - Neal Gompa + +- package: Always include patches and number all sources and patches + + This ensures that stuff is applied reliably and all sources and patches + are included as expected. + + Then the added kiwi-revert-bls-default-for-suse.patch is applied + conditionally for SUSE distributions. + +------------------------------------------------------------------- +Wed May 29 18:18:26 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.17 → 10.0.18 + +------------------------------------------------------------------- +Wed May 29 16:54:21 CEST 2024 - Alberto Planas + +- package: adjust openSUSE patch + +------------------------------------------------------------------- +Wed May 29 15:18:38 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.16 → 10.0.17 + +------------------------------------------------------------------- +Wed May 29 12:35:43 CEST 2024 - Marcus Schäfer + +- Fixed box plugin documentation + + The provided example was no longer correct according to + changes on the image description referenced in the example + +------------------------------------------------------------------- +Fri May 17 17:23:53 CEST 2024 - Marcus Schäfer + +- Add procps to Tumbleweed integration tests + +------------------------------------------------------------------- +Thu May 16 10:58:40 CEST 2024 - Marcus Schäfer + +- Add procps to Tumbleweed integration tests + +------------------------------------------------------------------- +Sun May 12 22:01:45 CEST 2024 - Marcus Schäfer + +- Fix sdist upstream tarball contents + + The .virtualenv.dev-requirements.txt file is referenced by tox.ini + but not put into the sdist tarball and therefore missing in the + pypi upstream data. + +------------------------------------------------------------------- +Fri May 10 12:10:23 CEST 2024 - Marcus Schäfer + +- Drop use of obsolete pkg_resources + + As documented in https://setuptools.pypa.io/en/latest/pkg_resources.html + the use of pkg_resources is obsolete and will cause issues. + So happened on Debian unstable. This Fixes #2548 + +------------------------------------------------------------------- +Thu May 09 18:35:42 CEST 2024 - Adam Williamson + +- RepositoryDnf5: correct defaults, set system_cachedir + + The "defaults" in `use_default_location` here are the dnf4 + defaults, not the dnf5 defaults, so let's update them. Also, for + dnf5, we need to set `system_cachedir` instead of `cachedir` - + see https://dnf5.readthedocs.io/en/latest/misc/caching.7.html , + `system_cachedir` is the cache location used when running as + root, `cachedir` is the cache location used when running as a + regular user. + + Signed-off-by: Adam Williamson + +------------------------------------------------------------------- +Wed May 08 15:46:17 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.15 → 10.0.16 + +------------------------------------------------------------------- +Wed May 08 15:44:10 CEST 2024 - Marcus Schäfer + +- poetry build doesn't like symlinks + + The sdist tarball produced by poetry build does not include + all files and skipped symlinks in test/data. This caused the + unit test run to fail if called from within that sources + +------------------------------------------------------------------- +Wed May 08 10:48:57 CEST 2024 - Marcus Schäfer + +- Fix spec file + + Require docopt-ng for Fedora 41+ + +------------------------------------------------------------------- +Tue May 07 16:18:28 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.14 → 10.0.15 + +------------------------------------------------------------------- +Thu May 02 16:27:14 CEST 2024 - Marcus Schäfer + +- Add support for stopsignal in containerconfig + + Allow to specify the stopsignal via the containerconfig + element as the following example shows + + + + SIGINT + + + + This Fixes #2543 + +------------------------------------------------------------------- +Thu May 02 16:08:35 CEST 2024 - Steffen Winterfeldt + +- Fix set_disk_password to be effective + + Since commit 8aa517eb7 it is necessary to call + _mount_device_and_volumes() prior making any modifications + to boot files. In addition handle potential errors + from the grub.cfg modification better. + +------------------------------------------------------------------- +Thu May 02 15:28:48 CEST 2024 - Marcus Schäfer + +- Update Makefile + + Make sure custom patches are part of the package sources + +------------------------------------------------------------------- +Thu May 02 15:24:20 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.13 → 10.0.14 + +------------------------------------------------------------------- +Thu May 02 12:42:27 CEST 2024 - Neal Gompa + +- doc: Document the bls option for the grub bootloader + +------------------------------------------------------------------- +Wed May 01 20:17:18 CEST 2024 - Neal Gompa + +- Temporarily revert grub-bls default to false for SUSE distributions + + For the time being, SUSE distributions cannot handle KIWI's default + to use BLS with GRUB2. Until they catch up, revert this for them only. + +------------------------------------------------------------------- +Wed May 01 20:06:02 CEST 2024 - Neal Gompa + +- kiwi/bootloader: restore backward compatibility for grub2 with bls + + The change to introduce the bls parameter broke backward compatibility + with all existing kiwi descriptions for distributions that default to BLS. + + This fixes that by allowing the unset state to be equivalent to enabling it. + + Fixes: 8a8190098cb30358459ba10a4db1ba6446eee8c2 + +------------------------------------------------------------------- +Tue Apr 30 14:25:56 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.12 → 10.0.13 + +------------------------------------------------------------------- +Mon Apr 29 17:33:43 CEST 2024 - Marcus Schäfer + +- Overwrite compression setting only if randomized + + When building an encrypted image, the bundler never compressed + the result. This overwrite from the runtime configuration and + the default compression setting actually only makes sense when + the image is randomized because only then a compression is + for sure useless. This Fixes #2540 + +------------------------------------------------------------------- +Mon Apr 29 16:08:47 CEST 2024 - Marcus Schäfer + +- Make sure lsblk output is sorted by dev name + + lsblk without the sorting option can provide the list + of devices in different order. This patch makes sure + lsblk sorts the output by the device name. + This Fixes bsc#1223374 + +------------------------------------------------------------------- +Fri Apr 26 17:11:45 CEST 2024 - Romain Geissler + +- Stop leaking plugins/{priorities,versionlock}.conf file with dnf4/5. + + This fixes the fedora issue + https://bugzilla.redhat.com/show_bug.cgi?id=2270364 + + Signed-off-by: Romain Geissler + +------------------------------------------------------------------- +Fri Apr 26 12:10:47 CEST 2024 - Marcus Schäfer + +- Fix luks_randomize setting + + Make sure the value passed for luks_randomize in the description + becomes effective. It was not possible to switch off luks_randomize + because any "not" value was turned into a true value. The actual + default should therefore only apply in case luks_randomize is + not specified at all which means only a None value will turn + into a true value for this setting. + +------------------------------------------------------------------- +Fri Apr 26 01:36:46 CEST 2024 - Adam Williamson + +- Fix package removal with dnf5 + + dnf5 does not implement `dnf autoremove ` as a synonym + for `--setopt=clean_requirements_on_remove=true remove ` + as dnf4 did. So, we should do it this way instead. + + Signed-off-by: Adam Williamson + +------------------------------------------------------------------- +Thu Apr 25 19:28:29 CEST 2024 - Alberto Planas + +- Add 'bls' parameter for the bootloader + +------------------------------------------------------------------- +Sat Apr 20 22:51:24 CEST 2024 - Iván Chavero + +- Fix efifatimagesize attribute type + + The efifatimagesize attribute type value is set to "oem" but the documentation says + that it is intended to be also used for creating ISO images. This causes a schema error + when this attribute is set on a profile with type "iso" and blocks changing the EFI + boot image size which is a problem if the image is bigger than 20M. This commit + allows to specify the attribute also for the "iso" type + +------------------------------------------------------------------- +Fri Apr 19 21:10:44 CEST 2024 - Marcus Schäfer + +- Add missing tool requires + + Latest changes on the bundler used sed and file + which were not required by the spec. This is + related to bsc#1221790 + +------------------------------------------------------------------- +Fri Apr 19 17:48:43 CEST 2024 - Marcus Schäfer + +- Add vmdk format to test-image-bundle-format + + Allow to check if the bundle format rename is applied + in the new bundle reference checker code + +------------------------------------------------------------------- +Fri Apr 19 16:12:31 CEST 2024 - Marcus Schäfer + +- Fix file references in kiwi bundler result files + + When using a custom bundle_format the kiwi result bundler renames + the output files to match the bundle_format. However, if there are + output files that references other output files, for example the + vmware binary (.vmdk) in the guest config file (.vmx) then this + renaming breaks those result files. This patch adds a reference + file check for all non binary output files if they contain a + reference to another output file and updates the data accordingly. + This Fixes bsc#1221790 + +------------------------------------------------------------------- +Fri Apr 19 15:38:02 CEST 2024 - Marcus Schäfer + +- Don't compress vmdk images + + Like with qcow2 it's not expected that the format type gets + compressed in the bundle + +------------------------------------------------------------------- +Fri Apr 19 14:48:22 CEST 2024 - Alberto Planas + +- kiwi.rnc: define bls parameter for bootloader + +------------------------------------------------------------------- +Fri Apr 19 12:54:07 CEST 2024 - Marcus Schäfer + +- Keep runtime_checker_metadata.yml as module file + + It was a bad idea to install a mandatory source file outside + the module path. This prevents running kiwi from source + +------------------------------------------------------------------- +Fri Apr 19 12:33:04 CEST 2024 - Marcus Schäfer + +- Fixed Arch build + + Forgot to add install of runtime_checker_metadata.yml + +------------------------------------------------------------------- +Thu Apr 18 17:12:27 CEST 2024 - Marcus Schäfer + +- Update tumbleweed/test-image-disk integration test + +------------------------------------------------------------------- +Thu Apr 18 12:46:20 CEST 2024 - Marcus Schäfer + +- Handle XSLT errors better + + Make sure etree.XSLTApplyError is a known error in the kiwi + scope and raise an appropriate exception + ------------------------------------------------------------------- Wed Apr 17 12:28:35 CEST 2024 - Marcus Schäfer @@ -47,6 +365,17 @@ Mon Apr 08 12:12:19 CEST 2024 - Marcus Schäfer Add /usr/lib/grub/*-efi-signed to search for shim signed EFI binaries too. This Fixes #2525 +------------------------------------------------------------------- +Mon Apr 08 09:56:12 CEST 2024 - Marcus Schäfer + +- Fixed runtime checks for dracut module packages + + Unfortunately the packaging of kiwi on Debian follows different + naming conventions for dracut module packages which causes + the runtime check to fail. This commit allows to check for + multiple package names and adds the variants used on Debian. + This Fixes #2524 + ------------------------------------------------------------------- Thu Apr 04 17:17:42 CEST 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 5567819..7019dd8 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -44,7 +44,7 @@ %endif Name: python-kiwi -Version: 10.0.12 +Version: 10.0.19 Provides: kiwi-schema = 8.1 Release: 0 Url: https://github.com/OSInside/kiwi @@ -55,8 +55,11 @@ License: GPL-3.0-or-later Packager: Marcus Schaefer %endif Group: %{pygroup} -Source: %{name}.tar.gz +Source0: %{name}.tar.gz Source1: %{name}-rpmlintrc +# SUSE-specific patches (1001+) +## PATCH-FIX-OPENSUSE kiwi-revert-bls-default-for-suse.patch -- temporary until opensuse has bls +Patch1001: kiwi-revert-bls-default-for-suse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora} || 0%{?suse_version} BuildRequires: fdupes @@ -76,7 +79,11 @@ BuildRequires: python%{python3_pkgversion}-installer BuildRequires: python%{python3_pkgversion}-poetry-core >= 1.2.0 BuildRequires: python%{python3_pkgversion}-wheel # doc build requirements +%if ! (0%{?fedora} >= 41 || 0%{?rhel} >= 10) BuildRequires: python%{python3_pkgversion}-docopt >= 0.6.2 +%else +BuildRequires: python%{python3_pkgversion}-docopt-ng +%endif BuildRequires: python%{python3_pkgversion}-lxml BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python%{python3_pkgversion}-setuptools @@ -387,6 +394,8 @@ Obsoletes: python2-kiwi Conflicts: python2-kiwi Conflicts: kiwi-man-pages < %{version} Requires: screen +Requires: file +Requires: sed Requires: python%{python3_pkgversion} >= 3.9 %if 0%{?ubuntu} || 0%{?debian} Requires: python%{python3_pkgversion}-yaml @@ -394,7 +403,11 @@ Requires: python%{python3_pkgversion}-yaml Requires: python%{python3_pkgversion}-PyYAML %endif Requires: python%{python3_pkgversion}-simplejson +%if ! (0%{?fedora} >= 41 || 0%{?rhel} >= 10) Requires: python%{python3_pkgversion}-docopt +%else +Requires: python%{python3_pkgversion}-docopt-ng +%endif Requires: python%{python3_pkgversion}-lxml Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-setuptools @@ -626,7 +639,12 @@ Group: %{sysgroup} Provides manual pages to describe the kiwi commands %prep -%autosetup -n kiwi-%{version} +%setup -q -n kiwi-%{version} + +%if 0%{?suse_version} +# Temporarily revert grub-bls default to false for SUSE distributions +%patch -P 1001 -p1 +%endif # Temporarily switch things back to docopt for everything but Fedora 41+ # FIXME: Drop this hack as soon as we can... diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 66d621d..0e0a0de 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:c1a57f2a29659788341f7bee51f73b79df0fcc950a458d701fc22e9d6f471825 -size 1014660 +oid sha256:7e82753e7ab32c9d10a2741b6f51fb44698e4a4d47eceb4cf8767444e14d8538 +size 1024756