diff --git a/PKGBUILD b/PKGBUILD index 48d5d99..3b9e9c8 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.2 +pkgver=10.0.3 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=('284f5bce5e8fae60101f8cc22b9afd0a') +md5sums=('a50c9641b13165189b36c0a91c4f7af6') build() { @@ -21,7 +21,7 @@ build() { cd kiwi-${pkgver} # Temporarily switch things back to docopt # FIXME: Drop this hack as soon as we can... - sed -e "s/docopt-ng/docopt/" -i pyproject.toml + sed -e 's/docopt-ng.*/docopt = ">=0.6.2"/' -i pyproject.toml make -C doc man python3 -m build --no-isolation --wheel } diff --git a/python-kiwi.changes b/python-kiwi.changes index b01fdfa..93f8fc5 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Thu Mar 07 15:51:11 CET 2024 - Marcus Schäfer + +- Bump version: 10.0.2 → 10.0.3 + +------------------------------------------------------------------- +Thu Mar 07 03:33:26 CET 2024 - Neal Gompa + +- Ensure we use a compatible docopt-ng version + + To ensure our trick to switch between docopt and docopt-ng works, + we need to have a higher minimum version for docopt-ng where + compatibility with the original docopt was restored. + +------------------------------------------------------------------- +Wed Mar 06 21:05:26 CET 2024 - Marcus Schäfer + +- Fixed delta_root build + + The support for delta_root allows to build a delta container + image from a given base container. Due to the refactoring of + the kiwi code base using context managers no explicit deletion + of instances happens anymore. This uncovered a weakness of + the delta root code at the level of the overlay mount. At + the time of the umount there are still active temporary + mount handlers which keeps the mountpoint busy. In order to + fix this properly also the PackageManager factory is now + a context manager and the Repository factory received a + cleanup method which is called when the PackageManager goes + out of scope. This refactoring also fixes the busy state + when building deltas + ------------------------------------------------------------------- Wed Mar 06 10:42:14 CET 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index ed85baf..35acaca 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -44,7 +44,7 @@ %endif Name: python-kiwi -Version: 10.0.2 +Version: 10.0.3 Provides: kiwi-schema = 7.5 Release: 0 Url: https://github.com/OSInside/kiwi @@ -623,7 +623,7 @@ Provides manual pages to describe the kiwi commands # Temporarily switch things back to docopt for everything but Fedora 41+ # FIXME: Drop this hack as soon as we can... %if ! (0%{?fedora} >= 41 || 0%{?rhel} >= 10) -sed -e "s/docopt-ng/docopt/" -i pyproject.toml +sed -e 's/docopt-ng.*/docopt = ">=0.6.2"/' -i pyproject.toml %endif # Drop shebang for kiwi/xml_parse.py, as we don't intend to use it diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 3144f09..db1a973 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:0589cf390fef19e20e27af540ea72e0dd3a313429aaf3424f056b4bf409389ff -size 1000549 +oid sha256:69ce78efb2c4be172ceea029769903449bff0f164b6f51601d3b217e5e09dc52 +size 1001526