From 8e3eacb6eee315661c846dd68d3304ae8a270cb6f054e1346d203aaf58782052 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Thu, 9 Sep 2021 08:02:48 +0000 Subject: [PATCH 1/2] =?UTF-8?q?-=20Bump=20version:=209.23.54=20=E2=86=92?= =?UTF-8?q?=209.23.55?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Added support for building rpm package from bundle With the new option --package-as-rpm it is possible to call the kiwi result bundler such that the image build results gets packaged into an rpm. I think this is a handy feature to transport image builds via repositories - Fixed MicroOS integration test With ignition/combustion in place it's not allowed to use tmp as a subvolume OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=204 --- PKGBUILD | 4 ++-- python-kiwi.changes | 23 +++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index f049a07..aa0b6d2 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=9.23.54 +pkgver=9.23.55 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep) provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('c16bb2aeea3086ece63052b4f1641064') +md5sums=('7474fc55735ac5846a788ec708c06432') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index 4c4f97b..fa912e9 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Sep 09 10:00:04 CEST 2021 - Marcus Schäfer + +- Bump version: 9.23.54 → 9.23.55 + +------------------------------------------------------------------- +Wed Sep 08 13:07:47 CEST 2021 - Marcus Schäfer + +- Added support for building rpm package from bundle + + With the new option --package-as-rpm it is possible to + call the kiwi result bundler such that the image build + results gets packaged into an rpm. I think this is a + handy feature to transport image builds via repositories + +------------------------------------------------------------------- +Wed Sep 08 10:11:23 CEST 2021 - Marcus Schäfer + +- Fixed MicroOS integration test + + With ignition/combustion in place it's not allowed + to use tmp as a subvolume + ------------------------------------------------------------------- Tue Sep 07 18:02:22 CEST 2021 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index aafb90b..afe1648 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.23.54 +Version: 9.23.55 Provides: kiwi-schema = 7.4 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 07115c5..f636c1a 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:f29ffa9077907c372b7569c5d4649e5c6cda03ee20ac3f72b67433d2c3ece4bd -size 1944641 +oid sha256:58b537ae2166bb44462b6bdd2c5fb62256b151bf1a6364454f47f44b97bdf452 +size 1945902 From 62b17525a1715843efd18a1d7703a6cad9f17e4cc48e3ecdb7554feb1b1bb7cb Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 10 Sep 2021 21:57:52 +0000 Subject: [PATCH 2/2] =?UTF-8?q?-=20Bump=20version:=209.23.55=20=E2=86=92?= =?UTF-8?q?=209.23.56?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Only wipe bundle dir when required The given result bundle dir must only be wiped if the request to turn the result files into an rpm was given. Only in this case the given bundle dir must start empty - Fixed uninstall handling via dnf, microdnf, zypper The above package managers supports uninstall instructions like 'iwl*'. In kiwi there was code checking via rpm if the packages given to uninstall actually exists. That code does not work if the given package to uninstall is an instruction that matches a pattern. Therefore if we use the uninstall section in the kiwi image description, just pass the provided information to the package manager and don't try to be clever in kiwi itself. - Allow to set --logfile for result namespace Setting a logfile for e.g 'kiwi-ng result bundle ...' is useful and should be possible OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=205 --- PKGBUILD | 4 ++-- python-kiwi.changes | 36 ++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index aa0b6d2..9bf6c76 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=9.23.55 +pkgver=9.23.56 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep) provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('7474fc55735ac5846a788ec708c06432') +md5sums=('a895746efe896fcd873035a01bc1d3cb') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index fa912e9..0514490 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Fri Sep 10 23:52:50 CEST 2021 - Marcus Schäfer + +- Bump version: 9.23.55 → 9.23.56 + +------------------------------------------------------------------- +Fri Sep 10 22:42:23 CEST 2021 - Marcus Schäfer + +- Only wipe bundle dir when required + + The given result bundle dir must only be wiped if the + request to turn the result files into an rpm was given. + Only in this case the given bundle dir must start empty + +------------------------------------------------------------------- +Fri Sep 10 22:30:55 CEST 2021 - Marcus Schäfer + +- Fixed uninstall handling via dnf, microdnf, zypper + + The above package managers supports uninstall instructions + like 'iwl*'. In kiwi there was code checking via rpm if + the packages given to uninstall actually exists. That code + does not work if the given package to uninstall is an + instruction that matches a pattern. Therefore if we use + the uninstall section in the kiwi image description, just + pass the provided information to the package manager and + don't try to be clever in kiwi itself. + +------------------------------------------------------------------- +Thu Sep 09 13:17:47 CEST 2021 - Marcus Schäfer + +- Allow to set --logfile for result namespace + + Setting a logfile for e.g 'kiwi-ng result bundle ...' + is useful and should be possible + ------------------------------------------------------------------- Thu Sep 09 10:00:04 CEST 2021 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index afe1648..917adf6 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.23.55 +Version: 9.23.56 Provides: kiwi-schema = 7.4 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index f636c1a..0e8ba8c 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:58b537ae2166bb44462b6bdd2c5fb62256b151bf1a6364454f47f44b97bdf452 -size 1945902 +oid sha256:877f942365b3356d97aa5f52e39fac1b4fc224a73de9e5a2c6c4634d9a2b21d4 +size 1966987