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 2022-08-19 17:53:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kiwi (Old) and /work/SRC/openSUSE:Factory/.python-kiwi.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwi" Fri Aug 19 17:53:02 2022 rev:100 rq:997596 version:9.24.47 Changes: -------- --- /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes 2022-08-04 13:23:24.304488721 +0200 +++ /work/SRC/openSUSE:Factory/.python-kiwi.new.2083/python-kiwi.changes 2022-08-19 17:53:58.735786043 +0200 @@ -1,0 +2,104 @@ +Wed Aug 10 20:40:42 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Bump version: 9.24.46 ??? 9.24.47 + +------------------------------------------------------------------- +Wed Aug 10 20:39:17 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Revert "EFI Filesystem must be Fat32 formatted" + + Using fat32 causes failed boots on e.g AWS EC2 arm. + This must be solved differently with an attribute + to configure it. + + This reverts commit b8641bdc6825423f8c65b55c8d0870b38874a566. + +------------------------------------------------------------------- +Tue Aug 09 18:24:11 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Bump version: 9.24.45 ??? 9.24.46 + +------------------------------------------------------------------- +Tue Aug 09 15:43:44 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Support URIs with credentials in solver plugin + + check if the URI string contains credentials and + extract/trim them from the uri object. The urlparse + class does not recognize this information as a valid + URI and throws an exception + +------------------------------------------------------------------- +Sun Aug 07 19:14:01 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Fixed test-image-disk-legacy + + Increase size of embedded EFI fat image needed for EFI + bootable install ISO. Due to the increased size of the + custom kiwi initrd the default size for the FAT image + is too small + +------------------------------------------------------------------- +Sat Aug 06 20:28:30 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Support custom size for embedded EFI FAT image + + For ISO images (live and install) the EFI boot requires an embedded + FAT image. As of now a fixed size of 20M was used which leads to a + problem if the EFI image or the initrd or the kernel is bigger than + 20M. With the new attribute: + + efifatimagesize="nonNegativeInteger" + + we can now set a different value for the FAT image. Please note the + value must be aligned to the also customizable efipartsize value + which allows to configure the size of the EFI partition + +------------------------------------------------------------------- +Fri Aug 05 11:28:54 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Fixed linter complaints after flake update + + flake now complains about E275 missing whitespace + after keyword for the way 'del' is used. This commit + fixes it + +------------------------------------------------------------------- +Thu Aug 04 01:27:07 CEST 2022 - J Mixer <j.mixer...@gmail.com> + +- Added a NOTE: section to explain the finer points of adding tools to a + dracut hook. + +------------------------------------------------------------------- +Sat Jul 30 17:54:20 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Fixup btrfs based legacy kiwi initrd test + +------------------------------------------------------------------- +Thu Jul 21 13:46:52 CEST 2022 - David Cassany <dcass...@suse.com> + +- Fix race condition in runtime_config_test + + This commit instead of setting the global variable of the runtime config + file patches it. This is relevant if running unit tests in parallel, + where global variables are shared if not patched. + + Signed-off-by: David Cassany <dcass...@suse.com> + +------------------------------------------------------------------- +Tue Jul 12 16:39:08 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- EFI Filesystem must be Fat32 formatted + + Given the documentation from Microsoft the EFI partition + must be a fat32 format. fat16 is still supported but + unexpected. This Fixes #2141 + +------------------------------------------------------------------- +Tue Jul 12 15:51:55 CEST 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Fixed typo in overview page + + prevent word duplication. This Fixes #2016 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kiwi.spec ++++++ --- /var/tmp/diff_new_pack.mVuf4N/_old 2022-08-19 17:53:59.715788098 +0200 +++ /var/tmp/diff_new_pack.mVuf4N/_new 2022-08-19 17:53:59.719788105 +0200 @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.24.45 +Version: 9.24.47 Provides: kiwi-schema = 7.5 Release: 0 Url: https://github.com/OSInside/kiwi ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.mVuf4N/_old 2022-08-19 17:53:59.791788257 +0200 +++ /var/tmp/diff_new_pack.mVuf4N/_new 2022-08-19 17:53:59.791788257 +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=9.24.45 +pkgver=9.24.47 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=('27a49196b4f0b177fd99c69b1682c183') +md5sums=('650368cc4e288f186d0b1dcc05001c92') build() { ++++++ python-kiwi.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/.bumpversion.cfg new/kiwi-9.24.47/.bumpversion.cfg --- old/kiwi-9.24.45/.bumpversion.cfg 2022-07-12 09:46:16.000000000 +0200 +++ new/kiwi-9.24.47/.bumpversion.cfg 2022-08-10 20:40:42.000000000 +0200 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 9.24.45 +current_version = 9.24.47 commit = True tag = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/PKG-INFO new/kiwi-9.24.47/PKG-INFO --- old/kiwi-9.24.45/PKG-INFO 2022-07-12 09:49:24.000000000 +0200 +++ new/kiwi-9.24.47/PKG-INFO 2022-08-10 20:43:36.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: kiwi -Version: 9.24.45 +Version: 9.24.47 Summary: KIWI - Appliance Builder (next generation) Home-page: https://osinside.github.io/kiwi Author: Marcus Schaefer Binary files old/kiwi-9.24.45/doc/build/latex/kiwi.pdf and new/kiwi-9.24.47/doc/build/latex/kiwi.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi.8 new/kiwi-9.24.47/doc/build/man/kiwi.8 --- old/kiwi-9.24.45/doc/build/man/kiwi.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi \- Creating Operating System Images .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi::image::info.8 new/kiwi-9.24.47/doc/build/man/kiwi::image::info.8 --- old/kiwi-9.24.45/doc/build/man/kiwi::image::info.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi::image::info.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::IMAGE::INFO" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI::IMAGE::INFO" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi::image::info \- Provide detailed information about an image description .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi::image::resize.8 new/kiwi-9.24.47/doc/build/man/kiwi::image::resize.8 --- old/kiwi-9.24.45/doc/build/man/kiwi::image::resize.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi::image::resize.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::IMAGE::RESIZE" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI::IMAGE::RESIZE" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi::image::resize \- Resize disk images to new geometry .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi::result::bundle.8 new/kiwi-9.24.47/doc/build/man/kiwi::result::bundle.8 --- old/kiwi-9.24.45/doc/build/man/kiwi::result::bundle.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi::result::bundle.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::RESULT::BUNDLE" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI::RESULT::BUNDLE" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi::result::bundle \- Bundle build results .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi::result::list.8 new/kiwi-9.24.47/doc/build/man/kiwi::result::list.8 --- old/kiwi-9.24.45/doc/build/man/kiwi::result::list.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi::result::list.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::RESULT::LIST" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI::RESULT::LIST" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi::result::list \- List build results .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi::system::build.8 new/kiwi-9.24.47/doc/build/man/kiwi::system::build.8 --- old/kiwi-9.24.45/doc/build/man/kiwi::system::build.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi::system::build.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::SYSTEM::BUILD" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI::SYSTEM::BUILD" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi::system::build \- Build image in combined prepare and create step .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi::system::create.8 new/kiwi-9.24.47/doc/build/man/kiwi::system::create.8 --- old/kiwi-9.24.45/doc/build/man/kiwi::system::create.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi::system::create.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::SYSTEM::CREATE" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI::SYSTEM::CREATE" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi::system::create \- Create image from prepared root system .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi::system::prepare.8 new/kiwi-9.24.47/doc/build/man/kiwi::system::prepare.8 --- old/kiwi-9.24.45/doc/build/man/kiwi::system::prepare.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi::system::prepare.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::SYSTEM::PREPARE" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI::SYSTEM::PREPARE" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi::system::prepare \- Prepare image root system .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/build/man/kiwi::system::update.8 new/kiwi-9.24.47/doc/build/man/kiwi::system::update.8 --- old/kiwi-9.24.45/doc/build/man/kiwi::system::update.8 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/doc/build/man/kiwi::system::update.8 2022-08-10 20:43:35.000000000 +0200 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::SYSTEM::UPDATE" "8" "Jul 12, 2022" "9.24.45" "KIWI NG" +.TH "KIWI::SYSTEM::UPDATE" "8" "Aug 10, 2022" "9.24.47" "KIWI NG" .SH NAME kiwi::system::update \- Update/Upgrade image root system .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/source/concept_and_workflow/customize_the_boot_process.rst new/kiwi-9.24.47/doc/source/concept_and_workflow/customize_the_boot_process.rst --- old/kiwi-9.24.45/doc/source/concept_and_workflow/customize_the_boot_process.rst 2022-05-11 13:21:54.000000000 +0200 +++ new/kiwi-9.24.47/doc/source/concept_and_workflow/customize_the_boot_process.rst 2022-08-05 13:41:27.000000000 +0200 @@ -144,6 +144,27 @@ inst_hook pre-mount 30 "${moddir}/my-script.sh" } +.. note:: Declaring Extra Tools for Hook Scripts + + The install() function called by dracut can define extra tools needed by + a defined hook script. The "inst_multiple" command and its parameters + inform dracut to include these extra tools/items in the initrd. + + The tools/items defined here can be any file, but are usually executables + and libraries needed by the hook script. + + * Each file MUST be included in the Kiwi description either in a + package, archive, or in the "root" tree in the image description + directory. + + * The parameters of the inst_multiple command are space separated. + + * Each parameter can be a single executable name if it exists in /bin, + /sbin, /usr/bin, or /usr/sbin directories. + + * Otherwise, a full pathname to the file is required. This is usually + true for libraries and other special files. + That's it! At the time {kiwi} calls dracut the :file:`90my-module` will be taken into account and is installed into the generated initrd. At boot time systemd calls the scripts as part of the :file:`dracut-pre-mount.service`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/source/conf.py new/kiwi-9.24.47/doc/source/conf.py --- old/kiwi-9.24.45/doc/source/conf.py 2022-07-12 09:46:16.000000000 +0200 +++ new/kiwi-9.24.47/doc/source/conf.py 2022-08-10 20:40:42.000000000 +0200 @@ -139,7 +139,7 @@ # built documents. # # The short X.Y version. -version = '9.24.45' +version = '9.24.47' # The full version, including alpha/beta/rc tags. release = version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/source/image_description/elements.rst new/kiwi-9.24.47/doc/source/image_description/elements.rst --- old/kiwi-9.24.45/doc/source/image_description/elements.rst 2022-06-13 14:56:46.000000000 +0200 +++ new/kiwi-9.24.47/doc/source/image_description/elements.rst 2022-08-10 17:17:56.000000000 +0200 @@ -389,6 +389,11 @@ specifies the size in MB. If not set the EFI partition size is set to 20 MB +efifatimagesize="nonNegativeInteger": + For ISO images (live and install) the EFI boot requires + an embedded FAT image. This attribute specifies the size + in MB. If not set the FAT image size is set to 20 MB + efiparttable="msdos|gpt": For images with an EFI firmware specifies the partition table type to use. If not set defaults to the GPT partition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/doc/source/overview.rst new/kiwi-9.24.47/doc/source/overview.rst --- old/kiwi-9.24.45/doc/source/overview.rst 2021-07-14 18:09:36.000000000 +0200 +++ new/kiwi-9.24.47/doc/source/overview.rst 2022-07-30 17:43:50.000000000 +0200 @@ -64,7 +64,7 @@ :file:`root`. Additional overlay directories for selected profiles are supported too and are taken into account if the directory name matches the name of the profile. The content of each of the - directory structures is copied on top of the the existing file + directory structures is copied on top of the existing file system (overlayed) of the appliance root. This also includes permissions and attributes as a supplement. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/kiwi/bootloader/config/grub2.py new/kiwi-9.24.47/kiwi/bootloader/config/grub2.py --- old/kiwi-9.24.45/kiwi/bootloader/config/grub2.py 2022-05-11 09:17:52.000000000 +0200 +++ new/kiwi-9.24.47/kiwi/bootloader/config/grub2.py 2022-08-10 17:17:56.000000000 +0200 @@ -852,8 +852,11 @@ Creates a EFI system partition image at the given path. Must be called after setup_install_boot_images and write. """ + fat_image_mbsize = int( + self.xml_state.build_type.get_efifatimagesize() or 20 + ) Command.run( - ['qemu-img', 'create', path, '20M'] + ['qemu-img', 'create', path, f'{fat_image_mbsize}M'] ) Command.run( ['mkdosfs', '-n', 'BOOT', path] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/kiwi/schema/kiwi.rnc new/kiwi-9.24.47/kiwi/schema/kiwi.rnc --- old/kiwi-9.24.45/kiwi/schema/kiwi.rnc 2022-06-13 14:56:46.000000000 +0200 +++ new/kiwi-9.24.47/kiwi/schema/kiwi.rnc 2022-08-10 17:17:56.000000000 +0200 @@ -1501,6 +1501,15 @@ sch:param [ name = "attr" value = "efipartsize" ] sch:param [ name = "types" value = "oem" ] ] + k.type.efifatimagesize.attribute = + ## For ISO images (live and install) the EFI boot requires + ## an embedded FAT image. This attribute specifies the size + ## in MB. If not set the min efifatimage size is set to 20 MB + attribute efifatimagesize { xsd:nonNegativeInteger } + >> sch:pattern [ id = "efifatimagesize" is-a = "image_type" + sch:param [ name = "attr" value = "efifatimagesize" ] + sch:param [ name = "types" value = "oem" ] + ] k.type.dosparttable_extended_layout.attribute = ## Specify to make use of logical partitions inside of an ## extended one. If set to true and if the msdos table type @@ -2102,6 +2111,7 @@ k.type.bootpartition.attribute? & k.type.bootpartsize.attribute? & k.type.efipartsize.attribute? & + k.type.efifatimagesize.attribute? & k.type.efiparttable.attribute? & k.type.dosparttable_extended_layout.attribute? & k.type.bootprofile.attribute? & diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/kiwi/schema/kiwi.rng new/kiwi-9.24.47/kiwi/schema/kiwi.rng --- old/kiwi-9.24.45/kiwi/schema/kiwi.rng 2022-06-13 14:56:46.000000000 +0200 +++ new/kiwi-9.24.47/kiwi/schema/kiwi.rng 2022-08-10 17:17:56.000000000 +0200 @@ -2173,6 +2173,18 @@ <sch:param name="types" value="oem"/> </sch:pattern> </define> + <define name="k.type.efifatimagesize.attribute"> + <attribute name="efifatimagesize"> + <a:documentation>For ISO images (live and install) the EFI boot requires +an embedded FAT image. This attribute specifies the size +in MB. If not set the min efifatimage size is set to 20 MB</a:documentation> + <data type="nonNegativeInteger"/> + </attribute> + <sch:pattern id="efifatimagesize" is-a="image_type"> + <sch:param name="attr" value="efifatimagesize"/> + <sch:param name="types" value="oem"/> + </sch:pattern> + </define> <define name="k.type.dosparttable_extended_layout.attribute"> <attribute name="dosparttable_extended_layout"> <a:documentation>Specify to make use of logical partitions inside of an @@ -3005,6 +3017,9 @@ <ref name="k.type.efipartsize.attribute"/> </optional> <optional> + <ref name="k.type.efifatimagesize.attribute"/> + </optional> + <optional> <ref name="k.type.efiparttable.attribute"/> </optional> <optional> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/kiwi/solver/repository/base.py new/kiwi-9.24.47/kiwi/solver/repository/base.py --- old/kiwi-9.24.45/kiwi/solver/repository/base.py 2021-11-22 14:49:53.000000000 +0100 +++ new/kiwi-9.24.47/kiwi/solver/repository/base.py 2022-08-10 17:17:56.000000000 +0200 @@ -23,6 +23,7 @@ import random import glob import os +import re # project import kiwi.defaults as defaults @@ -43,8 +44,19 @@ """ def __init__(self, uri, user=None, secret=None): self.uri = uri - self.user = user - self.secret = secret + # check if the URI string contains credentials and + # extract/trim them from the uri object. The urlparse + # class does not recognize this information as a valid + # URI and throws an exception + secret_format = re.match(r'^(.*)://(.*):(.*)@(.*)', uri.uri) + if secret_format: + self.user = secret_format.group(2) + self.secret = secret_format.group(3) + self.uri.uri = \ + f'{secret_format.group(1)}://{secret_format.group(4)}' + else: + self.user = user + self.secret = secret self.repository_metadata_dirs = [] self.repository_solvable_dir = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/kiwi/tasks/result_bundle.py new/kiwi-9.24.47/kiwi/tasks/result_bundle.py --- old/kiwi-9.24.45/kiwi/tasks/result_bundle.py 2021-10-25 14:25:37.000000000 +0200 +++ new/kiwi-9.24.47/kiwi/tasks/result_bundle.py 2022-08-07 19:12:56.000000000 +0200 @@ -159,7 +159,7 @@ bundle_file_format_name = bundle_file_format_name.replace( '%I', self.command_args['--id'] ) - del(ordered_results['bundle_format']) + del ordered_results['bundle_format'] for result_file in list(ordered_results.values()): if result_file.use_for_bundle: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/kiwi/version.py new/kiwi-9.24.47/kiwi/version.py --- old/kiwi-9.24.45/kiwi/version.py 2022-07-12 09:46:16.000000000 +0200 +++ new/kiwi-9.24.47/kiwi/version.py 2022-08-10 20:40:42.000000000 +0200 @@ -18,5 +18,5 @@ """ Global version information used in kiwi and the package """ -__version__ = '9.24.45' -__githash__ = '3b60aa03345300a5c47bc105baee9cc100ced39b' +__version__ = '9.24.47' +__githash__ = '432f633e510b0c2978656b5e3c3514a0b7961f30' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/kiwi/xml_parse.py new/kiwi-9.24.47/kiwi/xml_parse.py --- old/kiwi-9.24.45/kiwi/xml_parse.py 2022-06-13 14:56:46.000000000 +0200 +++ new/kiwi-9.24.47/kiwi/xml_parse.py 2022-08-10 17:17:56.000000000 +0200 @@ -2798,7 +2798,7 @@ """The Image Type of the Logical Extend""" subclass = None superclass = None - def __init__(self, boot=None, bootfilesystem=None, firmware=None, bootkernel=None, bootpartition=None, bootpartsize=None, efipartsize=None, efiparttable=None, dosparttable_extended_layout=None, bootprofile=None, btrfs_quota_groups=None, btrfs_root_is_snapshot=None, btrfs_root_is_readonly_snapshot=None, compressed=None, devicepersistency=None, editbootconfig=None, editbootinstall=None, filesystem=None, flags=None, format=None, formatoptions=None, fsmountoptions=None, fscreateoptions=None, squashfscompression=None, gcelicense=None, hybridpersistent=None, hybridpersistent_filesystem=None, gpt_hybrid_mbr=None, force_mbr=None, initrd_system=None, image=None, metadata_path=None, installboot=None, install_continue_on_timeout=None, installprovidefailsafe=None, installiso=None, installstick=None, installpxe=None, mediacheck=None, kernelcmdline=None, luks=None, luks_version=None, luksOS=None, mdraid=None, overlayroot=None, overlayroot_write_partition=None, overlayroot_readonly_partsize=No ne, verity_blocks=None, embed_verity_metadata=None, standalone_integrity=None, embed_integrity_metadata=None, integrity_metadata_key_description=None, integrity_keyfile=None, primary=None, ramonly=None, rootfs_label=None, spare_part=None, spare_part_mountpoint=None, spare_part_fs=None, spare_part_fs_attributes=None, spare_part_is_last=None, target_blocksize=None, target_removable=None, selinux_policy=None, vga=None, vhdfixedtag=None, volid=None, wwid_wait_timeout=None, derived_from=None, ensure_empty_tmpdirs=None, xen_server=None, publisher=None, disk_start_sector=None, root_clone=None, boot_clone=None, bundle_format=None, bootloader=None, containerconfig=None, machine=None, oemconfig=None, size=None, systemdisk=None, partitions=None, vagrantconfig=None, installmedia=None, luksformat=None): + def __init__(self, boot=None, bootfilesystem=None, firmware=None, bootkernel=None, bootpartition=None, bootpartsize=None, efipartsize=None, efifatimagesize=None, efiparttable=None, dosparttable_extended_layout=None, bootprofile=None, btrfs_quota_groups=None, btrfs_root_is_snapshot=None, btrfs_root_is_readonly_snapshot=None, compressed=None, devicepersistency=None, editbootconfig=None, editbootinstall=None, filesystem=None, flags=None, format=None, formatoptions=None, fsmountoptions=None, fscreateoptions=None, squashfscompression=None, gcelicense=None, hybridpersistent=None, hybridpersistent_filesystem=None, gpt_hybrid_mbr=None, force_mbr=None, initrd_system=None, image=None, metadata_path=None, installboot=None, install_continue_on_timeout=None, installprovidefailsafe=None, installiso=None, installstick=None, installpxe=None, mediacheck=None, kernelcmdline=None, luks=None, luks_version=None, luksOS=None, mdraid=None, overlayroot=None, overlayroot_write_partition=None, overlayroo t_readonly_partsize=None, verity_blocks=None, embed_verity_metadata=None, standalone_integrity=None, embed_integrity_metadata=None, integrity_metadata_key_description=None, integrity_keyfile=None, primary=None, ramonly=None, rootfs_label=None, spare_part=None, spare_part_mountpoint=None, spare_part_fs=None, spare_part_fs_attributes=None, spare_part_is_last=None, target_blocksize=None, target_removable=None, selinux_policy=None, vga=None, vhdfixedtag=None, volid=None, wwid_wait_timeout=None, derived_from=None, ensure_empty_tmpdirs=None, xen_server=None, publisher=None, disk_start_sector=None, root_clone=None, boot_clone=None, bundle_format=None, bootloader=None, containerconfig=None, machine=None, oemconfig=None, size=None, systemdisk=None, partitions=None, vagrantconfig=None, installmedia=None, luksformat=None): self.original_tagname_ = None self.boot = _cast(None, boot) self.bootfilesystem = _cast(None, bootfilesystem) @@ -2807,6 +2807,7 @@ self.bootpartition = _cast(bool, bootpartition) self.bootpartsize = _cast(int, bootpartsize) self.efipartsize = _cast(int, efipartsize) + self.efifatimagesize = _cast(int, efifatimagesize) self.efiparttable = _cast(None, efiparttable) self.dosparttable_extended_layout = _cast(bool, dosparttable_extended_layout) self.bootprofile = _cast(None, bootprofile) @@ -2991,6 +2992,8 @@ def set_bootpartsize(self, bootpartsize): self.bootpartsize = bootpartsize def get_efipartsize(self): return self.efipartsize def set_efipartsize(self, efipartsize): self.efipartsize = efipartsize + def get_efifatimagesize(self): return self.efifatimagesize + def set_efifatimagesize(self, efifatimagesize): self.efifatimagesize = efifatimagesize def get_efiparttable(self): return self.efiparttable def set_efiparttable(self, efiparttable): self.efiparttable = efiparttable def get_dosparttable_extended_layout(self): return self.dosparttable_extended_layout @@ -3230,6 +3233,9 @@ if self.efipartsize is not None and 'efipartsize' not in already_processed: already_processed.add('efipartsize') outfile.write(' efipartsize="%s"' % self.gds_format_integer(self.efipartsize, input_name='efipartsize')) + if self.efifatimagesize is not None and 'efifatimagesize' not in already_processed: + already_processed.add('efifatimagesize') + outfile.write(' efifatimagesize="%s"' % self.gds_format_integer(self.efifatimagesize, input_name='efifatimagesize')) if self.efiparttable is not None and 'efiparttable' not in already_processed: already_processed.add('efiparttable') outfile.write(' efiparttable=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.efiparttable), input_name='efiparttable')), )) @@ -3515,6 +3521,15 @@ raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.efipartsize < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') + value = find_attr_value_('efifatimagesize', node) + if value is not None and 'efifatimagesize' not in already_processed: + already_processed.add('efifatimagesize') + try: + self.efifatimagesize = int(value) + except ValueError as exp: + raise_parse_error(node, 'Bad integer attribute: %s' % exp) + if self.efifatimagesize < 0: + raise_parse_error(node, 'Invalid NonNegativeInteger') value = find_attr_value_('efiparttable', node) if value is not None and 'efiparttable' not in already_processed: already_processed.add('efiparttable') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/kiwi.egg-info/PKG-INFO new/kiwi-9.24.47/kiwi.egg-info/PKG-INFO --- old/kiwi-9.24.45/kiwi.egg-info/PKG-INFO 2022-07-12 09:49:23.000000000 +0200 +++ new/kiwi-9.24.47/kiwi.egg-info/PKG-INFO 2022-08-10 20:43:36.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: kiwi -Version: 9.24.45 +Version: 9.24.47 Summary: KIWI - Appliance Builder (next generation) Home-page: https://osinside.github.io/kiwi Author: Marcus Schaefer Binary files old/kiwi-9.24.45/test/unit/.coverage and new/kiwi-9.24.47/test/unit/.coverage differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/test/unit/runtime_config_test.py new/kiwi-9.24.47/test/unit/runtime_config_test.py --- old/kiwi-9.24.45/test/unit/runtime_config_test.py 2022-05-11 09:17:52.000000000 +0200 +++ new/kiwi-9.24.47/test/unit/runtime_config_test.py 2022-07-30 17:43:50.000000000 +0200 @@ -30,8 +30,8 @@ with raises(KiwiRuntimeConfigFormatError): runtime_config._get_attribute('foo', 'bar') + @patch('kiwi.defaults.CUSTOM_RUNTIME_CONFIG_FILE', 'some-config-file') def test_init_raises_custom_config_file_not_found(self): - Defaults.set_custom_runtime_config_file('some-config-file') with patch('os.path.isfile', return_value=False): with raises(KiwiRuntimeConfigFileError): RuntimeConfig(reread=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/test/unit/solver/repository/base_test.py new/kiwi-9.24.47/test/unit/solver/repository/base_test.py --- old/kiwi-9.24.45/test/unit/solver/repository/base_test.py 2022-05-11 08:59:15.000000000 +0200 +++ new/kiwi-9.24.47/test/unit/solver/repository/base_test.py 2022-08-10 17:17:56.000000000 +0200 @@ -17,11 +17,20 @@ class TestSolverRepositoryBase: def setup(self): self.uri = mock.Mock() + self.uri.uri = 'http://example.org/some/path' self.solver = SolverRepositoryBase(self.uri) def setup_method(self, cls): self.setup() + def test_uri_has_credentials(self): + self.uri = mock.Mock() + self.uri.uri = 'http://user:p...@example.org/some/path' + self.solver = SolverRepositoryBase(self.uri) + assert self.solver.user == 'user' + assert self.solver.secret == 'pass' + assert self.solver.uri.uri == 'http://example.org/some/path' + @patch.object(SolverRepositoryBase, '_get_repomd_xml') @patch.object(SolverRepositoryBase, '_get_deb_packages') @patch.object(SolverRepositoryBase, '_get_pacman_packages') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/test/unit/solver/repository/deb_test.py new/kiwi-9.24.47/test/unit/solver/repository/deb_test.py --- old/kiwi-9.24.45/test/unit/solver/repository/deb_test.py 2022-05-11 08:59:15.000000000 +0200 +++ new/kiwi-9.24.47/test/unit/solver/repository/deb_test.py 2022-08-10 17:17:56.000000000 +0200 @@ -8,6 +8,7 @@ class TestSolverRepositoryDeb: def setup(self): self.uri = Mock() + self.uri.uri = 'http://example.org/some/path' self.solver = SolverRepositoryDeb(self.uri) def setup_method(self, cls): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/test/unit/solver/repository/rpm_dir_test.py new/kiwi-9.24.47/test/unit/solver/repository/rpm_dir_test.py --- old/kiwi-9.24.45/test/unit/solver/repository/rpm_dir_test.py 2022-05-11 08:59:15.000000000 +0200 +++ new/kiwi-9.24.47/test/unit/solver/repository/rpm_dir_test.py 2022-08-10 17:17:56.000000000 +0200 @@ -12,6 +12,7 @@ class TestSolverRepositoryRpmDir: def setup(self): self.uri = Mock() + self.uri.uri = 'http://example.org/some/path' self.solver = SolverRepositoryRpmDir(self.uri) def setup_method(self, cls): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/test/unit/solver/repository/rpm_md_test.py new/kiwi-9.24.47/test/unit/solver/repository/rpm_md_test.py --- old/kiwi-9.24.45/test/unit/solver/repository/rpm_md_test.py 2022-05-11 08:59:15.000000000 +0200 +++ new/kiwi-9.24.47/test/unit/solver/repository/rpm_md_test.py 2022-08-10 17:17:56.000000000 +0200 @@ -12,6 +12,7 @@ def setup(self): self.xml_data = etree.parse('../data/repomd.xml') self.uri = mock.Mock() + self.uri.uri = 'http://example.org/some/path' self.solver = SolverRepositoryRpmMd(self.uri) def setup_method(self, cls): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/test/unit/solver/repository/suse_test.py new/kiwi-9.24.47/test/unit/solver/repository/suse_test.py --- old/kiwi-9.24.45/test/unit/solver/repository/suse_test.py 2022-05-11 08:59:15.000000000 +0200 +++ new/kiwi-9.24.47/test/unit/solver/repository/suse_test.py 2022-08-10 17:17:56.000000000 +0200 @@ -12,6 +12,7 @@ def setup(self): self.xml_data = etree.parse('../data/repomd.xml') self.uri = mock.Mock() + self.uri.uri = 'http://example.org/some/path' self.solver = SolverRepositorySUSE(self.uri) def setup_method(self, cls): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.45/test/unit/tasks/image_info_test.py new/kiwi-9.24.47/test/unit/tasks/image_info_test.py --- old/kiwi-9.24.45/test/unit/tasks/image_info_test.py 2022-05-11 08:59:15.000000000 +0200 +++ new/kiwi-9.24.47/test/unit/tasks/image_info_test.py 2022-08-10 17:17:56.000000000 +0200 @@ -122,6 +122,9 @@ def test_process_image_info_resolve_package_list( self, mock_get_repo_type, mock_uri, mock_solver_repo_new, mock_out ): + uri = Mock() + uri.uri = 'http://example.org/some/path' + mock_uri.return_value = uri mock_get_repo_type.return_value = 'apt-deb' self.solver.set_dist_type.return_value = { 'arch': 'amd64'
