From 5052d6eefb45ab55171cd14b6738ed3a189b2a497c1e8eb1c39535c24a391fe1 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 15 Nov 2019 10:34:58 +0000 Subject: [PATCH 1/6] =?UTF-8?q?-=20Bump=20version:=209.18.32=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.18.33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed zipl bootloader config template The targetgeometry value is not allowed for SCSI and FBA mode. So far we handled only SCSI and failed on FBA mode. This commit fixes it - Adapt test-image-oem integration test for s390 The test was originally designed to test for DASD 4k block storage. However the kpartx utility in the Leap15, TW code stream has issues mapping partitions if the loop device was setup using 4k sector size. So far we can't create images with 4k blocksize due to that issue. Thus the integration test is now adapted for an emulated DASD device in FBA mode which is not using 4k blocksize. Once the problem with kpartx is solved on s390 we will create another integration test to test 4k image builds - Bump version: 9.18.31 → 9.18.32 - Update s390 integration tests Added vmx build test to run in kvm on s390. Updated the existing oem build test to deploy on DASD. The concept of the network setup invented by kiwi for s390 does no longer apply and was also not used on the s390 distribution - Fixed zipl bootloader setup for s390 images The preparation to call zipl and the call itself were wrong. For whatever reason the kernel image the initrd are moved to another location prior to calling zipl. That move broke OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=154 --- python-kiwi.changes | 67 +++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 +-- 3 files changed, 70 insertions(+), 3 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 0466474..bb74f03 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Fri Nov 15 09:03:19 CET 2019 - Marcus Schäfer + +- Bump version: 9.18.32 → 9.18.33 + +------------------------------------------------------------------- +Thu Nov 14 16:51:00 CET 2019 - Marcus Schäfer + +- Fixed zipl bootloader config template + + The targetgeometry value is not allowed for SCSI and FBA + mode. So far we handled only SCSI and failed on FBA mode. + This commit fixes it + +------------------------------------------------------------------- +Thu Nov 14 12:45:42 CET 2019 - Marcus Schäfer + +- Adapt test-image-oem integration test for s390 + + The test was originally designed to test for DASD 4k block + storage. However the kpartx utility in the Leap15, TW code + stream has issues mapping partitions if the loop device + was setup using 4k sector size. So far we can't create + images with 4k blocksize due to that issue. Thus the + integration test is now adapted for an emulated DASD device + in FBA mode which is not using 4k blocksize. Once the + problem with kpartx is solved on s390 we will create another + integration test to test 4k image builds + +------------------------------------------------------------------- +Thu Nov 14 12:24:16 CET 2019 - Marcus Schäfer + +- Bump version: 9.18.31 → 9.18.32 + +------------------------------------------------------------------- +Thu Nov 14 09:45:00 CET 2019 - Marcus Schäfer + +- Update s390 integration tests + + Added vmx build test to run in kvm on s390. Updated the + existing oem build test to deploy on DASD. The concept + of the network setup invented by kiwi for s390 does no + longer apply and was also not used on the s390 distribution + +------------------------------------------------------------------- +Thu Nov 14 09:20:55 CET 2019 - Marcus Schäfer + +- Fixed zipl bootloader setup for s390 images + + The preparation to call zipl and the call itself were wrong. + For whatever reason the kernel image the initrd are moved + to another location prior to calling zipl. That move broke + the system because no kernel/initrd existed at the expected + place anymore. In addition the zipl call itself was issued + from a the wrong directory. Also no config file was written + as an after effect of the refactoring in Issue #1194. This + Fixes #1173 and bsc#1156694 + +------------------------------------------------------------------- +Wed Nov 13 12:18:08 CET 2019 - Dan Čermák + +- Document possible values for the name attribute of package + + This fixes #1260 + + Co-Authored-By: Thomas Schraitle + ------------------------------------------------------------------- Thu Nov 07 16:00:01 CET 2019 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 46351b6..6058812 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.18.31 +Version: 9.18.33 Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 68e3401..4aea2b3 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:28a7d4796f3ab8f328bda48d510393e34fbcdc0df822b9373075b9d8f82ebe39 -size 1633303 +oid sha256:520a15778d646a90cb41bc3d54fe043a84d0134900290bb4c248dc20bf9548f9 +size 1637000 From abc1c9f25417e0568eb022d1c4785f2f17c48350a9f957349f4c6cac6ca3c68c Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 19 Nov 2019 08:05:17 +0000 Subject: [PATCH 2/6] =?UTF-8?q?-=20Bump=20version:=209.18.33=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.18.34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Improve alias documentation in XML schema This commit aligns the documentation of the default repository alias with the current implementation. Fixes #1247 - Allow use of relative paths for `dir:` URIs This commit allows the use of relative paths for local URIs using the the following format: dir: This is helpful to set in config.xml local URIs for repositories. Fixes #1261 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=155 --- python-kiwi.changes | 29 +++++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index bb74f03..82484e5 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 19 09:02:14 CET 2019 - Marcus Schäfer + +- Bump version: 9.18.33 → 9.18.34 + +------------------------------------------------------------------- +Fri Nov 15 14:47:41 CET 2019 - David Cassany + +- Improve alias documentation in XML schema + + This commit aligns the documentation of the default repository alias + with the current implementation. + + Fixes #1247 + ------------------------------------------------------------------- Fri Nov 15 09:03:19 CET 2019 - Marcus Schäfer @@ -12,6 +27,20 @@ Thu Nov 14 16:51:00 CET 2019 - Marcus Schäfer mode. So far we handled only SCSI and failed on FBA mode. This commit fixes it +------------------------------------------------------------------- +Thu Nov 14 15:19:40 CET 2019 - David Cassany + +- Allow use of relative paths for `dir:` URIs + + This commit allows the use of relative paths for local URIs using the + the following format: + + dir: + + This is helpful to set in config.xml local URIs for repositories. + + Fixes #1261 + ------------------------------------------------------------------- Thu Nov 14 12:45:42 CET 2019 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 6058812..1fbbc20 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.18.33 +Version: 9.18.34 Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 4aea2b3..2d1bfae 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:520a15778d646a90cb41bc3d54fe043a84d0134900290bb4c248dc20bf9548f9 -size 1637000 +oid sha256:8664a572a66cb99e83fc9a078c6620111ca2b7d9d96b1358f906f7d0fb46dc6b +size 1636266 From ca3c2eb54841d9eb2d68185c505180e584d00f7f8c2a0a12aa2b089a437acbf3 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Wed, 20 Nov 2019 11:39:29 +0000 Subject: [PATCH 3/6] =?UTF-8?q?-=20Bump=20version:=209.18.34=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.18.35?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed subsequent reboot of oem disk On a second reboot of an oem disk we check with gdisk's verification command if the disk needs to be resized. That command however mounts the disk in the background and therefore it's urgently required to mask the systemd rootfs service before. Otherwise systemd thinks this is evil and drops into a rescue shell - Reference commit for SUSE maintenance This commit adds a reference to Issue #1261 and the report in bugzilla bsc#1157104 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=156 --- python-kiwi.changes | 25 +++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 82484e5..034df62 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Nov 20 12:37:19 CET 2019 - Marcus Schäfer + +- Bump version: 9.18.34 → 9.18.35 + +------------------------------------------------------------------- +Tue Nov 19 17:06:05 CET 2019 - Marcus Schäfer + +- Fixed subsequent reboot of oem disk + + On a second reboot of an oem disk we check with gdisk's + verification command if the disk needs to be resized. + That command however mounts the disk in the background + and therefore it's urgently required to mask the systemd + rootfs service before. Otherwise systemd thinks this is + evil and drops into a rescue shell + +------------------------------------------------------------------- +Tue Nov 19 09:32:38 CET 2019 - Marcus Schäfer + +- Reference commit for SUSE maintenance + + This commit adds a reference to Issue #1261 and the + report in bugzilla bsc#1157104 + ------------------------------------------------------------------- Tue Nov 19 09:02:14 CET 2019 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 1fbbc20..ff0695f 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.18.34 +Version: 9.18.35 Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 2d1bfae..e24b167 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:8664a572a66cb99e83fc9a078c6620111ca2b7d9d96b1358f906f7d0fb46dc6b -size 1636266 +oid sha256:ab8c3276456217f1d94e1cf97dd5b051ffd98df4c42daa90a217d9bf16c56b50 +size 1636303 From 4830e87f63e7f89845fa779e454a88457c2f63803db62a06b4fc8d8ca1eb4a8c Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Mon, 2 Dec 2019 13:36:20 +0000 Subject: [PATCH 4/6] =?UTF-8?q?-=20Bump=20version:=209.19.4=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.19.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed setup of default grub config In /etc/default/grub GRUB_CMDLINE_LINUX_DEFAULT also contained the root= information. If grub2-mkconfig runs with that information it places the root device information twice because grub2-mkconfig resolves this information itself. This commit prevents the root= information to be placed in the default grub config and Fixes bsc#1156908 - Lookup distribution specific grub font dir In addition to the generic grub font directory also lookup distribution specific font paths in the system and copy the grub unicode font into it. This Fixes #1253 - Do not rsync /dev on debootstrap This commit does not rsync /dev on debootstrap and instead it uses the bind mount for /dev the same way it is done for other non apt based bootstrap processes. - Add new root option in Path.which method This commit adds to Path utility a couple of methods to manipulate paths. One to rebase given paths to a new root and another one to trim the given root path. In addition a new option in Path.which is added to allow searches into chroot evironments. Fixes #1276 - Do not rsync kernel filesystems on debootstrap This commit ensures that /proc and /sys are not rsynched when debootstrapping an apt based image. OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=157 --- python-kiwi.changes | 212 ++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 +- 3 files changed, 215 insertions(+), 3 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 034df62..f43b735 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,8 +1,220 @@ +------------------------------------------------------------------- +Mon Dec 02 12:26:03 CET 2019 - Marcus Schäfer + +- Bump version: 9.19.4 → 9.19.5 + +------------------------------------------------------------------- +Fri Nov 29 11:56:08 CET 2019 - Marcus Schäfer + +- Fixed setup of default grub config + + In /etc/default/grub GRUB_CMDLINE_LINUX_DEFAULT also contained + the root= information. If grub2-mkconfig runs with that information + it places the root device information twice because grub2-mkconfig + resolves this information itself. This commit prevents the root= + information to be placed in the default grub config and + Fixes bsc#1156908 + +------------------------------------------------------------------- +Wed Nov 27 15:50:40 CET 2019 - Marcus Schäfer + +- Lookup distribution specific grub font dir + + In addition to the generic grub font directory also lookup + distribution specific font paths in the system and copy the + grub unicode font into it. This Fixes #1253 + +------------------------------------------------------------------- +Wed Nov 27 09:29:13 CET 2019 - David Cassany + +- Do not rsync /dev on debootstrap + + This commit does not rsync /dev on debootstrap and instead it uses + the bind mount for /dev the same way it is done for other non apt + based bootstrap processes. + +------------------------------------------------------------------- +Wed Nov 27 08:12:06 CET 2019 - David Cassany + +- Add new root option in Path.which method + + This commit adds to Path utility a couple of methods to manipulate + paths. One to rebase given paths to a new root and another one to + trim the given root path. In addition a new option in Path.which + is added to allow searches into chroot evironments. + + Fixes #1276 + +------------------------------------------------------------------- +Tue Nov 26 17:17:21 CET 2019 - David Cassany + +- Do not rsync kernel filesystems on debootstrap + + This commit ensures that /proc and /sys are not rsynched when + debootstrapping an apt based image. + + Fixes #1270 + +------------------------------------------------------------------- +Tue Nov 26 11:40:18 CET 2019 - Marcus Schäfer + +- Bump version: 9.19.3 → 9.19.4 + +------------------------------------------------------------------- +Tue Nov 26 11:37:46 CET 2019 - Marcus Schäfer + +- Fixed condition to create swap partition + + The previous condition created the partition if swap is + requested and no volume management is used. But this is + wrong because if any other than the LVM volume management + is used we want the swap space as partition. Only in case + of LVM the swap space is a LVM volume. + +------------------------------------------------------------------- +Tue Nov 26 10:09:11 CET 2019 - Marcus Schäfer + +- Bump version: 9.19.2 → 9.19.3 + +------------------------------------------------------------------- +Tue Nov 26 09:08:28 CET 2019 - Marcus Schäfer + +- Fixed access to device map for fstab setup + + Swap is an optional element in the device map. + Thus access to an element of that dictionary + should not fail + +------------------------------------------------------------------- +Mon Nov 25 22:04:44 CET 2019 - Marcus Schäfer + +- Bump version: 9.19.1 → 9.19.2 + +------------------------------------------------------------------- +Mon Nov 25 17:35:46 CET 2019 - Marcus Schäfer + +- Fixed VolumeManager device map handling + + The former implementation builds a new device map which is + a subset of the low level device map. However due to the + additional swap partition the maps provided by the VolumeManager + classes are now incomplete. Instead this commit changes the + VolumeManager interface to receive the current low level + device_map and merged device changes on top of it when + needed. + +------------------------------------------------------------------- +Mon Nov 25 15:53:14 CET 2019 - Marcus Schäfer + +- Bump version: 9.19.0 → 9.19.1 + +------------------------------------------------------------------- +Mon Nov 25 15:51:19 CET 2019 - Marcus Schäfer + +- Fixed runtime checks on volume label setup + + Fixed the checks for check_volume_setup_defines_reserved_labels + and check_volume_label_used_with_lvm. Both checks needs to + skip on the kiwi internally created volume named LVSwap + +------------------------------------------------------------------- +Mon Nov 25 15:23:29 CET 2019 - Marcus Schäfer + +- Delete superfluous .osc metadata from build tests + + Not sure how and why the .osc buildservice metadata + was added to the git but it's for sure not needed + +------------------------------------------------------------------- +Mon Nov 25 15:19:01 CET 2019 - Marcus Schäfer + +- Bump version: 9.18.35 → 9.19.0 + +------------------------------------------------------------------- +Mon Nov 25 10:10:55 CET 2019 - Marcus Schäfer + +- Added check_volume_setup_defines_reserved_labels + + Check to prevent using reserved filesystem labels in LVM + volume definitions + +------------------------------------------------------------------- +Thu Nov 21 18:12:42 CET 2019 - David Cassany + +- Include grub.cfg inside the efi partition + + This commit ensures the grub.cfg file is included within the vfat efi + partition. + + This fixes #1271 and bsc#1157354 + +------------------------------------------------------------------- +Wed Nov 20 19:41:23 CET 2019 - Marcus Schäfer + +- Fixed extending LVM volumes + + For extending the LVM volumes a resize prefix is set for each + volume. If no extra prefix is needed it can happen that the + former prefix setting is used which is wrong. The resize + prefix must be reset for each new volume iteration + ------------------------------------------------------------------- Wed Nov 20 12:37:19 CET 2019 - Marcus Schäfer - Bump version: 9.18.34 → 9.18.35 +------------------------------------------------------------------- +Tue Nov 19 17:09:46 CET 2019 - Marcus Schäfer + +- Prevent swap partition to be the last one + + In an OEM deployment that requested the creation of a swap + partition via that swap partition was created + at first boot and was always the last partition on the disk. + This was required because it could not be placed before + any other partition without destroying those partition + contents. This process leaves the system in an inflexible + condition if the storage device can change its geometry + dynamicly as it's the case for SAN systems. The typical + deployment target for OEM images are SAN storage clusters + and it's cumbersome to resize the root partition if swap + is last. + + This commit Fixes #1231 and changes the handling of swap if + requested via as follows: + + 1. The swap space is created as part of the image build process + and no longer on first boot of the image via dracut code. + This increases the size of the non compressed .raw disk image + by the configured swap space size or the default. The + compressed versions are not affected since zero initialized + swap space compresses to almost no space. Deployment of + the image however also deploys the swap partition which + increases deployment time. For big swap configurations + it's advisable to switch off image verification via + oem-skip-verify. For very big swap configurations it's + also recommended to prevent kiwi from adding them as part + of the image and let them be created on first boot via + a systemd service that e.g places a swap file, or creates + a swap volume when possible such that the fexibility to + resize the rootfs is still available. + + 2. The setup of the swap space is now explicit. It's no longer + calculated by twice times RAM size because on newer machines + this could lead to huge numbers. Either the kiwi encoded + default swap size applies or the user configured value. + + 3. LVM based oem disks creates the swap space as logical volume. + The volume is created as part of the image build process + and no longer on first boot. The swap volume at build time + of the image is of a minimal size and gets resized on first + boot. + + 4. The move of the swap creation into the builder code also + handles swap per configured device persistency schema like + any other devices. This means by default swap is mounted + via by-uuid name and thus also Fixes #1259 + ------------------------------------------------------------------- Tue Nov 19 17:06:05 CET 2019 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index ff0695f..bd85363 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.18.35 +Version: 9.19.5 Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index e24b167..e7e9f29 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:ab8c3276456217f1d94e1cf97dd5b051ffd98df4c42daa90a217d9bf16c56b50 -size 1636303 +oid sha256:17a6e0a971362aa6bb52cb0ab9fdb3742e7cbbb76c4213e5a7bc7343dc56d60d +size 1637511 From ef04a5c99a988756d2ccf8f9886338d152192ece4916e21d4672833303f88b5b Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Thu, 5 Dec 2019 09:14:49 +0000 Subject: [PATCH 5/6] =?UTF-8?q?-=20Bump=20version:=209.19.5=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.19.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixup package list for GCE integration test Package growpart-rootgrow does no longer exist. Will be replaced by a partgrow implementation - Fixed root setup when building in OBS When building in an OBS worker no udevd is running which prevents grub2-mkconfig from finding the by-* device nodes and it puts the local loop device in which is wrong. Therefore the patching code used for overlay disk configurations also applies when building in an OBS worker environment. This Fixes #1287 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=158 --- python-kiwi.changes | 24 ++++++++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index f43b735..06dc35d 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Dec 04 17:36:55 CET 2019 - Marcus Schäfer + +- Bump version: 9.19.5 → 9.19.6 + +------------------------------------------------------------------- +Wed Dec 04 16:21:49 CET 2019 - Marcus Schäfer + +- Fixup package list for GCE integration test + + Package growpart-rootgrow does no longer exist. Will be + replaced by a partgrow implementation + +------------------------------------------------------------------- +Wed Dec 04 10:44:49 CET 2019 - Marcus Schäfer + +- Fixed root setup when building in OBS + + When building in an OBS worker no udevd is running which prevents + grub2-mkconfig from finding the by-* device nodes and it puts the + local loop device in which is wrong. Therefore the patching code + used for overlay disk configurations also applies when building + in an OBS worker environment. This Fixes #1287 + ------------------------------------------------------------------- Mon Dec 02 12:26:03 CET 2019 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index bd85363..225fc90 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.19.5 +Version: 9.19.6 Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index e7e9f29..47b28ed 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:17a6e0a971362aa6bb52cb0ab9fdb3742e7cbbb76c4213e5a7bc7343dc56d60d -size 1637511 +oid sha256:abe996bf253058941e70806413e22135a95e6cd5a02d12591f42e62b8a76f9ac +size 1637433 From b593695a76691823f33e849f038707c865fabdb7766b9ca6a4b86a3639451a27 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 10 Dec 2019 09:10:55 +0000 Subject: [PATCH 6/6] =?UTF-8?q?-=20Bump=20version:=209.19.6=20=C3=A2?= =?UTF-8?q?=E2=80=A0=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