Accepting request 1298900 from Virtualization:Appliances:Builder

- Bump version: 10.2.31 → 10.2.32

- fix: resize for raid device, ensure vars like kiwi_RaidDev are loaded before setting disk variable

- Do not clobber initialize method
  There was a method named initialize defined and implemented
  differently in the dracut modules kiwi-lib and kiwi-repart.
  kiwi-lib is expected to be shared code across all kiwi dracut
  modules. However if one module redefines a method of the
  same name which is used in another module and expected to
  work differently there, this is evil. This commit cleans
  up the name conflict and names the kiwi library init function
  as lib_initialize. All dracut code that is expected to make
  use of this method has been adopted too.

- Skip kiwi-repart module in install ISOs
  In case the kiwi-repart module is explicitly requested in a
  dracut.conf file and the image is also configured to build an
  install ISO image this leads the install ISO to contain the
  kiwi-repart module as well which is unwanted. This commit
  explicitly omits the kiwi-repart when creating the initrd
  for the install image

- Skip repart when booting install/live iso

- Update leap test-image-disk integration test
  Add test for alternative volume ID in install ISO

- Bump version: 10.2.30 → 10.2.31

OBS-URL: https://build.opensuse.org/request/show/1298900
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-kiwi?expand=0&rev=140

PKGBUILD

@@ -3,16 +3,16 @@
 
 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.1.6
+pkgver=10.2.32
 pkgrel=0
 pkgdesc="KIWI - Appliance Builder Next Generation"
 url="https://github.com/SUSE/kiwi/tarball/master"
 license=('GPL3')
-makedepends=(make gcc python-build python-docopt python-installer python-lxml python-poetry-core python-requests python-setuptools python-simplejson python-sphinx python-sphinx_rtd_theme python-wheel python-yaml shadow grep)
+makedepends=(make gcc python-build python-docopt python-installer python-lxml python-poetry-core python-requests python-simplejson python-sphinx python-sphinx_rtd_theme python-wheel python-yaml shadow grep)
 provides=(kiwi-ng kiwi)
 source=("${pkgname}.tar.gz")
 changelog="${pkgname}.changes"
