From b593695a76691823f33e849f038707c865fabdb7766b9ca6a4b86a3639451a27 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 10 Dec 2019 09:10:55 +0000 Subject: [PATCH] =?UTF-8?q?-=20Bump=20version:=209.19.6=20=C3=A2=E2=80=A0?= =?UTF-8?q?=E2=80=99=209.19.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed swap setup if btrfs is used In case of a volume manager the simplified variant of the device name is used in the fstab file to reference the swap device. However this is only correct for the lvm volume management but not for btrfs. In case of btrfs the swap space is not a subvolume but a real partition and thus the simplified device spec in fstab puts in the loop mapped device which is wrong. This patch fixes it - Exclude 'Recommends: kiwi-man-pages' for EL7 and older in the spec - Fixed xz options syntax in default kiwi.yml xz options are passed as a string and splitted in code but not handled as yml list - Fixed scope of kiwi-man-pages sub package The kiwi-man-pages package provided data that belongs to the main package, e.g the completion as well as the license information. In addition kiwi-man-pages should not be a requirement. - Fixed result map for OEM pxe install The result map for OEM images with installpxe enabled contained a wrong file name. Thus the result bundler was not able to fetch the tarball - Open image files in UTF-8 Post image build metadata like the packages file which are OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=159 --- python-kiwi.changes | 61 +++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 16 ++++++------ python-kiwi.tar.gz | 4 +-- 3 files changed, 72 insertions(+), 9 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 06dc35d..9265e64 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Tue Dec 10 09:27:41 CET 2019 - Marcus Schäfer + +- Bump version: 9.19.6 → 9.19.7 + +------------------------------------------------------------------- +Sun Dec 08 18:57:19 CET 2019 - Marcus Schäfer + +- Fixed swap setup if btrfs is used + + In case of a volume manager the simplified variant of the + device name is used in the fstab file to reference the + swap device. However this is only correct for the lvm + volume management but not for btrfs. In case of btrfs + the swap space is not a subvolume but a real partition + and thus the simplified device spec in fstab puts in the + loop mapped device which is wrong. This patch fixes it + +------------------------------------------------------------------- +Fri Dec 06 17:13:16 CET 2019 - Neal Gompa + +- Exclude 'Recommends: kiwi-man-pages' for EL7 and older in the spec + +------------------------------------------------------------------- +Fri Dec 06 16:34:04 CET 2019 - Marcus Schäfer + +- Fixed xz options syntax in default kiwi.yml + + xz options are passed as a string and splitted in code + but not handled as yml list + +------------------------------------------------------------------- +Fri Dec 06 16:28:32 CET 2019 - Marcus Schäfer + +- Fixed scope of kiwi-man-pages sub package + + The kiwi-man-pages package provided data that belongs to + the main package, e.g the completion as well as the + license information. In addition kiwi-man-pages should + not be a requirement. + +------------------------------------------------------------------- +Fri Dec 06 16:16:33 CET 2019 - Marcus Schäfer + +- Fixed result map for OEM pxe install + + The result map for OEM images with installpxe enabled + contained a wrong file name. Thus the result bundler + was not able to fetch the tarball + +------------------------------------------------------------------- +Thu Dec 05 09:26:31 CET 2019 - Marcus Schäfer + +- Open image files in UTF-8 + + Post image build metadata like the packages file which are + created from data produced by the package manager can contain + multibyte characters and should be written into files opened + with the UTF-8 encoding. The same applies to the image imported + XML description. This Fixes #1290 + ------------------------------------------------------------------- Wed Dec 04 17:36:55 CET 2019 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 225fc90..9049ec0 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.19.6 +Version: 9.19.7 Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi @@ -141,7 +141,6 @@ Requires: dosfstools Requires: e2fsprogs Requires: xorriso Requires: grub2 -Requires: kiwi-man-pages Requires: kiwi-tools Requires: lvm2 Requires: mtools @@ -160,6 +159,9 @@ Requires: u-boot-tools %ifarch s390 s390x Requires: s390-tools %endif +%if ! (0%{?rhel} && 0%{?rhel} < 8) +Recommends: kiwi-man-pages +%endif %description -n python%{python3_pkgversion}-kiwi Python 3 library of the KIWI Image System. Provides an operating system @@ -405,19 +407,19 @@ fi %endif %files -n python%{python3_pkgversion}-kiwi +%dir %{_defaultdocdir}/python-kiwi %{_bindir}/kiwi %{_bindir}/kiwi-ng %{_bindir}/kiwicompat %{_bindir}/kiwi-ng-3* %{_bindir}/kiwicompat-3* %{python3_sitelib}/kiwi* - -%files -n kiwi-man-pages -%dir %{_defaultdocdir}/python-kiwi -%{_defaultdocdir}/python-kiwi/kiwi.pdf +%config %_sysconfdir/bash_completion.d/kiwi-ng.sh %{_defaultdocdir}/python-kiwi/LICENSE %{_defaultdocdir}/python-kiwi/README -%config %_sysconfdir/bash_completion.d/kiwi-ng.sh + +%files -n kiwi-man-pages +%{_defaultdocdir}/python-kiwi/kiwi.pdf %config %_sysconfdir/kiwi.yml %doc %{_mandir}/man8/* diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 47b28ed..691d17e 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:abe996bf253058941e70806413e22135a95e6cd5a02d12591f42e62b8a76f9ac -size 1637433 +oid sha256:a49ce158c80efdd8c356bd3817f1538a588682b2f4902d3cfd8d876f6896e608 +size 1637487