From 83cf107db11a1f0c7221082bb08314edb03537c9bed65cd30cfae7a282b3bccf Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 6 Mar 2018 14:59:22 +0000 Subject: [PATCH 1/3] =?UTF-8?q?-=20Bump=20version:=209.13.3=20=E2=86=92=20?= =?UTF-8?q?9.13.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use LABEL for the swap partition If multipath and device maps are active the fstab entry should use the LABEL reference. Systemd calls swapon and it only works properly with multipath devices when LABEL reference is used or calling directly on the /dev/dm-* device file. - Bump version: 9.13.2 → 9.13.3 - The order of the options for mkisofs matters Setting -eltorito-platform after -b causes mkisofs to fail - Resize partition table after image resize The command 'kiwi image resize' allows to resize the size of a disk image. Depending on the partition table type it is also required to resize the partition table inside of the image to let the file size change become effective This Fixes #534 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=93 --- python-kiwi.changes | 172 +++++++++++++++++++++++++++++++++++++++++++- python-kiwi.spec | 14 +++- python-kiwi.tar.gz | 4 +- 3 files changed, 186 insertions(+), 4 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 2b50d79..30a9ce9 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,6 +1,162 @@ +------------------------------------------------------------------- +Tue Mar 6 15:51:52 CET 2018 - ms@suse.de + +- Bump version: 9.13.3 → 9.13.4 + +------------------------------------------------------------------- +Mon Mar 5 18:00:26 CET 2018 - dcassany@suse.com + +- Use LABEL for the swap partition + + If multipath and device maps are active the fstab entry should use + the LABEL reference. Systemd calls swapon and it only works properly + with multipath devices when LABEL reference is used or calling directly + on the /dev/dm-* device file. + +------------------------------------------------------------------- +Sat Mar 3 18:29:01 CET 2018 - ms@suse.de + +- Bump version: 9.13.2 → 9.13.3 + +------------------------------------------------------------------- +Fri Mar 2 16:39:44 CET 2018 - ms@suse.de + +- The order of the options for mkisofs matters + + Setting -eltorito-platform after -b causes mkisofs to fail + +------------------------------------------------------------------- +Fri Mar 2 16:31:14 CET 2018 - ms@suse.de + +- Resize partition table after image resize + + The command 'kiwi image resize' allows to resize the size + of a disk image. Depending on the partition table type it + is also required to resize the partition table inside of + the image to let the file size change become effective + This Fixes #534 + +------------------------------------------------------------------- +Fri Mar 2 16:18:13 CET 2018 - MichalMarek1@eaton.com + +- APT: Support patternType in the bootstrap phase + + With patternType="onlyRequired" (the default), run debootstrap with +--variant=minbase to install only essential packages. With + patternType="plusRecommended", let debootstrap also install important + packages. This is not exactly what the patternType keyword means with + other targets, but it allows to choose between an absolutely minimal + image and a small but usable system. + +------------------------------------------------------------------- +Fri Mar 2 14:56:28 CET 2018 - ms@suse.de + +- Bump version: 9.13.1 → 9.13.2 + +------------------------------------------------------------------- +Fri Mar 2 10:56:11 CET 2018 - dcassany@suse.com + +- Reactivate device mappings after repart. Fixes #645 + + This commit recreates removed device maps and triggers again + systemd generators in order to adapt again device units to the + new context. Fixes #645 + +------------------------------------------------------------------- +Fri Mar 2 10:05:48 CET 2018 - ms@suse.de + +- Refactor ovftool check + + The way this was done mask errors from the call + with the check if the tool exists on the host. + This patch refactors this and makes clear where + we check for the tool to be installed and where + we actually call it + +------------------------------------------------------------------- +Fri Mar 2 10:04:13 CET 2018 - ms@suse.de + +- Extend has_option_in_help to also check error data + +------------------------------------------------------------------- +Thu Mar 1 14:58:38 CET 2018 - ms@suse.de + +- Check if isotool supports eltorito-platform option + + Along with the change there is a small refactoring to + populate the iso tool search to the public api of the + Iso class + +------------------------------------------------------------------- +Thu Mar 1 10:23:52 CET 2018 - ms@suse.de + +- Set eltorito-platform for efi + + The default eltorito platform is set to "x86_64 PC", however + in an alternative bootloader spec for efi this would be the + wrong platform spec. This patch adds the correct platform + to the alt-boot setup for efi. References #643 + +------------------------------------------------------------------- +Wed Feb 28 15:41:58 CET 2018 - ms@suse.de + +- Fixup obs test status helper + + Use osc results output to get better status information + +------------------------------------------------------------------- +Wed Feb 28 10:47:29 CET 2018 - ms@suse.de + +- Fixed get_free_disk_bytes in dracut kiwi-lib + + The method used any device from the lsblk output, but it can + happen that some device nodes with different name point to + the same physical device. The method would then calculate + the free space wrong. This patch takes the PARTUUID value + into account to make sure any partition device size is used + only once. This Fixes #648 + +------------------------------------------------------------------- +Tue Feb 27 12:34:52 CET 2018 - tom_schr@web.de + +- Use pytest instead of py.test + + From pytest 3.0, it is recommended to use "pytest" as the main + command. The use of "py.test" is deprecated and is potentially removed + in the future. + +------------------------------------------------------------------- +Tue Feb 27 11:04:15 CET 2018 - ms@suse.de + +- Update tox setup + + Add python 3.6 target and activate it for the travis + and the local make targets + + Use major python version for the check(flake) and doc + targets where the interpreter minor version is not + primarily important + + This references #641 + +------------------------------------------------------------------- +Tue Feb 27 10:52:39 CET 2018 - ms@suse.de + +- Update yast setup documentation + + Incorporate changes per review by Tom + +------------------------------------------------------------------- +Mon Feb 26 18:03:38 CET 2018 - ms@suse.de + +- Fixed oem build test + + bind-utils explicitly required for obs to be able + to resolve the package dependencies + ------------------------------------------------------------------- Mon Feb 26 17:46:55 CET 2018 - ms@suse.de - + - Bump version: 9.13.0 → 9.13.1 ------------------------------------------------------------------- @@ -26,6 +182,11 @@ Fri Feb 23 16:00:06 CET 2018 - ms@suse.de - Cleanup config functions shell coding +------------------------------------------------------------------- +Fri Feb 23 12:20:52 CET 2018 - amajer@suse.de + +- Use mkisofs instead of wodim + ------------------------------------------------------------------- Fri Feb 23 11:37:58 CET 2018 - ms@suse.de @@ -107,6 +268,15 @@ Tue Feb 20 14:56:11 CET 2018 - ms@suse.de the call is performed. This could be either the host system or the created image root. This Fixes #624 +------------------------------------------------------------------- +Tue Feb 20 13:41:36 CET 2018 - MichalMarek1@eaton.com + +- APT: Run debootstrap with --variant=minbase + + This selects only packages with Priority: required, which is more in + line with what the other package managers are doing. A patch for + kiwi-descriptions has been submitted to adapt to this new behavior. + ------------------------------------------------------------------- Fri Feb 16 11:58:16 CET 2018 - ms@suse.de diff --git a/python-kiwi.spec b/python-kiwi.spec index 5d498b8..9b48c20 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -38,7 +38,7 @@ %endif Name: python-kiwi -Version: 9.13.1 +Version: 9.13.4 Provides: kiwi-schema = 6.6 Release: 0 Url: https://github.com/SUSE/kiwi @@ -136,7 +136,11 @@ Requires: gdisk %endif Requires: dosfstools Requires: e2fsprogs +%if 0%{?suse_version} >= 1500 +Requires: mkisofs +%else Requires: genisoimage +%endif Requires: grub2 Requires: kiwi-man-pages Requires: kiwi-tools @@ -210,7 +214,11 @@ Provides: kiwi-packagemanager:zypper %endif Requires: dosfstools Requires: e2fsprogs +%if 0%{?suse_version} >= 1500 +Requires: mkisofs +%else Requires: genisoimage +%endif Requires: grub2 Requires: kiwi-man-pages Requires: kiwi-tools @@ -372,11 +380,15 @@ Requires: dmsetup Requires: device-mapper %endif Requires: dracut +%if 0%{?suse_version} >= 1500 +Requires: mkisofs +%else %if 0%{?fedora} || 0%{?rhel} || 0%{?debian} || 0%{?ubuntu} Requires: genisoimage %else Requires: cdrkit-cdrtools-compat %endif +%endif License: GPL-3.0+ Group: %{sysgroup} diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 78aef2e..22d63e0 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:22d22aa83bb17ec78ff441f89f1dd795329e71c682dbaa3e2717f519a18263d6 -size 509168 +oid sha256:5a7ed57f3f28e75e8642f259573872ed131f2d688d56330025af5403d595477b +size 510305 From ea1744b1d61df624382fb2705a56b09f2eb7cbc02aa7651cbb595a076940baaa Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 6 Mar 2018 16:08:59 +0000 Subject: [PATCH 2/3] =?UTF-8?q?-=20Bump=20version:=209.13.4=20=E2=86=92=20?= =?UTF-8?q?9.13.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed btrfs search path in earlyboot script If kiwi generates its own efi image for the boot process it does not setup the btrfs relative path setup in the earlyboot script embedded into the generated efi image. This has a bad impact on the file search because the btrfs setup done in kiwi puts root below the @ volume which we then need to specify of the relative lookup is not activated. Fixes bsc#1082155 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=94 --- python-kiwi.changes | 20 ++++++++++- python-kiwi.spec | 85 ++++++++++++++++++++------------------------- python-kiwi.tar.gz | 4 +-- 3 files changed, 58 insertions(+), 51 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 30a9ce9..0659a24 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,6 +1,24 @@ +------------------------------------------------------------------- +Tue Mar 6 17:01:58 CET 2018 - ms@suse.de + +- Bump version: 9.13.4 → 9.13.5 + +------------------------------------------------------------------- +Tue Mar 6 16:43:35 CET 2018 - ms@suse.de + +- Fixed btrfs search path in earlyboot script + + If kiwi generates its own efi image for the boot process + it does not setup the btrfs relative path setup in the + earlyboot script embedded into the generated efi image. + This has a bad impact on the file search because the + btrfs setup done in kiwi puts root below the @ volume + which we then need to specify of the relative lookup + is not activated. Fixes bsc#1082155 + ------------------------------------------------------------------- Tue Mar 6 15:51:52 CET 2018 - ms@suse.de - + - Bump version: 9.13.3 → 9.13.4 ------------------------------------------------------------------- diff --git a/python-kiwi.spec b/python-kiwi.spec index 9b48c20..ba96154 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -1,7 +1,7 @@ # -# spec file for package kiwi +# spec file for package python-kiwi # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,13 +11,11 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# -# Please submit bugfixes or comments via: -# -# https://github.com/SUSE/kiwi/issues + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# If they aren't provided by a system installed macro, define them + %{!?_defaultdocdir: %global _defaultdocdir %{_datadir}/doc} %{!?__python2: %global __python2 /usr/bin/python2} @@ -38,24 +36,23 @@ %endif Name: python-kiwi -Version: 9.13.4 -Provides: kiwi-schema = 6.6 +Version: 9.13.5 Release: 0 +Provides: kiwi-schema = 6.6 Url: https://github.com/SUSE/kiwi Summary: KIWI - Appliance Builder Next Generation License: GPL-3.0+ +Group: %{pygroup} %if %{_vendor} == "debbuild" # Needed to set Maintainer in output debs -Packager: Marcus Schaefer %endif -Group: %{pygroup} Source: %{name}.tar.gz Source1: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora} || 0%{?suse_version} +BuildRequires: fdupes BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: fdupes %endif BuildRequires: python-%{develsuffix} BuildRequires: python-setuptools @@ -103,19 +100,19 @@ Requires(postun): update-alternatives %ifarch x86_64 Requires: grub2-x86_64-efi %endif -Requires: qemu-tools -Requires: multipath-tools -Requires: squashfs Requires: gptfdisk +Requires: multipath-tools +Requires: qemu-tools +Requires: squashfs %endif %if 0%{?fedora} || 0%{?rhel} -Requires: chkconfig +Requires: chkconfig Requires(post): chkconfig Requires(postun): chkconfig -Requires: qemu-img -Requires: squashfs-tools Requires: device-mapper-multipath Requires: gdisk +Requires: qemu-img +Requires: squashfs-tools Requires: yum Provides: kiwi-packagemanager:yum %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -129,10 +126,10 @@ Provides: kiwi-packagemanager:zypper %endif %if 0%{?debian} || 0%{?ubuntu} Requires: debootstrap +Requires: gdisk +Requires: multipath-tools Requires: qemu-utils Requires: squashfs-tools -Requires: multipath-tools -Requires: gdisk %endif Requires: dosfstools Requires: e2fsprogs @@ -186,19 +183,19 @@ Requires(postun): update-alternatives %ifarch x86_64 Requires: grub2-x86_64-efi %endif -Requires: qemu-tools -Requires: multipath-tools -Requires: squashfs Requires: gptfdisk +Requires: multipath-tools +Requires: qemu-tools +Requires: squashfs %endif %if 0%{?fedora} || 0%{?rhel} -Requires: chkconfig +Requires: chkconfig Requires(post): chkconfig Requires(postun): chkconfig -Requires: qemu-img -Requires: squashfs-tools Requires: device-mapper-multipath Requires: gdisk +Requires: qemu-img +Requires: squashfs-tools %endif %if 0%{?rhel} && 0%{?rhel} < 8 Requires: yum @@ -243,7 +240,6 @@ virtualization and cloud systems like Xen, KVM, VMware, EC2 and more. %package -n kiwi-tools Summary: KIWI - Collection of Boot Helper Tools -License: GPL-3.0+ Group: %{sysgroup} %description -n kiwi-tools @@ -256,14 +252,13 @@ outside of the scope of kiwi appliance building. %ifarch %ix86 x86_64 %package -n kiwi-pxeboot Summary: KIWI - PXE boot structure +Group: %{sysgroup} Requires: syslinux %if 0%{?fedora} || 0%{?rhel} Requires(pre): shadow-utils %else Requires(pre): shadow %endif -License: GPL-3.0+ -Group: %{sysgroup} %description -n kiwi-pxeboot This package contains the basic PXE directory structure which is @@ -273,6 +268,7 @@ needed to serve kiwi built images via PXE. %package -n dracut-kiwi-lib Summary: KIWI - Dracut kiwi Library +Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required @@ -289,28 +285,26 @@ Requires: btrfsprogs Requires: gptfdisk %endif Requires: coreutils +Requires: curl +Requires: dialog Requires: e2fsprogs Requires: grep Requires: lvm2 Requires: mdadm Requires: parted +Requires: pv Requires: util-linux Requires: xfsprogs -Requires: dialog -Requires: pv -Requires: curl %if 0%{?debian} || 0%{?ubuntu} -Requires: xz-utils Requires: dmsetup +Requires: xz-utils %else -Requires: xz Requires: device-mapper +Requires: xz %endif %ifarch s390 s390x Requires: s390-tools %endif -License: GPL-3.0+ -Group: %{sysgroup} %description -n dracut-kiwi-lib This package contains a collection of methods to provide a library @@ -318,6 +312,7 @@ for tasks done in other kiwi dracut modules %package -n dracut-kiwi-oem-repart Summary: KIWI - Dracut module for oem(repart) image type +Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required @@ -325,8 +320,6 @@ Summary: KIWI - Dracut module for oem(repart) image type BuildRequires: dracut %endif Requires: dracut-kiwi-lib -License: GPL-3.0+ -Group: %{sysgroup} %description -n dracut-kiwi-oem-repart This package contains the kiwi-repart dracut module which is @@ -335,15 +328,16 @@ geometry according to the setup in the kiwi image configuration %package -n dracut-kiwi-oem-dump Summary: KIWI - Dracut module for oem(install) image type +Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required # to set up the build environment... BuildRequires: dracut %endif +Requires: dmraid Requires: dracut-kiwi-lib Requires: kexec-tools -Requires: dmraid %if 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu} Requires: multipath-tools %endif @@ -351,8 +345,6 @@ Requires: multipath-tools Requires: device-mapper-multipath %endif Requires: gawk -License: GPL-3.0+ -Group: %{sysgroup} %description -n dracut-kiwi-oem-dump This package contains the kiwi-dump dracut module which is @@ -364,6 +356,7 @@ remote %package -n dracut-kiwi-live Summary: KIWI - Dracut module for iso(live) image type +Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required @@ -371,9 +364,9 @@ Summary: KIWI - Dracut module for iso(live) image type BuildRequires: dracut %endif Requires: dialog -Requires: xfsprogs Requires: e2fsprogs Requires: util-linux +Requires: xfsprogs %if 0%{?debian} || 0%{?ubuntu} Requires: dmsetup %else @@ -389,8 +382,6 @@ Requires: genisoimage Requires: cdrkit-cdrtools-compat %endif %endif -License: GPL-3.0+ -Group: %{sysgroup} %description -n dracut-kiwi-live This package contains the kiwi-live dracut module which is used @@ -398,16 +389,15 @@ for booting iso(live) images built with KIWI %package -n dracut-kiwi-overlay Summary: KIWI - Dracut module for vmx(+overlay) image type +Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required # to set up the build environment... BuildRequires: dracut %endif -Requires: util-linux Requires: dracut -License: GPL-3.0+ -Group: %{sysgroup} +Requires: util-linux %description -n dracut-kiwi-overlay This package contains the kiwi-overlay dracut module which is used @@ -416,7 +406,6 @@ overlay root filesystem %package -n kiwi-man-pages Summary: KIWI - manual pages -License: GPL-3.0+ Group: %{sysgroup} %description -n kiwi-man-pages diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 22d63e0..68d939e 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:5a7ed57f3f28e75e8642f259573872ed131f2d688d56330025af5403d595477b -size 510305 +oid sha256:dd4740a20869dd0a38a14736c52a1575f8b4ba9634896e957e8ee761e4bcf662 +size 510977 From d61e009df4d07be4bb7023485e1f49480903f79641122412c59032102e1fecf5 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 6 Mar 2018 16:09:13 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=95 --- python-kiwi.spec | 79 +++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/python-kiwi.spec b/python-kiwi.spec index ba96154..35ea6ae 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -1,7 +1,7 @@ # -# spec file for package python-kiwi +# spec file for package kiwi # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,11 +11,13 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# +# Please submit bugfixes or comments via: +# +# https://github.com/SUSE/kiwi/issues # - +# If they aren't provided by a system installed macro, define them %{!?_defaultdocdir: %global _defaultdocdir %{_datadir}/doc} %{!?__python2: %global __python2 /usr/bin/python2} @@ -37,22 +39,23 @@ Name: python-kiwi Version: 9.13.5 -Release: 0 Provides: kiwi-schema = 6.6 +Release: 0 Url: https://github.com/SUSE/kiwi Summary: KIWI - Appliance Builder Next Generation License: GPL-3.0+ -Group: %{pygroup} %if %{_vendor} == "debbuild" # Needed to set Maintainer in output debs +Packager: Marcus Schaefer %endif +Group: %{pygroup} Source: %{name}.tar.gz Source1: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora} || 0%{?suse_version} -BuildRequires: fdupes BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: fdupes %endif BuildRequires: python-%{develsuffix} BuildRequires: python-setuptools @@ -100,19 +103,19 @@ Requires(postun): update-alternatives %ifarch x86_64 Requires: grub2-x86_64-efi %endif -Requires: gptfdisk -Requires: multipath-tools Requires: qemu-tools +Requires: multipath-tools Requires: squashfs +Requires: gptfdisk %endif %if 0%{?fedora} || 0%{?rhel} -Requires: chkconfig +Requires: chkconfig Requires(post): chkconfig Requires(postun): chkconfig -Requires: device-mapper-multipath -Requires: gdisk Requires: qemu-img Requires: squashfs-tools +Requires: device-mapper-multipath +Requires: gdisk Requires: yum Provides: kiwi-packagemanager:yum %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -126,10 +129,10 @@ Provides: kiwi-packagemanager:zypper %endif %if 0%{?debian} || 0%{?ubuntu} Requires: debootstrap -Requires: gdisk -Requires: multipath-tools Requires: qemu-utils Requires: squashfs-tools +Requires: multipath-tools +Requires: gdisk %endif Requires: dosfstools Requires: e2fsprogs @@ -183,19 +186,19 @@ Requires(postun): update-alternatives %ifarch x86_64 Requires: grub2-x86_64-efi %endif -Requires: gptfdisk -Requires: multipath-tools Requires: qemu-tools +Requires: multipath-tools Requires: squashfs +Requires: gptfdisk %endif %if 0%{?fedora} || 0%{?rhel} -Requires: chkconfig +Requires: chkconfig Requires(post): chkconfig Requires(postun): chkconfig -Requires: device-mapper-multipath -Requires: gdisk Requires: qemu-img Requires: squashfs-tools +Requires: device-mapper-multipath +Requires: gdisk %endif %if 0%{?rhel} && 0%{?rhel} < 8 Requires: yum @@ -240,6 +243,7 @@ virtualization and cloud systems like Xen, KVM, VMware, EC2 and more. %package -n kiwi-tools Summary: KIWI - Collection of Boot Helper Tools +License: GPL-3.0+ Group: %{sysgroup} %description -n kiwi-tools @@ -252,13 +256,14 @@ outside of the scope of kiwi appliance building. %ifarch %ix86 x86_64 %package -n kiwi-pxeboot Summary: KIWI - PXE boot structure -Group: %{sysgroup} Requires: syslinux %if 0%{?fedora} || 0%{?rhel} Requires(pre): shadow-utils %else Requires(pre): shadow %endif +License: GPL-3.0+ +Group: %{sysgroup} %description -n kiwi-pxeboot This package contains the basic PXE directory structure which is @@ -268,7 +273,6 @@ needed to serve kiwi built images via PXE. %package -n dracut-kiwi-lib Summary: KIWI - Dracut kiwi Library -Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required @@ -285,26 +289,28 @@ Requires: btrfsprogs Requires: gptfdisk %endif Requires: coreutils -Requires: curl -Requires: dialog Requires: e2fsprogs Requires: grep Requires: lvm2 Requires: mdadm Requires: parted -Requires: pv Requires: util-linux Requires: xfsprogs +Requires: dialog +Requires: pv +Requires: curl %if 0%{?debian} || 0%{?ubuntu} -Requires: dmsetup Requires: xz-utils +Requires: dmsetup %else -Requires: device-mapper Requires: xz +Requires: device-mapper %endif %ifarch s390 s390x Requires: s390-tools %endif +License: GPL-3.0+ +Group: %{sysgroup} %description -n dracut-kiwi-lib This package contains a collection of methods to provide a library @@ -312,7 +318,6 @@ for tasks done in other kiwi dracut modules %package -n dracut-kiwi-oem-repart Summary: KIWI - Dracut module for oem(repart) image type -Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required @@ -320,6 +325,8 @@ Group: %{sysgroup} BuildRequires: dracut %endif Requires: dracut-kiwi-lib +License: GPL-3.0+ +Group: %{sysgroup} %description -n dracut-kiwi-oem-repart This package contains the kiwi-repart dracut module which is @@ -328,16 +335,15 @@ geometry according to the setup in the kiwi image configuration %package -n dracut-kiwi-oem-dump Summary: KIWI - Dracut module for oem(install) image type -Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required # to set up the build environment... BuildRequires: dracut %endif -Requires: dmraid Requires: dracut-kiwi-lib Requires: kexec-tools +Requires: dmraid %if 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu} Requires: multipath-tools %endif @@ -345,6 +351,8 @@ Requires: multipath-tools Requires: device-mapper-multipath %endif Requires: gawk +License: GPL-3.0+ +Group: %{sysgroup} %description -n dracut-kiwi-oem-dump This package contains the kiwi-dump dracut module which is @@ -356,7 +364,6 @@ remote %package -n dracut-kiwi-live Summary: KIWI - Dracut module for iso(live) image type -Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required @@ -364,9 +371,9 @@ Group: %{sysgroup} BuildRequires: dracut %endif Requires: dialog +Requires: xfsprogs Requires: e2fsprogs Requires: util-linux -Requires: xfsprogs %if 0%{?debian} || 0%{?ubuntu} Requires: dmsetup %else @@ -382,6 +389,8 @@ Requires: genisoimage Requires: cdrkit-cdrtools-compat %endif %endif +License: GPL-3.0+ +Group: %{sysgroup} %description -n dracut-kiwi-live This package contains the kiwi-live dracut module which is used @@ -389,15 +398,16 @@ for booting iso(live) images built with KIWI %package -n dracut-kiwi-overlay Summary: KIWI - Dracut module for vmx(+overlay) image type -Group: %{sysgroup} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian} # Ubuntu 16.04 OBS environments refuse to set up due to # initramfs-tools / dracut conflict and initramfs-tools is required # to set up the build environment... BuildRequires: dracut %endif -Requires: dracut Requires: util-linux +Requires: dracut +License: GPL-3.0+ +Group: %{sysgroup} %description -n dracut-kiwi-overlay This package contains the kiwi-overlay dracut module which is used @@ -406,6 +416,7 @@ overlay root filesystem %package -n kiwi-man-pages Summary: KIWI - manual pages +License: GPL-3.0+ Group: %{sysgroup} %description -n kiwi-man-pages