From 4b1cd4fd4671343cc577bc34dc3a893f1da62fac21fd85563010493669b76395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Mon, 5 Aug 2024 08:01:15 +0000 Subject: [PATCH 1/3] =?UTF-8?q?-=20Bump=20version:=2010.0.28=20=E2=86=92?= =?UTF-8?q?=2010.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - kiwi no longer uses debootstrap For building Debian based images we used debootstrap to bootstrap an empty root until apt-get could be used to complete the job. This has now changed such hat apt-get is also used for bootstrapping a new system. The concept and also potential alternatives to the way kiwi bootstraps Debian based systems can be found here: * https://osinside.github.io/kiwi/working_with_images/build_without_debianbootstrap.html Due to the drop of debootstrap it might happen that package lists of existing image descriptions needs to be extended with packages that were formerly pulled in by debootstrap but did not get properly pulled in with the new apt based bootstrap. As reference please check out the integration tests from here: * https://github.com/OSInside/kiwi/tree/main/build-tests/x86/ubuntu * https://github.com/OSInside/kiwi/tree/main/build-tests/x86/debian Thanks - Bump version: 10.0.27 → 10.0.28 - Update documentation kiwi no longer uses debootstrap - Fix test_process_result_bundle_as_rpm - Fix Debian/Ubuntu integration tests Remove package hacks for debootstrap, explicitly add required packages and or configurations. OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=258 --- PKGBUILD | 4 +- python-kiwi.changes | 103 ++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 8 ++-- python-kiwi.tar.gz | 4 +- 4 files changed, 110 insertions(+), 9 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7a42cbf..c78b6e0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=10.0.27 +pkgver=10.1.0 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(make gcc python-build python-docopt python-installer python-lxml py provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('e8471ec78bc9f4c93efcfe3f61c784a1') +md5sums=('b049cce4ea4539cd8e9bfd5ad12d47f6') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index 86d7a2c..e183519 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,106 @@ +------------------------------------------------------------------- +Mon Aug 05 09:55:53 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.28 → 10.1.0 + +------------------------------------------------------------------- +Mon Aug 05 09:47:53 CEST 2024 - Marcus Schäfer + +- kiwi no longer uses debootstrap + + For building Debian based images we used debootstrap to + bootstrap an empty root until apt-get could be used to + complete the job. This has now changed such hat apt-get + is also used for bootstrapping a new system. The concept + and also potential alternatives to the way kiwi bootstraps + Debian based systems can be found here: + + * https://osinside.github.io/kiwi/working_with_images/build_without_debianbootstrap.html + + Due to the drop of debootstrap it might happen that + package lists of existing image descriptions needs to be + extended with packages that were formerly pulled in by + debootstrap but did not get properly pulled in with the + new apt based bootstrap. As reference please check out the + integration tests from here: + + * https://github.com/OSInside/kiwi/tree/main/build-tests/x86/ubuntu + * https://github.com/OSInside/kiwi/tree/main/build-tests/x86/debian + + Thanks + +------------------------------------------------------------------- +Mon Aug 05 09:47:12 CEST 2024 - Marcus Schäfer + +- Bump version: 10.0.27 → 10.0.28 + +------------------------------------------------------------------- +Sat Aug 03 14:13:07 CEST 2024 - Marcus Schäfer + +- Update documentation + + kiwi no longer uses debootstrap + +------------------------------------------------------------------- +Fri Aug 02 20:59:19 CEST 2024 - Marcus Schäfer + +- Fix test_process_result_bundle_as_rpm + +------------------------------------------------------------------- +Fri Aug 02 18:02:25 CEST 2024 - Marcus Schäfer + +- Fix Debian/Ubuntu integration tests + + Remove package hacks for debootstrap, explicitly add + required packages and or configurations. + +------------------------------------------------------------------- +Fri Aug 02 17:06:52 CEST 2024 - Marcus Schäfer + +- Drop types-pkg_resources + + Got removed from PyPI + +------------------------------------------------------------------- +Wed Jul 31 16:57:30 CEST 2024 - Marcus Schäfer + +- Fix test_process_result_bundle_as_rpm + + os.path.basename was called on a MagicMock object which + sometimes confused pytest + +------------------------------------------------------------------- +Wed Jul 31 12:09:20 CEST 2024 - Marcus Schäfer + +- Fix kiwi-repart restrictions + + The kiwi repart dracut module reads a profile file and if it + does not exists it dies in the initrd. However, that profile + file is not mandatory for the main resize functionality. Thus + this commit turns this into a warning message. In addition + the module-setup for 90kiwi-repart makes sure to include + the required and optional profile files. + This Fixes bsc#1228118 + +------------------------------------------------------------------- +Tue Jul 30 18:16:54 CEST 2024 - Marcus Schäfer + +- Do not exclude the .profile env file by default + + kiwi's initrd modules read a .profile file which gets included + into the initrd produced at build time. To allow rebuild of a + host-only initrd from the booted system this information should + be present such that it is possible to re-use kiwi initrd code. + +------------------------------------------------------------------- +Tue Jul 30 12:50:54 CEST 2024 - Marcus Schäfer + +- Get rid of debootstrap + + Replace debootstrap with an apt-get based pre-download of + packages followed by a dpkg-deb extraction. + This Fixes #2599 + ------------------------------------------------------------------- Tue Jul 30 09:45:37 CEST 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 9a0d2a3..3c329e4 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -52,7 +52,7 @@ %endif Name: python-kiwi -Version: 10.0.27 +Version: 10.1.0 Provides: kiwi-schema = 8.1 Release: 0 Url: https://github.com/OSInside/kiwi @@ -125,13 +125,11 @@ Provides: kiwi-image:tbz # tools conditionally used by kiwi %if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: gnupg2 -Recommends: debootstrap +Recommends: apt Recommends: dpkg %endif %if 0%{?suse_version} Recommends: gpg2 -Recommends: debootstrap -Recommends: dpkg %if 0%{?suse_version} >= 1650 Recommends: dnf %endif @@ -158,7 +156,7 @@ Requires: zypper Provides: kiwi-packagemanager:zypper %endif %if 0%{?debian} || 0%{?ubuntu} -Requires: debootstrap +Requires: apt Requires: dpkg Requires: gnupg %endif diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 175bb7a..07635e2 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f0aac099ee73621f0250719b9cce504cecf6fb948387bf797644b8c0ced2549 -size 1026923 +oid sha256:da688efcf2bad349908829c7fa0cea7464b9386c8d75b3427ea9d92a9af6c324 +size 1026331 From aaaefae804efdec7d88771a3c3a89cc66de2ee008da74edfac8aa915c5682b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Tue, 6 Aug 2024 10:10:22 +0000 Subject: [PATCH 2/3] =?UTF-8?q?-=20Bump=20version:=2010.1.0=20=E2=86=92=20?= =?UTF-8?q?10.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Mandatory package scripts for Debian bootstrap Make sure to run some mandatory package pre/post scripts such that settings like /etc/passwd, a root user, etc.. exists. This action can also be done in post_bootstrap.sh but I think it's better to do this in the core code OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=259 --- PKGBUILD | 4 ++-- python-kiwi.changes | 15 +++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c78b6e0..4fc89de 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=10.1.0 +pkgver=10.1.1 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(make gcc python-build python-docopt python-installer python-lxml py provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('b049cce4ea4539cd8e9bfd5ad12d47f6') +md5sums=('914f762b2428b92ce0cf4648ef4dc000') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index e183519..2f803b5 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 06 12:07:33 CEST 2024 - Marcus Schäfer + +- Bump version: 10.1.0 → 10.1.1 + +------------------------------------------------------------------- +Mon Aug 05 18:02:34 CEST 2024 - Marcus Schäfer + +- Mandatory package scripts for Debian bootstrap + + Make sure to run some mandatory package pre/post scripts + such that settings like /etc/passwd, a root user, etc.. + exists. This action can also be done in post_bootstrap.sh + but I think it's better to do this in the core code + ------------------------------------------------------------------- Mon Aug 05 09:55:53 CEST 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 3c329e4..03f7d1b 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -52,7 +52,7 @@ %endif Name: python-kiwi -Version: 10.1.0 +Version: 10.1.1 Provides: kiwi-schema = 8.1 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 07635e2..214e21e 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da688efcf2bad349908829c7fa0cea7464b9386c8d75b3427ea9d92a9af6c324 -size 1026331 +oid sha256:ec6b5925832eb94cc835e6f33be27dd07cf60ab30dd96e5af5c6791d012ab78c +size 1026805 From 9583babeae1e5672c7f2c4ab7ec7b887d28f13d5914b45632e0f1dc8b00e83e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Fri, 9 Aug 2024 08:14:17 +0000 Subject: [PATCH 3/3] =?UTF-8?q?-=20Bump=20version:=2010.1.1=20=E2=86=92=20?= =?UTF-8?q?10.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Improve error reporting for remote deployment Add new method called show_log_and_quit which displays the written error log file as a file box to the user - Update test-image-orthos integration test Update the test such that you can also build it locally. Change the remote installation target to be a ramdisk for easy testing of remote deployments - Setup default minimum volume size per filesystem The former method provided a static value but there are huge differences for the minimum size requirement of a filesystem. For example extX is fine with 30MB whereas XFS requires 300MB. This commit adds a more dynamic default value based on the used filesystem. - Increase default volume size So far 30MB was set as default volume size which is by far too small for a number of filesystems, e.g btrfs and also XFS. This commit increases the default volume size such that all modern filesystems builds if the default volume size is used. - Update test-image-raid Apart from testing raid this integration test also tests a certain LVM volume setup. The test has been updated to use the btrfs filesystem because it has the most strict size requirements. OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=260 --- PKGBUILD | 4 ++-- python-kiwi.changes | 53 +++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 4fc89de..5c64e19 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=10.1.1 +pkgver=10.1.2 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(make gcc python-build python-docopt python-installer python-lxml py provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('914f762b2428b92ce0cf4648ef4dc000') +md5sums=('71cd6db02cc6e178d0469fe0522b0a9d') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index 2f803b5..071db19 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Thu Aug 08 15:55:18 CEST 2024 - Marcus Schäfer + +- Bump version: 10.1.1 → 10.1.2 + +------------------------------------------------------------------- +Thu Aug 08 15:15:32 CEST 2024 - Marcus Schäfer + +- Improve error reporting for remote deployment + + Add new method called show_log_and_quit which displays + the written error log file as a file box to the user + +------------------------------------------------------------------- +Thu Aug 08 15:14:18 CEST 2024 - Marcus Schäfer + +- Update test-image-orthos integration test + + Update the test such that you can also build it locally. + Change the remote installation target to be a ramdisk + for easy testing of remote deployments + +------------------------------------------------------------------- +Thu Aug 08 10:22:22 CEST 2024 - Marcus Schäfer + +- Setup default minimum volume size per filesystem + + The former method provided a static value but there are huge + differences for the minimum size requirement of a filesystem. + For example extX is fine with 30MB whereas XFS requires 300MB. + This commit adds a more dynamic default value based on the + used filesystem. + +------------------------------------------------------------------- +Wed Aug 07 18:30:13 CEST 2024 - Marcus Schäfer + +- Increase default volume size + + So far 30MB was set as default volume size which is by far + too small for a number of filesystems, e.g btrfs and also XFS. + This commit increases the default volume size such that all + modern filesystems builds if the default volume size is used. + +------------------------------------------------------------------- +Wed Aug 07 18:19:41 CEST 2024 - Marcus Schäfer + +- Update test-image-raid + + Apart from testing raid this integration test also tests + a certain LVM volume setup. The test has been updated + to use the btrfs filesystem because it has the most strict + size requirements. + ------------------------------------------------------------------- Tue Aug 06 12:07:33 CEST 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 03f7d1b..c710bb1 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -52,7 +52,7 @@ %endif Name: python-kiwi -Version: 10.1.1 +Version: 10.1.2 Provides: kiwi-schema = 8.1 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 214e21e..812825b 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec6b5925832eb94cc835e6f33be27dd07cf60ab30dd96e5af5c6791d012ab78c -size 1026805 +oid sha256:d40f17bdeb281b1cd13681f3ae1318e18b179c32f2702057fc2fa1661bc98f3f +size 1027180