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 2023-02-19 18:18:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kiwi (Old) and /work/SRC/openSUSE:Factory/.python-kiwi.new.22824 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwi" Sun Feb 19 18:18:52 2023 rev:104 rq:1066322 version:9.24.57 Changes: -------- --- /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes 2022-12-28 10:54:15.576025104 +0100 +++ /work/SRC/openSUSE:Factory/.python-kiwi.new.22824/python-kiwi.changes 2023-02-19 18:18:53.837456376 +0100 @@ -1,0 +2,160 @@ +Fri Feb 10 08:43:21 CET 2023 - Marcus Schäfer <[email protected]> + +- Bump version: 9.24.56 â 9.24.57 + +------------------------------------------------------------------- +Sat Jan 28 22:33:06 CET 2023 - Marcus Schäfer <[email protected]> + +- Allow squashfscompression for plain squashfs + + The schematron rule to limit the squashfscompression attribute + to certain image types did not allow it for a plain squashfs + filesystem build. This commit fixes that limitation. + This Fixes #2241 + +------------------------------------------------------------------- +Wed Jan 18 07:09:05 CET 2023 - David Cassany <[email protected]> + +- Use rsync defaults to sync the initrd root-tree + + This commits makes use of rsync default options to sync + the root-tree of the boot image for custom initrds. + + Fixes bsc#1207128 where it was noted hardlinks + were not preserved inside the initrd. + + Signed-off-by: David Cassany <[email protected]> + +------------------------------------------------------------------- +Tue Jan 17 16:23:37 CET 2023 - Marcus Schäfer <[email protected]> + +- Fixed wrong test assertions + + Former versions of pytest did ignore invalid assertions. + Now they are reported as an error and show the mistakes + of the past + +------------------------------------------------------------------- +Tue Jan 17 15:25:38 CET 2023 - Marcus Schäfer <[email protected]> + +- Added 90-brd.conf for test-image-disk-ramdisk + + By default the brd ramdisk module is no longer added to the + initrd. For ramdisk deployments this is required though. + This Fixes #2230 + +------------------------------------------------------------------- +Sun Jan 15 19:21:22 CET 2023 - Marcus Schäfer <[email protected]> + +- Delete CentOS v7 build tests + + CentOS v7 is EOL for kiwi image build tests + +------------------------------------------------------------------- +Thu Jan 05 12:56:38 CET 2023 - Marcus Schäfer <[email protected]> + +- Allow to specify fixed size for the root partition + + So far the last partition (typically root) in the partition table + takes all the rest space of the partition table in the image file. + At deployment/boot time users had several options to let that + partition grow to a custom size. However, during build time of the + image it was not possible to specify a specific fixed size for the + root partition as we don't wanted to produce gaps of unpartitioned + space in the image file. It has turned out that there is hardware + available which requires a partition to be an exact multiple of + some blocksize. As kiwi supports size constraints for all other + partitions but not for root this commit now allows for it. The + oem-systemsize element is now also taken into account at build + time of the image if the oem-resize which would do that at + deployment/boot time is switched off like the following example + shows: + + ```xml + <oemconfig> + <!-- set root partition to 2048MB --> + <oem-systemsize>2048</oem-systemsize> + <oem-resize>false</oem-resize> + </oemconfig> + ``` + + This Fixes #2203 + +------------------------------------------------------------------- +Wed Jan 04 20:56:25 CET 2023 - Marcus Schäfer <[email protected]> + +- Delete ppc:fedora from testing report + +------------------------------------------------------------------- +Wed Jan 04 12:47:40 CET 2023 - Marcus Schäfer <[email protected]> + +- Remove Fedora PPC build test from index + + The integration test unfortunately never got tested anywhere + is outdated and I have no PPC hardware here to run any tests. + Let's add a real test if there is demand for it + +------------------------------------------------------------------- +Wed Jan 04 12:29:46 CET 2023 - Marcus Schäfer <[email protected]> + +- Added kiwi-settings for Fedora arm build tests + +------------------------------------------------------------------- +Thu Dec 22 16:14:09 CET 2022 - Marcus Schäfer <[email protected]> + +- Allow fat16/fat32 as filesystem in partitions + + The partitions element allows to specify the filesystem for + the individual partition. In the schema fat16 and fat32 were + missing + +------------------------------------------------------------------- +Tue Dec 20 18:58:10 CET 2022 - Marcus Schäfer <[email protected]> + +- Stick with tox v3.28.0 for unit testing + + tox >= 3.0.15 together with virtualenv >= 20.17.1 raises + strange incompatibilities and prevents the unit test run + because tox calls virtualenv in a wrong way leading to + strange error messages like: + --- + usage: virtualenv ... + virtualenv: error: argument dest: destination '{check,devel,packagedoc,doc,doc_gh_pages,doc_suse,doc_man,scripts,}: /home/runner/work/kiwi/kiwi/.tox/3\n/home/runner/work/kiwi/kiwi/.tox/3.8' must not contain the path separator (:) as this would break the activation scripts + --- + All this doesn't make sense to me at all and worked + without any issues before. + +------------------------------------------------------------------- +Tue Dec 20 18:29:33 CET 2022 - Marcus Schäfer <[email protected]> + +- Bump version: 9.24.55 â 9.24.56 + +------------------------------------------------------------------- +Tue Dec 20 18:28:51 CET 2022 - Marcus Schäfer <[email protected]> + +- Fix gh-pages publish + +------------------------------------------------------------------- +Sun Dec 18 21:51:09 CET 2022 - Marcus Schäfer <[email protected]> + +- Fixed systemd boot integration test for rawhide + + systemd-boot was splitted in preparation for secure + boot. The unsigned version of the EFI binary is used + in the test so far + +------------------------------------------------------------------- +Sun Dec 18 21:05:59 CET 2022 - Marcus Schäfer <[email protected]> + +- Added device mapper setting for s390 on TW + + Use kpartx as partx fails + +------------------------------------------------------------------- +Sun Dec 18 21:04:18 CET 2022 - Marcus Schäfer <[email protected]> + +- Added device mapper setting for s390 + + Use kpartx as partx fails + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kiwi.spec ++++++ --- /var/tmp/diff_new_pack.0QpNGH/_old 2023-02-19 18:18:54.473460417 +0100 +++ /var/tmp/diff_new_pack.0QpNGH/_new 2023-02-19 18:18:54.481460468 +0100 @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.24.55 +Version: 9.24.57 Provides: kiwi-schema = 7.5 Release: 0 Url: https://github.com/OSInside/kiwi ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.0QpNGH/_old 2023-02-19 18:18:54.517460697 +0100 +++ /var/tmp/diff_new_pack.0QpNGH/_new 2023-02-19 18:18:54.521460722 +0100 @@ -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.55 +pkgver=9.24.57 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=('90bb67123ca2ffef2f8c2886d1e8f493') +md5sums=('0ab51266d89919b640436bfbfa8549a7') build() { ++++++ python-kiwi.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/.bumpversion.cfg new/kiwi-9.24.57/.bumpversion.cfg --- old/kiwi-9.24.55/.bumpversion.cfg 2022-12-18 20:33:54.000000000 +0100 +++ new/kiwi-9.24.57/.bumpversion.cfg 2023-02-10 08:43:21.000000000 +0100 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 9.24.55 +current_version = 9.24.57 commit = True tag = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/PKG-INFO new/kiwi-9.24.57/PKG-INFO --- old/kiwi-9.24.55/PKG-INFO 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/PKG-INFO 2023-02-10 08:46:35.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: kiwi -Version: 9.24.55 +Version: 9.24.57 Summary: KIWI - Appliance Builder (next generation) Home-page: https://osinside.github.io/kiwi Author: Marcus Schaefer Binary files old/kiwi-9.24.55/doc/build/latex/kiwi.pdf and new/kiwi-9.24.57/doc/build/latex/kiwi.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/doc/build/man/kiwi.8 new/kiwi-9.24.57/doc/build/man/kiwi.8 --- old/kiwi-9.24.55/doc/build/man/kiwi.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi.8 2023-02-10 08:46:31.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI" "8" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/build/man/kiwi::image::info.8 new/kiwi-9.24.57/doc/build/man/kiwi::image::info.8 --- old/kiwi-9.24.55/doc/build/man/kiwi::image::info.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi::image::info.8 2023-02-10 08:46:31.000000000 +0100 @@ -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" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI::IMAGE::INFO" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/build/man/kiwi::image::resize.8 new/kiwi-9.24.57/doc/build/man/kiwi::image::resize.8 --- old/kiwi-9.24.55/doc/build/man/kiwi::image::resize.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi::image::resize.8 2023-02-10 08:46:31.000000000 +0100 @@ -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" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI::IMAGE::RESIZE" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/build/man/kiwi::result::bundle.8 new/kiwi-9.24.57/doc/build/man/kiwi::result::bundle.8 --- old/kiwi-9.24.55/doc/build/man/kiwi::result::bundle.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi::result::bundle.8 2023-02-10 08:46:31.000000000 +0100 @@ -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" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI::RESULT::BUNDLE" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/build/man/kiwi::result::list.8 new/kiwi-9.24.57/doc/build/man/kiwi::result::list.8 --- old/kiwi-9.24.55/doc/build/man/kiwi::result::list.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi::result::list.8 2023-02-10 08:46:31.000000000 +0100 @@ -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" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI::RESULT::LIST" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/build/man/kiwi::system::build.8 new/kiwi-9.24.57/doc/build/man/kiwi::system::build.8 --- old/kiwi-9.24.55/doc/build/man/kiwi::system::build.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi::system::build.8 2023-02-10 08:46:31.000000000 +0100 @@ -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" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI::SYSTEM::BUILD" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/build/man/kiwi::system::create.8 new/kiwi-9.24.57/doc/build/man/kiwi::system::create.8 --- old/kiwi-9.24.55/doc/build/man/kiwi::system::create.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi::system::create.8 2023-02-10 08:46:31.000000000 +0100 @@ -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" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI::SYSTEM::CREATE" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/build/man/kiwi::system::prepare.8 new/kiwi-9.24.57/doc/build/man/kiwi::system::prepare.8 --- old/kiwi-9.24.55/doc/build/man/kiwi::system::prepare.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi::system::prepare.8 2023-02-10 08:46:31.000000000 +0100 @@ -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" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI::SYSTEM::PREPARE" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/build/man/kiwi::system::update.8 new/kiwi-9.24.57/doc/build/man/kiwi::system::update.8 --- old/kiwi-9.24.55/doc/build/man/kiwi::system::update.8 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/doc/build/man/kiwi::system::update.8 2023-02-10 08:46:31.000000000 +0100 @@ -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" "Dec 18, 2022" "9.24.55" "KIWI NG" +.TH "KIWI::SYSTEM::UPDATE" "8" "Feb 10, 2023" "9.24.57" "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.55/doc/source/conf.py new/kiwi-9.24.57/doc/source/conf.py --- old/kiwi-9.24.55/doc/source/conf.py 2022-12-18 20:33:54.000000000 +0100 +++ new/kiwi-9.24.57/doc/source/conf.py 2023-02-10 08:43:21.000000000 +0100 @@ -139,7 +139,7 @@ # built documents. # # The short X.Y version. -version = '9.24.55' +version = '9.24.57' # The full version, including alpha/beta/rc tags. release = version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/doc/source/index.rst new/kiwi-9.24.57/doc/source/index.rst --- old/kiwi-9.24.55/doc/source/index.rst 2022-09-18 20:32:30.000000000 +0200 +++ new/kiwi-9.24.57/doc/source/index.rst 2023-01-04 12:47:37.000000000 +0100 @@ -45,7 +45,6 @@ * `Build Tests Fedora(x86) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_x86:fedora>`__ * `Build Tests Fedora(arm) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_arm:fedora>`__ - * `Build Tests Fedora(ppc64le) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_ppc:fedora>`__ * `Build Tests CentOS(x86) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_x86:centos>`__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/doc/source/working_with_images/custom_partitions.rst new/kiwi-9.24.57/doc/source/working_with_images/custom_partitions.rst --- old/kiwi-9.24.55/doc/source/working_with_images/custom_partitions.rst 2022-09-18 20:32:30.000000000 +0200 +++ new/kiwi-9.24.57/doc/source/working_with_images/custom_partitions.rst 2023-01-13 10:00:24.000000000 +0100 @@ -84,7 +84,7 @@ Despite the customization options of the partition table shown above there are the following limitations: -1. The root partition is always the last one +1. By default the root partition is always the last one Disk imags build with {kiwi} are designed to be expandable. For this feature to work the partition containing the system @@ -93,23 +93,30 @@ partition with the option to be also placed at the end of the table. For details lookup `spare_part` in :ref:`image-description-elements` -2. There can be no gaps in the partition table +2. By default there are no gaps in the partition table - The way partitions are configured does not allow for gaps in the - table. As of today there was no use case were it made sense to - leave a gap between table entries. However, leaving some space + The way partitions are configured is done such that there are no + gaps in the table of the image. However, leaving some space free at the **end** of the partition geometry is possible in the following ways: * **Deploy with unpartitioned free space.** To leave space unpartitioned on first boot of a disk image - it is possible to configured an `<oem-systemsize>` which is + it is possible to configure an `<oem-systemsize>` which is smaller than the disk the image gets deployed to. Details about this setting can be found in :ref:`image-description-elements` * **Build with unpartitioned free space.** + To leave space unpartitioned at build time of the image it + is possible to disable `<oem-resize>` and configure an + `<oem-systemsize>` which is smaller than the kiwi calculated + disk size or the fixed setting for the disk size via the + `size>` element. + + * **Build with unpartitioned free space.** + Setting some unpartitioned free space on the disk can be done using the `unpartitioned` attribute of `size` element in type's section. For details see :ref:`disk-the-size-element` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/helper/build_status.sh new/kiwi-9.24.57/helper/build_status.sh --- old/kiwi-9.24.55/helper/build_status.sh 2022-11-30 22:18:19.000000000 +0100 +++ new/kiwi-9.24.57/helper/build_status.sh 2023-01-05 10:26:29.000000000 +0100 @@ -20,7 +20,6 @@ Virtualization:Appliances:Images:Testing_arm:fedora \ Virtualization:Appliances:Images:Testing_ppc:tumbleweed \ Virtualization:Appliances:Images:Testing_ppc:sle15 \ - Virtualization:Appliances:Images:Testing_ppc:fedora \ Virtualization:Appliances:Images:Testing_x86:archlinux do echo "${project}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/kiwi/boot/image/builtin_kiwi.py new/kiwi-9.24.57/kiwi/boot/image/builtin_kiwi.py --- old/kiwi-9.24.55/kiwi/boot/image/builtin_kiwi.py 2021-11-12 22:23:40.000000000 +0100 +++ new/kiwi-9.24.57/kiwi/boot/image/builtin_kiwi.py 2023-01-20 15:07:38.000000000 +0100 @@ -162,7 +162,7 @@ temp_boot_root_directory ) data.sync_data( - options=['-a'] + options=Defaults.get_sync_options() ) boot_directory = temp_boot_root_directory + '/boot' Path.wipe(boot_directory) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/kiwi/builder/disk.py new/kiwi-9.24.57/kiwi/builder/disk.py --- old/kiwi-9.24.55/kiwi/builder/disk.py 2022-09-18 20:32:30.000000000 +0200 +++ new/kiwi-9.24.57/kiwi/builder/disk.py 2023-01-13 10:00:24.000000000 +0100 @@ -144,6 +144,8 @@ self.target_removable = xml_state.build_type.get_target_removable() self.root_filesystem_is_multipath = \ xml_state.get_oemconfig_oem_multipath_scan() + self.oem_systemsize = xml_state.get_oemconfig_oem_systemsize() + self.oem_resize = xml_state.get_oemconfig_oem_resize() self.disk_resize_requested = \ xml_state.get_oemconfig_oem_resize() self.swap_mbytes = xml_state.get_oemconfig_swap_mbytes() @@ -937,7 +939,13 @@ rootfs_mbsize = disksize_mbytes - disksize_used_mbytes - \ self.spare_part_mbsize - Defaults.get_min_partition_mbytes() else: - rootfs_mbsize = 'all_free' + if self.oem_systemsize and not self.oem_resize: + rootfs_mbsize = self.oem_systemsize + else: + rootfs_mbsize = 'all_free' + log.info( + f'--> using {rootfs_mbsize}MB for the root(rw) partition if present' + ) if self.root_filesystem_is_overlay and \ self.root_filesystem_has_write_partition is False: @@ -953,10 +961,13 @@ # case root_clone_count = 0 if root_clone_count: - clone_rootfs_mbsize = int( - (disksize_mbytes - disksize_used_mbytes) / (root_clone_count + 1) - ) + Defaults.get_min_partition_mbytes() - rootfs_mbsize = f'clone:all_free:{clone_rootfs_mbsize}' + if rootfs_mbsize == 'all_free': + clone_rootfs_mbsize = int( + (disksize_mbytes - disksize_used_mbytes) / (root_clone_count + 1) + ) + Defaults.get_min_partition_mbytes() + rootfs_mbsize = f'clone:all_free:{clone_rootfs_mbsize}' + else: + rootfs_mbsize = f'clone:{rootfs_mbsize}:{rootfs_mbsize}' if self.volume_manager_name and self.volume_manager_name == 'lvm': log.info( '--> creating {0} partition [with {1} clone(s)]'.format( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/kiwi/schema/kiwi.rnc new/kiwi-9.24.57/kiwi/schema/kiwi.rnc --- old/kiwi-9.24.55/kiwi/schema/kiwi.rnc 2022-11-13 14:29:26.000000000 +0100 +++ new/kiwi-9.24.57/kiwi/schema/kiwi.rnc 2023-02-05 13:53:46.000000000 +0100 @@ -1596,7 +1596,7 @@ } >> sch:pattern [ id = "squashfscompression" is-a = "image_type" sch:param [ name = "attr" value = "squashfscompression" ] - sch:param [ name = "types" value = "oem pxe kis iso" ] + sch:param [ name = "types" value = "oem pxe kis iso squashfs" ] ] k.type.verity_blocks.attribute = ## Specifies to create a dm verity hash from the number of @@ -2428,7 +2428,7 @@ k.partition.filesystem.attribute = ## Filesystem which should be created on the partition attribute filesystem { - "btrfs" | "ext2" | "ext3" | "ext4" | "squashfs" | "xfs" + "btrfs" | "ext2" | "ext3" | "ext4" | "squashfs" | "xfs" | "fat32" | "fat16" } k.partition.clone.attribute = ## Clone this partition N times diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/kiwi/schema/kiwi.rng new/kiwi-9.24.57/kiwi/schema/kiwi.rng --- old/kiwi-9.24.55/kiwi/schema/kiwi.rng 2022-11-13 14:29:26.000000000 +0100 +++ new/kiwi-9.24.57/kiwi/schema/kiwi.rng 2023-02-05 13:53:46.000000000 +0100 @@ -2311,7 +2311,7 @@ </attribute> <sch:pattern id="squashfscompression" is-a="image_type"> <sch:param name="attr" value="squashfscompression"/> - <sch:param name="types" value="oem pxe kis iso"/> + <sch:param name="types" value="oem pxe kis iso squashfs"/> </sch:pattern> </define> <define name="k.type.verity_blocks.attribute"> @@ -3637,6 +3637,8 @@ <value>ext4</value> <value>squashfs</value> <value>xfs</value> + <value>fat32</value> + <value>fat16</value> </choice> </attribute> </define> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/kiwi/version.py new/kiwi-9.24.57/kiwi/version.py --- old/kiwi-9.24.55/kiwi/version.py 2022-12-18 20:33:54.000000000 +0100 +++ new/kiwi-9.24.57/kiwi/version.py 2023-02-10 08:43:21.000000000 +0100 @@ -18,5 +18,5 @@ """ Global version information used in kiwi and the package """ -__version__ = '9.24.55' -__githash__ = '4d6b8412431e6b0d27321921bd1cb7caa5ec847f' +__version__ = '9.24.57' +__githash__ = '2081fa46a4d516c0349102e70ec8121e53c887c4' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/kiwi/xml_state.py new/kiwi-9.24.57/kiwi/xml_state.py --- old/kiwi-9.24.55/kiwi/xml_state.py 2022-09-18 20:32:30.000000000 +0200 +++ new/kiwi-9.24.57/kiwi/xml_state.py 2023-01-13 10:00:24.000000000 +0100 @@ -1054,6 +1054,20 @@ else: return True + def get_oemconfig_oem_systemsize(self) -> int: + """ + State value to retrieve root partition size + + :return: Content of <oem-systemsize> section value + + :rtype: int + """ + oemconfig = self.get_build_type_oemconfig_section() + if oemconfig and oemconfig.get_oem_systemsize(): + return int(oemconfig.get_oem_systemsize()[0]) + else: + return 0 + def get_oemconfig_oem_multipath_scan(self) -> bool: """ State value to activate multipath maps. Returns a boolean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/kiwi.egg-info/PKG-INFO new/kiwi-9.24.57/kiwi.egg-info/PKG-INFO --- old/kiwi-9.24.55/kiwi.egg-info/PKG-INFO 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/kiwi.egg-info/PKG-INFO 2023-02-10 08:46:34.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: kiwi -Version: 9.24.55 +Version: 9.24.57 Summary: KIWI - Appliance Builder (next generation) Home-page: https://osinside.github.io/kiwi Author: Marcus Schaefer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/kiwi.egg-info/requires.txt new/kiwi-9.24.57/kiwi.egg-info/requires.txt --- old/kiwi-9.24.55/kiwi.egg-info/requires.txt 2022-12-18 20:38:17.000000000 +0100 +++ new/kiwi-9.24.57/kiwi.egg-info/requires.txt 2023-02-10 08:46:34.000000000 +0100 @@ -1,6 +1,6 @@ -PyYAML docopt lxml pyxattr requests +PyYAML simplejson Binary files old/kiwi-9.24.55/test/unit/.coverage and new/kiwi-9.24.57/test/unit/.coverage differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/test/unit/boot/image/builtin_kiwi_test.py new/kiwi-9.24.57/test/unit/boot/image/builtin_kiwi_test.py --- old/kiwi-9.24.55/test/unit/boot/image/builtin_kiwi_test.py 2022-03-08 20:23:49.000000000 +0100 +++ new/kiwi-9.24.57/test/unit/boot/image/builtin_kiwi_test.py 2023-01-20 15:07:38.000000000 +0100 @@ -137,7 +137,7 @@ mock_os_chmod.assert_called_once_with( 'temp-boot-directory', 0o755 ) - data.sync_data.assert_called_once_with(options=['-a']) + data.sync_data.assert_called_once_with(options=['--archive', '--hard-links', '--xattrs', '--acls', '--one-file-system', '--inplace']) mock_cpio.assert_called_once_with( ''.join( [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/test/unit/builder/disk_test.py new/kiwi-9.24.57/test/unit/builder/disk_test.py --- old/kiwi-9.24.55/test/unit/builder/disk_test.py 2022-09-18 20:32:30.000000000 +0200 +++ new/kiwi-9.24.57/test/unit/builder/disk_test.py 2023-01-13 10:00:24.000000000 +0100 @@ -787,6 +787,37 @@ '/dev/root-device' ) + @patch('kiwi.builder.disk.FileSystem.new') + @patch('random.randrange') + @patch('kiwi.builder.disk.Command.run') + @patch('kiwi.builder.disk.Defaults.get_grub_boot_directory_name') + @patch('os.path.exists') + @patch('os.path.getsize') + @patch('kiwi.builder.disk.SystemSetup') + @patch('kiwi.builder.disk.ImageSystem') + @patch('kiwi.builder.disk.Temporary.new_file') + def test_create_disk_standard_root_with_fixed_rootfs_size( + self, mock_Temporary_new_file, + mock_ImageSystem, mock_SystemSetup, mock_os_path_getsize, + mock_path, mock_grub_dir, mock_command, mock_rand, mock_fs + ): + self.disk_builder.root_filesystem_embed_verity_metadata = False + self.disk_builder.root_filesystem_is_overlay = False + self.disk_builder.volume_manager_name = None + self.setup.script_exists.return_value = False + self.disk_builder.initrd_system = 'dracut' + self.disk_builder.root_clone_count = 1 + self.disk_builder.oem_systemsize = 1024 + self.disk_builder.oem_resize = False + + m_open = mock_open() + with patch('builtins.open', m_open, create=True): + self.disk_builder.create_disk() + + self.disk.create_root_partition.assert_called_once_with( + 'clone:1024:1024', 1 + ) + @patch('kiwi.builder.disk.DeviceProvider') @patch('kiwi.builder.disk.FileSystem.new') @patch('kiwi.builder.disk.FileSystemSquashFs') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/test/unit/storage/disk_test.py new/kiwi-9.24.57/test/unit/storage/disk_test.py --- old/kiwi-9.24.55/test/unit/storage/disk_test.py 2022-12-01 22:33:30.000000000 +0100 +++ new/kiwi-9.24.57/test/unit/storage/disk_test.py 2023-01-18 11:42:35.000000000 +0100 @@ -55,7 +55,7 @@ def test_is_loop(self): self.disk.is_loop() - self.storage_provider.is_loop.called_once_with() + self.storage_provider.is_loop.assert_called_once_with() def test_create_root_partition(self): self.disk.create_root_partition('100', 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/test/unit/system/root_import/oci_test.py new/kiwi-9.24.57/test/unit/system/root_import/oci_test.py --- old/kiwi-9.24.55/test/unit/system/root_import/oci_test.py 2022-03-08 20:23:50.000000000 +0100 +++ new/kiwi-9.24.57/test/unit/system/root_import/oci_test.py 2023-01-18 11:42:35.000000000 +0100 @@ -47,7 +47,6 @@ def test_sync_data(self, mock_OCI, mock_path, mock_md5, mock_compress): oci = Mock() mock_OCI.new.return_value = oci - md5 = Mock() mock_md5.return_value = Mock() uncompress = Mock() @@ -63,7 +62,6 @@ 'root_dir' ) mock_md5.assert_called_once_with('root_dir/image/imported_root') - md5.md5.called_once_with('root_dir/image/imported_root.md5') uncompress.get_format.assert_called_once_with() @patch('kiwi.system.root_import.oci.Compress') @@ -75,7 +73,6 @@ ): oci = Mock() mock_OCI.new.return_value = oci - md5 = Mock() mock_md5.return_value = Mock() uncompress = Mock() @@ -91,7 +88,6 @@ 'root_dir' ) mock_md5.assert_called_once_with('root_dir/image/imported_root') - md5.md5.called_once_with('root_dir/image/imported_root.md5') uncompress.get_format.assert_called_once_with() uncompress.uncompress.assert_called_once_with(True) @@ -105,7 +101,6 @@ mock_exists.return_value = True oci = Mock() mock_OCI.new.return_value = oci - md5 = Mock() mock_md5.return_value = Mock() with patch.dict('os.environ', {'HOME': '../data'}): oci_import = RootImportOCI( @@ -124,4 +119,3 @@ 'root_dir' ) mock_md5.assert_called_once_with('root_dir/image/imported_root') - md5.md5.called_once_with('root_dir/image/imported_root.md5') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/test/unit/tasks/system_create_test.py new/kiwi-9.24.57/test/unit/tasks/system_create_test.py --- old/kiwi-9.24.55/test/unit/tasks/system_create_test.py 2022-03-08 20:23:50.000000000 +0100 +++ new/kiwi-9.24.57/test/unit/tasks/system_create_test.py 2023-01-18 11:42:35.000000000 +0100 @@ -77,10 +77,10 @@ self.task.process() self.runtime_checker.\ check_target_directory_not_in_shared_cache.\ - called_once_with(self.abs_target_dir) + assert_called_once_with(self.abs_root_dir) self.runtime_checker.\ check_dracut_module_versions_compatible_to_kiwi.\ - called_once_with(self.abs_target_dir) + assert_called_once_with(self.abs_root_dir) self.setup.call_image_script.assert_called_once_with() self.builder.create.assert_called_once_with() self.result.print_results.assert_called_once_with() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.55/test/unit/xml_state_test.py new/kiwi-9.24.57/test/unit/xml_state_test.py --- old/kiwi-9.24.55/test/unit/xml_state_test.py 2022-09-18 20:32:30.000000000 +0200 +++ new/kiwi-9.24.57/test/unit/xml_state_test.py 2023-01-13 10:00:24.000000000 +0100 @@ -576,6 +576,11 @@ state = XMLState(xml_data) assert state.get_oemconfig_oem_resize() is False + def test_get_oemconfig_oem_systemsize(self): + xml_data = self.description.load() + state = XMLState(xml_data, ['vmxFlavour'], 'oem') + assert state.get_oemconfig_oem_systemsize() == 2048 + def test_get_oemconfig_oem_multipath_scan(self): xml_data = self.description.load() state = XMLState(xml_data, ['vmxFlavour'], 'oem')
