Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-kiwi for openSUSE:Factory checked in at 2024-09-08 11:59:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kiwi (Old) and /work/SRC/openSUSE:Factory/.python-kiwi.new.10096 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwi" Sun Sep 8 11:59:23 2024 rev:121 rq:1199243 version:10.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes 2024-09-04 13:22:24.608208238 +0200 +++ /work/SRC/openSUSE:Factory/.python-kiwi.new.10096/python-kiwi.changes 2024-09-08 12:00:32.615865793 +0200 @@ -1,0 +2,52 @@ +Fri Sep 06 10:41:00 CEST 2024 - Marcus Schäfer <marcus.schae...@gmail.com> + +- Bump version: 10.1.5 â 10.1.6 + +------------------------------------------------------------------- +Thu Sep 05 15:50:42 CEST 2024 - Kostiantyn Astakhov <16296930+kastak...@users.noreply.github.com> + +- add allowExtraConfig and exportFlags to ovftool options + + Add allowExtraConfig and exportFlags to ovftool options + +------------------------------------------------------------------- +Thu Sep 05 14:42:30 CEST 2024 - Marcus Schäfer <marcus.schae...@gmail.com> + +- Bump version: 10.1.4 â 10.1.5 + +------------------------------------------------------------------- +Wed Sep 04 16:54:55 CEST 2024 - Steffen Winterfeldt <wfe...@opensuse.org> + +- create EFI/BOOT only if UEFI boot is intended + +------------------------------------------------------------------- +Wed Sep 04 16:52:21 CEST 2024 - Steffen Winterfeldt <wfe...@opensuse.org> + +- Fix boot support for ISO media on ppc64 + + add CHRP boot support for ppc64 and add xorriso option to avoid + file name reduction to MS-DOS compatible 8.3 format + +------------------------------------------------------------------- +Tue Sep 03 10:11:52 CEST 2024 - Marcus Schäfer <marcus.schae...@gmail.com> + +- Fix initrd permissions + + kiwi stored the initrd for ISO images as 600 which might + be too restrictive. This commit makes sure the initrd is + stored as 644 and Fixes bsc#1229257 + +------------------------------------------------------------------- +Tue Sep 03 09:08:45 CEST 2024 - Marcus Schäfer <marcus.schae...@gmail.com> + +- Fixed ramdisk size setup + + For setting up the brd rd_size option kiwi creates + 99-brd.conf used at load time of the kernel brd driver. + The location for the conf file is set to /etc/modprobe.d/ + However, in newer versions the location has changed to + /usr/lib/modprobe.d/ and /etc/modprobe.d is no longer + expected to exist. This commit makes sure /etc/modprobe.d + is created if not present. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kiwi.spec ++++++ --- /var/tmp/diff_new_pack.WNcNVm/_old 2024-09-08 12:00:33.211890467 +0200 +++ /var/tmp/diff_new_pack.WNcNVm/_new 2024-09-08 12:00:33.211890467 +0200 @@ -52,7 +52,7 @@ %endif Name: python-kiwi -Version: 10.1.4 +Version: 10.1.6 Provides: kiwi-schema = 8.1 Release: 0 Url: https://github.com/OSInside/kiwi ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.WNcNVm/_old 2024-09-08 12:00:33.247891958 +0200 +++ /var/tmp/diff_new_pack.WNcNVm/_new 2024-09-08 12:00:33.251892123 +0200 @@ -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.1.4 +pkgver=10.1.6 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master"; @@ -12,7 +12,7 @@ provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('7ba99016b1a56858eab221efa3650bcb') +md5sums=('6fa45484073041b1f32130d0a640c624') build() { ++++++ python-kiwi.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/.bumpversion.cfg new/kiwi-10.1.6/.bumpversion.cfg --- old/kiwi-10.1.4/.bumpversion.cfg 2024-09-03 08:31:43.853960500 +0200 +++ new/kiwi-10.1.6/.bumpversion.cfg 2024-09-06 10:41:00.521722600 +0200 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 10.1.4 +current_version = 10.1.6 commit = True tag = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/PKG-INFO new/kiwi-10.1.6/PKG-INFO --- old/kiwi-10.1.4/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi-10.1.6/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: kiwi -Version: 10.1.4 +Version: 10.1.6 Summary: KIWI - Appliance Builder Home-page: https://osinside.github.io/kiwi/ License: GPL-3.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/doc/source/conf.py new/kiwi-10.1.6/doc/source/conf.py --- old/kiwi-10.1.4/doc/source/conf.py 2024-09-03 08:31:43.853960500 +0200 +++ new/kiwi-10.1.6/doc/source/conf.py 2024-09-06 10:41:00.517722600 +0200 @@ -139,7 +139,7 @@ # built documents. # # The short X.Y version. -version = '10.1.4' +version = '10.1.6' # The full version, including alpha/beta/rc tags. release = version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh new/kiwi-10.1.6/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh --- old/kiwi-10.1.4/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh 2024-08-12 09:38:06.231310000 +0200 +++ new/kiwi-10.1.6/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh 2024-09-06 10:40:47.481740000 +0200 @@ -50,6 +50,7 @@ local rd_size local modfile=/etc/modprobe.d/99-brd.conf rd_size=$(getarg ramdisk_size=) + mkdir -p /etc/modprobe.d if [ -n "${rd_size}" ];then echo "options brd rd_size=${rd_size}" > ${modfile} fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/kiwi/boot/image/dracut.py new/kiwi-10.1.6/kiwi/boot/image/dracut.py --- old/kiwi-10.1.4/kiwi/boot/image/dracut.py 2024-05-02 09:12:27.052463800 +0200 +++ new/kiwi-10.1.6/kiwi/boot/image/dracut.py 2024-09-06 08:45:11.942936000 +0200 @@ -235,6 +235,9 @@ self.initrd_filename = os.sep.join( [self.target_dir, dracut_initrd_basename] ) + Command.run( + ['chmod', '644', self.initrd_filename] + ) def _get_modules(self) -> List[str]: cmd = Command.run( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/kiwi/bootloader/config/grub2.py new/kiwi-10.1.6/kiwi/bootloader/config/grub2.py --- old/kiwi-10.1.4/kiwi/bootloader/config/grub2.py 2024-07-23 10:47:16.782534800 +0200 +++ new/kiwi-10.1.6/kiwi/bootloader/config/grub2.py 2024-09-06 08:45:11.942936000 +0200 @@ -16,6 +16,7 @@ # along with kiwi. If not, see <http://www.gnu.org/licenses/> # from string import Template +from textwrap import dedent import re import os import logging @@ -479,7 +480,8 @@ :param string lookup_path: custom module lookup path """ log.info('Creating grub2 bootloader images') - self.efi_boot_path = self.create_efi_path(in_sub_dir='') + if self.firmware.efi_mode(): + self.efi_boot_path = self.create_efi_path(in_sub_dir='') log.info('--> Creating identifier file %s', mbrid.get_id()) grub_boot_path = self._get_grub2_boot_path() @@ -610,7 +612,7 @@ ) def _supports_bios_modules(self): - if self.arch == 'ix86' or self.arch == 'x86_64': + if self.arch == 'ix86' or self.arch == 'x86_64' or Defaults.is_ppc64_arch(self.arch): return True return False @@ -927,6 +929,30 @@ uuid, mbrid, lookup_path ) + def _setup_chrp_config(self, mbrid): + early_boot_script = os.path.normpath( + os.sep.join( + [self._get_grub2_boot_path(), 'powerpc-ieee1275', 'grub.cfg'] + ) + ) + self._create_early_boot_script_for_mbrid_search( + early_boot_script, mbrid + ) + chrp_dir = os.path.normpath(os.sep.join([self.boot_dir, 'ppc'])) + Path.create(chrp_dir) + chrp_bootinfo_file = os.sep.join([chrp_dir, 'bootinfo.txt']) + chrp_config = dedent(''' + <chrp-boot> + <description>{os_name}</description> + <os-name>{os_name}</os-name> + <boot-script>boot &device;:1,\boot\grub2\powerpc-ieee1275\grub.elf</boot-script> + </chrp-boot> + ''') + with open(chrp_bootinfo_file, 'w') as chrp_bootinfo: + chrp_bootinfo.write( + chrp_config.format(os_name=self.get_menu_entry_install_title()) + ) + def _setup_bios_image(self, mbrid, lookup_path=None): """ Provide bios grub image @@ -941,6 +967,9 @@ self._create_bios_image( mbrid, lookup_path ) + if Defaults.is_ppc64_arch(Defaults.get_platform_name()): + self._setup_chrp_config(mbrid) + return bash_command = ' '.join( [ 'cat', @@ -1212,7 +1241,7 @@ ) def _get_bios_modules_path(self, lookup_path=None): - return self._get_module_path('i386-pc', lookup_path) + return self._get_module_path(Defaults.get_bios_module_directory_name(), lookup_path) def _get_xen_modules_path(self, lookup_path=None): return self._get_module_path( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/kiwi/defaults.py new/kiwi-10.1.6/kiwi/defaults.py --- old/kiwi-10.1.4/kiwi/defaults.py 2024-08-26 17:19:47.852434000 +0200 +++ new/kiwi-10.1.6/kiwi/defaults.py 2024-09-06 08:45:11.942936000 +0200 @@ -208,6 +208,24 @@ return False @staticmethod + def is_ppc64_arch(arch): + """ + Checks if machine architecture is ppc64 based + + Any arch that matches little endian or big endian ppc64 architecture + causes the method to return True. Anything else will + cause the method to return False + + :rtype: bool + """ + ppc64_arch_names = [ + 'ppc64', 'ppc64le' + ] + if arch in ppc64_arch_names: + return True + return False + + @staticmethod def is_buildservice_worker(): """ Checks if build host is an open buildservice machine @@ -956,11 +974,11 @@ :rtype: str """ bios_grub_core_patterns = [ - '/usr/share/grub*/i386-pc/{0}'.format( - Defaults.get_bios_image_name() + '/usr/share/grub*/{0}/{1}'.format( + Defaults.get_bios_module_directory_name(), Defaults.get_bios_image_name() ), - '/usr/lib/grub*/i386-pc/{0}'.format( - Defaults.get_bios_image_name() + '/usr/lib/grub*/{0}/{1}'.format( + Defaults.get_bios_module_directory_name(), Defaults.get_bios_image_name() ) ] for bios_grub_core_pattern in bios_grub_core_patterns: @@ -1382,13 +1400,13 @@ @staticmethod def get_bios_module_directory_name(): """ - Provides x86 BIOS directory name which stores the pc binaries + Provides BIOS directory name which stores the pc binaries :return: directory name :rtype: str """ - return 'i386-pc' + return 'powerpc-ieee1275' if Defaults.is_ppc64_arch(Defaults.get_platform_name()) else 'i386-pc' @staticmethod def get_efi_image_name(arch): @@ -1424,7 +1442,7 @@ :rtype: str """ - return 'core.img' + return 'grub.elf' if Defaults.is_ppc64_arch(Defaults.get_platform_name()) else 'core.img' @staticmethod def get_default_boot_timeout_seconds(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/kiwi/iso_tools/xorriso.py new/kiwi-10.1.6/kiwi/iso_tools/xorriso.py --- old/kiwi-10.1.4/kiwi/iso_tools/xorriso.py 2024-08-12 09:38:06.239309800 +0200 +++ new/kiwi-10.1.6/kiwi/iso_tools/xorriso.py 2024-09-06 08:45:11.942936000 +0200 @@ -99,6 +99,10 @@ self.iso_parameters += [ '-joliet', 'on', '-padding', '0' ] + if Defaults.is_ppc64_arch(self.arch): + self.iso_parameters += [ + '-compliance', 'untranslated_names' + ] if Defaults.is_x86_arch(self.arch) and legacy_bios_mode: mbr_file = os.sep.join( @@ -126,15 +130,20 @@ '-boot_image', 'grub', 'grub2_boot_info=on' ] - self.iso_loaders += [ - '-boot_image', 'any', 'partition_offset=16', - '-boot_image', 'any', 'cat_path={0}'.format(catalog_file), - '-boot_image', 'any', 'cat_hidden=on', - '-boot_image', 'any', 'boot_info_table=on', - '-boot_image', 'any', 'platform_id=0x00', - '-boot_image', 'any', 'emul_type=no_emulation', - '-boot_image', 'any', 'load_size=2048' - ] + if Defaults.is_ppc64_arch(self.arch): + self.iso_loaders += [ + '-boot_image', 'any', 'chrp_boot_part=on' + ] + else: + self.iso_loaders += [ + '-boot_image', 'any', 'partition_offset=16', + '-boot_image', 'any', 'cat_path={0}'.format(catalog_file), + '-boot_image', 'any', 'cat_hidden=on', + '-boot_image', 'any', 'boot_info_table=on', + '-boot_image', 'any', 'platform_id=0x00', + '-boot_image', 'any', 'emul_type=no_emulation', + '-boot_image', 'any', 'load_size=2048' + ] def add_efi_loader_parameters(self, loader_file: str) -> None: """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/kiwi/storage/subformat/ova.py new/kiwi-10.1.6/kiwi/storage/subformat/ova.py --- old/kiwi-10.1.4/kiwi/storage/subformat/ova.py 2024-05-02 09:12:27.076463700 +0200 +++ new/kiwi-10.1.6/kiwi/storage/subformat/ova.py 2024-09-06 08:45:11.942936000 +0200 @@ -89,6 +89,15 @@ ovftool, '--shaAlgorithm', raise_on_error=False ): ovftool_options.append('--shaAlgorithm=SHA1') + if CommandCapabilities.has_option_in_help( + ovftool, '--allowExtraConfig', raise_on_error=False + ): + ovftool_options.append('--allowExtraConfig') + if CommandCapabilities.has_option_in_help( + ovftool, '--exportFlags', raise_on_error=False + ): + ovftool_options.append('--exportFlags=extraconfig') + Command.run( [ovftool] + ovftool_options + [vmx, ova] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/kiwi/version.py new/kiwi-10.1.6/kiwi/version.py --- old/kiwi-10.1.4/kiwi/version.py 2024-09-03 08:31:43.853960500 +0200 +++ new/kiwi-10.1.6/kiwi/version.py 2024-09-06 10:41:00.517722600 +0200 @@ -18,5 +18,5 @@ """ Global version information used in kiwi and the package """ -__version__ = '10.1.4' +__version__ = '10.1.6' __githash__ = '$Format:%H$' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/pyproject.toml new/kiwi-10.1.6/pyproject.toml --- old/kiwi-10.1.4/pyproject.toml 2024-09-03 08:31:43.853960500 +0200 +++ new/kiwi-10.1.6/pyproject.toml 2024-09-06 10:41:00.517722600 +0200 @@ -1,6 +1,6 @@ [tool.poetry] name = "kiwi" -version = "10.1.4" +version = "10.1.6" description = "KIWI - Appliance Builder" license = "GPL-3.0-or-later" readme = "README.rst" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/test/unit/boot/image/dracut_test.py new/kiwi-10.1.6/test/unit/boot/image/dracut_test.py --- old/kiwi-10.1.4/test/unit/boot/image/dracut_test.py 2024-05-02 09:12:27.104463600 +0200 +++ new/kiwi-10.1.6/test/unit/boot/image/dracut_test.py 2024-09-06 08:45:11.942936000 +0200 @@ -152,6 +152,9 @@ 'LimeJeOS.x86_64-1.13.2.initrd', 'some-target-dir' ] + ), + call( + ['chmod', '644', 'some-target-dir/LimeJeOS.x86_64-1.13.2.initrd'] ) ] mock_command.reset_mock() @@ -172,6 +175,9 @@ 'system-directory/foo', 'some-target-dir' ] + ), + call( + ['chmod', '644', 'some-target-dir/foo'] ) ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/test/unit/bootloader/config/grub2_test.py new/kiwi-10.1.6/test/unit/bootloader/config/grub2_test.py --- old/kiwi-10.1.4/test/unit/bootloader/config/grub2_test.py 2024-08-12 09:38:06.259309800 +0200 +++ new/kiwi-10.1.6/test/unit/bootloader/config/grub2_test.py 2024-09-06 08:45:11.942936000 +0200 @@ -62,7 +62,8 @@ 'root_dir/usr/lib64/efi/shim.efi': True, 'root_dir/usr/lib64/efi/grub.efi': True, 'root_dir/usr/lib64/efi/does-not-exist': False, - 'root_dir/boot/efi/': True + 'root_dir/boot/efi/': True, + 'root_dir/usr/share/grub2/powerpc-ieee1275': True } self.glob_iglob = [ ['root_dir/usr/lib64/efi/MokManager.efi'], @@ -1690,6 +1691,71 @@ @patch('kiwi.bootloader.config.base.BootLoaderConfigBase.get_boot_path') @patch('kiwi.bootloader.config.grub2.Defaults.get_unsigned_grub_loader') + @patch('kiwi.bootloader.config.grub2.Defaults.get_grub_bios_core_loader') + @patch('kiwi.bootloader.config.grub2.Command.run') + @patch('kiwi.bootloader.config.grub2.Path.which') + @patch('kiwi.bootloader.config.grub2.Path.create') + @patch('kiwi.bootloader.config.grub2.DataSync') + @patch('os.path.exists') + @patch('shutil.copy') + def test_setup_install_boot_images_ppc( + self, mock_shutil_copy, mock_exists, mock_sync, + mock_Path_create, mock_Path_which, mock_command, + mock_get_grub_bios_core_loader, mock_get_unsigned_grub_loader, + mock_get_boot_path + ): + Defaults.set_platform_name('ppc64le') + mock_Path_which.return_value = '/path/to/grub2-mkimage' + mock_get_boot_path.return_value = '/boot' + self.bootloader.arch = 'ppc64le' + data = Mock() + mock_sync.return_value = data + self.firmware.efi_mode = Mock( + return_value='' + ) + + # simulate alternative boot directory to reach all code paths + self.bootloader.boot_dir = 'boot_dir' + + self.os_exists['lookup_dir/usr/share/grub2/powerpc-ieee1275'] = True + self.os_exists['lookup_dir/usr/share/grub2/unicode.pf2'] = True + self.os_exists['boot_dir/boot/grub2/fonts/unicode.pf2'] = False + self.os_exists['boot_dir/usr/share/grub2/unicode.pf2'] = True + + def side_effect(arg): + return self.os_exists[arg] + + mock_exists.side_effect = side_effect + + with patch('builtins.open', create=True) as mock_open: + mock_open.return_value = MagicMock(spec=io.IOBase) + file_handle = mock_open.return_value.__enter__.return_value + self.bootloader.setup_install_boot_images( + mbrid=self.mbrid, lookup_path="lookup_dir" + ) + + assert mock_open.call_args_list == [ + call('boot_dir/boot/grub2/powerpc-ieee1275/grub.cfg', 'w'), + call('boot_dir/ppc/bootinfo.txt', 'w'), + call('boot_dir/boot/grub2/loopback.cfg', 'w') + ] + + assert file_handle.write.call_args_list == [ + call('set btrfs_relative_path="yes"\n'), + call('search --file --set=root /boot/0xffffffff\n'), + call('set prefix=($root)/boot/grub2\n'), + call('source ($root)/boot/grub2/grub.cfg\n'), + call( + '\n<chrp-boot>\n<description>Bob</description>\n' + '<os-name>Bob</os-name>\n<boot-script>' + 'boot &device;:1,\boot\grub2\powerpc-ieee1275\grub.elf' + '</boot-script>\n</chrp-boot>\n' + ), + call('source /boot/grub2/grub.cfg\n') + ] + + @patch('kiwi.bootloader.config.base.BootLoaderConfigBase.get_boot_path') + @patch('kiwi.bootloader.config.grub2.Defaults.get_unsigned_grub_loader') @patch('kiwi.bootloader.config.grub2.Defaults.get_grub_bios_core_loader') @patch('kiwi.bootloader.config.grub2.Command.run') @patch('kiwi.bootloader.config.grub2.Path.which') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/test/unit/iso_tools/xorriso_test.py new/kiwi-10.1.6/test/unit/iso_tools/xorriso_test.py --- old/kiwi-10.1.4/test/unit/iso_tools/xorriso_test.py 2024-08-12 09:38:06.263309700 +0200 +++ new/kiwi-10.1.6/test/unit/iso_tools/xorriso_test.py 2024-09-06 08:45:11.942936000 +0200 @@ -52,6 +52,30 @@ assert 'No hybrid MBR file found' in self._caplog.text @patch('os.path.exists') + def test_init_iso_creation_parameters_ppc(self, mock_os_path_exists): + mock_os_path_exists.return_value = True + self.iso_tool.arch = 'ppc64le' + self.iso_tool.init_iso_creation_parameters( + { + 'mbr_id': 'app_id', + 'publisher': 'org', + 'preparer': 'preparer', + 'volume_id': 'vol_id', + 'efi_mode': 'ofw', + 'legacy_bios_mode': False + } + ) + assert self.iso_tool.iso_parameters == [ + '-application_id', 'app_id', + '-publisher', 'org', + '-preparer_id', 'preparer', + '-volid', 'vol_id', + '-joliet', 'on', + '-padding', '0', + '-compliance', 'untranslated_names' + ] + + @patch('os.path.exists') def test_init_iso_creation_parameters_efi(self, mock_os_path_exists): mock_os_path_exists.return_value = True self.iso_tool.init_iso_creation_parameters( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-10.1.4/test/unit/storage/subformat/ova_test.py new/kiwi-10.1.6/test/unit/storage/subformat/ova_test.py --- old/kiwi-10.1.4/test/unit/storage/subformat/ova_test.py 2024-05-02 09:12:27.120463600 +0200 +++ new/kiwi-10.1.6/test/unit/storage/subformat/ova_test.py 2024-09-06 08:45:11.946936100 +0200 @@ -109,6 +109,7 @@ mock_command.assert_called_once_with( [ 'ovftool', '--shaAlgorithm=SHA1', + '--allowExtraConfig', '--exportFlags=extraconfig', 'target_dir/some-disk-image.x86_64-1.2.3.vmx', 'target_dir/some-disk-image.x86_64-1.2.3.ova' ]