-md5sums=('6fa45484073041b1f32130d0a640c624')
+md5sums=('eaac7b72033ac7ae81b5ffb5aa11799b')
 
 
 build() {
@@ -27,7 +27,7 @@ build() {
 }
 
 package_python-kiwi(){
-  depends=(python-docopt python-simplejson python-lxml python-requests python-setuptools python-yaml grub qemu squashfs-tools gptfdisk pacman e2fsprogs xfsprogs btrfs-progs libisoburn lvm2 mtools parted multipath-tools rsync tar shadow screen kiwi-man-pages)
+  depends=(python-docopt python-simplejson python-lxml python-requests python-yaml grub qemu squashfs-tools gptfdisk pacman e2fsprogs xfsprogs btrfs-progs libisoburn lvm2 mtools parted multipath-tools rsync tar shadow screen kiwi-man-pages)
   optdepends=('gnupg: keyring creation for APT package manager')
   cd kiwi-${pkgver}
   python3 -m installer --destdir "${pkgdir}/" dist/*.whl

kiwi-revert-bls-default-for-suse.patch

@@ -1,25 +1,15 @@
-From b0d850842b0c8d4c98f0486f66ffd7c6e8f1a685 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa@opensuse.org>
-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(-)
+restore backward compatibility for grub2 with bls.
+For the time being, SUSE distributions cannot handle KIWI's
+default (True) to use BLS with GRUB2. Until they catch up, the
+kiwi default is set to: False
 
 diff --git a/kiwi/xml_state.py b/kiwi/xml_state.py
-index eb39163cd..8c3fd45f3 100644
+index 7653be284..1e72cca22 100644
 --- a/kiwi/xml_state.py
 +++ b/kiwi/xml_state.py
-@@ -1009,7 +1009,7 @@ class XMLState:
+@@ -1176,7 +1176,7 @@ class XMLState:
          bootloader = self.get_build_type_bootloader_section()
-         if bootloader:
+         if bootloader and bootloader.get_bls() is not None:
              return bootloader.get_bls()
 -        return True
 +        return False
@@ -27,10 +17,10 @@ index eb39163cd..8c3fd45f3 100644
      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
+index b40362941..a2dd3106d 100644
 --- a/test/unit/bootloader/config/grub2_test.py
 +++ b/test/unit/bootloader/config/grub2_test.py
-@@ -600,7 +600,6 @@ class TestBootLoaderConfigGrub2:
+@@ -629,7 +629,6 @@ class TestBootLoaderConfigGrub2:
              'GRUB_BACKGROUND': '/boot/grub2/themes/openSUSE/background.png',
              'GRUB_CMDLINE_LINUX_DEFAULT': '"some-cmdline"',
              'GRUB_DISTRIBUTOR': '"Bob"',
@@ -38,7 +28,15 @@ index e9189a609..d81d76ec7 100644
              'GRUB_ENABLE_CRYPTODISK': 'y',
              'GRUB_GFXMODE': '800x600',
              'GRUB_SERIAL_COMMAND': '"serial --speed=38400"',
-@@ -643,7 +642,6 @@ class TestBootLoaderConfigGrub2:
+@@ -677,7 +676,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"',
+@@ -720,7 +718,6 @@ class TestBootLoaderConfigGrub2:
              call('GRUB_CMDLINE_LINUX', '"root=LABEL=some-label"'),
              call('GRUB_DISABLE_LINUX_UUID', 'true'),
              call('GRUB_DISTRIBUTOR', '"Bob"'),
@@ -46,7 +44,7 @@ index e9189a609..d81d76ec7 100644
              call('GRUB_ENABLE_CRYPTODISK', 'y'),
              call('GRUB_ENABLE_LINUX_LABEL', 'true'),
              call('GRUB_GFXMODE', '800x600'),
-@@ -688,7 +686,6 @@ class TestBootLoaderConfigGrub2:
+@@ -765,7 +762,6 @@ class TestBootLoaderConfigGrub2:
              call('GRUB_DISABLE_LINUX_PARTUUID', 'false'),
              call('GRUB_DISABLE_LINUX_UUID', 'true'),
              call('GRUB_DISTRIBUTOR', '"Bob"'),
@@ -54,7 +52,7 @@ index e9189a609..d81d76ec7 100644
              call('GRUB_ENABLE_CRYPTODISK', 'y'),
              call('GRUB_GFXMODE', '800x600'),
              call(
-@@ -732,7 +729,6 @@ class TestBootLoaderConfigGrub2:
+@@ -809,7 +805,6 @@ class TestBootLoaderConfigGrub2:
              call('GRUB_CMDLINE_LINUX_DEFAULT', '"abcd console=tty0"'),
              call('GRUB_DISABLE_LINUX_UUID', 'true'),
              call('GRUB_DISTRIBUTOR', '"Bob"'),
@@ -62,6 +60,3 @@ index e9189a609..d81d76ec7 100644
              call('GRUB_ENABLE_CRYPTODISK', 'y'),
              call('GRUB_ENABLE_LINUX_LABEL', 'true'),
              call('GRUB_GFXMODE', '800x600'),
--- 
-2.44.0
-

python-kiwi.spec

@@ -29,7 +29,11 @@
 %endif
 
 %if %{undefined python3_sitelib}
+%if "%{_vendor}" == "debbuild"
 %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+%else
+%global python3_sitelib %(%{__python3} -c "import sysconfig; print(sysconfig.get_path('platlib'))")
+%endif
 %endif
 
 %if %{undefined python3_version}
@@ -52,7 +56,7 @@
 %endif
 
 Name:           python-kiwi
-Version:        10.1.6
+Version:        10.2.32
 Provides:       kiwi-schema = 8.1
 Release:        0
 Url:            https://github.com/OSInside/kiwi
@@ -92,9 +96,12 @@ BuildRequires:  python%{python3_pkgversion}-docopt >= 0.6.2
 %else
 BuildRequires:  python%{python3_pkgversion}-docopt-ng
 %endif
+%if 0%{?debian} || 0%{?ubuntu}
+# only because of debbuild
+BuildRequires:  python%{python3_pkgversion}-setuptools
+%endif
 BuildRequires:  python%{python3_pkgversion}-lxml
 BuildRequires:  python%{python3_pkgversion}-requests
-BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-simplejson
 %if 0%{?suse_version}
 BuildRequires:  python%{python3_pkgversion}-Sphinx
@@ -122,6 +129,10 @@ Obsoletes:      kiwi-image-tbz-requires < %{version}-%{release}
 %if "%{_vendor}" != "debbuild"
 Provides:       kiwi-image:tbz
 %endif
+%if 0%{?fedora} >= 42
+Provides:       kiwi-image:enclave
+Requires:       eif_build
+%endif
 # tools conditionally used by kiwi
 %if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends:     gnupg2
@@ -179,6 +190,7 @@ Provides:       kiwi-image-docker-requires = %{version}-%{release}
 Obsoletes:      kiwi-image-docker-requires < %{version}-%{release}
 %if "%{_vendor}" != "debbuild"
 Provides:       kiwi-image:docker
+Provides:       kiwi-image:oci
 %endif
 %if 0%{?suse_version}
 Requires:       umoci
@@ -198,6 +210,7 @@ Provides:       kiwi-image-wsl-requires = %{version}-%{release}
 Obsoletes:      kiwi-image-wsl-requires < %{version}-%{release}
 %if "%{_vendor}" != "debbuild"
 Provides:       kiwi-image:appx
+Provides:       kiwi-image:wsl
 %endif
 %if 0%{?suse_version}
 Requires:       fb-util-for-appx
@@ -220,6 +233,8 @@ Provides:       kiwi-image:iso
 %endif
 %if 0%{?suse_version}
 Requires:       checkmedia
+%else
+Requires:       isomd5sum
 %endif
 Requires:       xorriso
 Requires:       kiwi-systemdeps-core = %{version}-%{release}
@@ -287,10 +302,17 @@ Provides:       kiwi-filesystem:ext3
 Provides:       kiwi-filesystem:ext4
 Provides:       kiwi-filesystem:squashfs
 Provides:       kiwi-filesystem:xfs
+%if ! (0%{?suse_version} && 0%{?suse_version} <= 1600)
+Provides:       kiwi-filesystem:erofs
+Provides:       kiwi-image:erofs
+%endif
 %endif
 Requires:       dosfstools
 Requires:       e2fsprogs
 Requires:       xfsprogs
+%if ! (0%{?suse_version} && 0%{?suse_version} <= 1600)
+Requires:       erofs-utils
+%endif
 %if 0%{?suse_version}
 Requires:       btrfsprogs
 %else
@@ -428,7 +450,6 @@ Requires:       python%{python3_pkgversion}-docopt-ng
 %endif
 Requires:       python%{python3_pkgversion}-lxml
 Requires:       python%{python3_pkgversion}-requests
-Requires:       python%{python3_pkgversion}-setuptools
 Requires:       python%{python3_pkgversion}-xmltodict
 %if ! (0%{?rhel} && 0%{?rhel} < 8)
 Recommends:     kiwi-man-pages

python-kiwi.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec894bb91174a5cd11ab84f36aff35129dca7bdab59621f7b0417fea0fa849a8
-size 1031837
+oid sha256:8554d07439c102551945784686a7485a6a50d68e68a561b597ba525e334a55ec
+size 1080299