Hello community, here is the log from the commit of package python-kiwi for openSUSE:Factory checked in at 2018-02-21 14:10:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kiwi (Old) and /work/SRC/openSUSE:Factory/.python-kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwi" Wed Feb 21 14:10:23 2018 rev:20 rq:578322 version:9.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes 2018-02-16 21:39:02.319278839 +0100 +++ /work/SRC/openSUSE:Factory/.python-kiwi.new/python-kiwi.changes 2018-02-21 14:10:26.960397973 +0100 @@ -1,0 +2,55 @@ +Fri Feb 16 11:58:16 CET 2018 - m...@suse.de + +- Bump version: 9.12.9 → 9.13.0 + +------------------------------------------------------------------- +Thu Feb 15 14:46:21 CET 2018 - m...@suse.de + +- Fixup grub2 theme setup + + The presence of a background file was mandatory for kiwi to + use the theme. But the background information is optional + +------------------------------------------------------------------- +Wed Feb 14 11:49:19 CET 2018 - m...@suse.de + +- Deleted obsolete boot descriptions + + The custom kiwi boot descriptions has been moved into + the kiwi-descriptions github repo and builds the compat + package kiwi-boot-descriptions from there. The build + of the boot image(initrd) is done by dracut and the + dracut module packages provided by kiwi. The classic + custom boot descriptions can still be used as alternative + method if the above package is installed. Related to + Issue #576 + +------------------------------------------------------------------- +Tue Feb 13 13:00:36 CET 2018 - m...@suse.de + +- Create compatible boot options + + The boot option root=install:CDLABEL= is mandatory for install + images which uses the dracut initrd system. But for the custom + kiwi oemboot descriptions this is causing a problem when detecting + the install device. Thus the above boot option is only applied + for the initrd system which actually makes use of it + +------------------------------------------------------------------- +Tue Feb 13 12:27:15 CET 2018 - m...@suse.de + +- Update boot description search path + + With the move of the boot descriptions in its own package + the kiwi search path needs to be adapted to look for boot + descriptions in /usr/share/kiwi/custom_boot. In addition + a runtime check to exit early if the boot description could + not be found or is not specified will be provided. Related + to Issue #576 + +------------------------------------------------------------------- +Tue Feb 13 10:37:16 CET 2018 - dcass...@suse.com + +- Update the docs to the current example present in kiwi-descriptions + +------------------------------------------------------------------- Old: ---- python-kiwi-boot-packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kiwi.spec ++++++ --- /var/tmp/diff_new_pack.HshMWC/_old 2018-02-21 14:10:28.124356057 +0100 +++ /var/tmp/diff_new_pack.HshMWC/_new 2018-02-21 14:10:28.128355913 +0100 @@ -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} @@ -24,92 +26,6 @@ %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %endif -# translate version id to distribution name as it is used in kiwi -# generic approach -%if 0%{?suse_version} -%define distro %(echo `export VER=%{suse_version}; echo "suse-${VER:0:2}.${VER:2:1}"`) -%endif - -# SLE12: -%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} -%define distro suse-SLES12 -%endif - -# SLE15: -%if 0%{?sle_version} == 150000 && !0%{?is_opensuse} -%define distro suse-SLES15 -%endif - -# Leap 42.1(openSUSE product based on SLE 12SP1): -%if 0%{?is_opensuse} && 0%{?sle_version} == 120100 -%define distro suse-leap42.1 -%endif - -# Leap 42.2: -%if 0%{?is_opensuse} && 0%{?sle_version} == 120200 -%define distro suse-leap42.2 -%endif - -# Leap 42.3: -%if 0%{?is_opensuse} && 0%{?sle_version} == 120300 -%define distro suse-leap42.3 -%endif - -# Leap 15.0: -%if 0%{?is_opensuse} && 0%{?sle_version} == 150000 -%define distro suse-leap15.0 -%endif - -# Leap 15.1: -%if 0%{?is_opensuse} && 0%{?sle_version} == 150100 -%define distro suse-leap15.1 -%endif - -# Leap 15.2: -%if 0%{?is_opensuse} && 0%{?sle_version} == 150200 -%define distro suse-leap15.2 -%endif - -# Leap 15.3: -%if 0%{?is_opensuse} && 0%{?sle_version} == 150300 -%define distro suse-leap15.3 -%endif - -# Tumbleweed: -# Current Tumbleweed version, moving target -%if 0%{?suse_version} >= 1330 && !0%{?sle_version} -%define distro suse-tumbleweed -%endif - -# SLES with sles_version macro -%if 0%{?sles_version} -%define distro suse-SLES%{sles_version} -%endif - -# RHEL // CentOS -# use the rhel templates for CentOS, too -%if 0%{?rhel} == 7 -%define distro rhel-07.0 -%endif - -# Fedora -# use the rhel templates for CentOS, too -%if 0%{?fedora} >= 25 -%define distro fedora-25.0 -%endif - -# Ubuntu -# Use xenial templates for 16.04 and newer -%if 0%{?ubuntu} >= 1604 -%define distro ubuntu-xenial -%endif - -# Debian -# Use the stretch templates for 9 and newer -%if 0%{?debian} >= 9 -%define distro debian-stretch -%endif - %if 0%{?debian} || 0%{?ubuntu} %global is_deb 1 %global pygroup python @@ -122,24 +38,24 @@ %endif Name: python-kiwi -Version: 9.12.9 -Release: 0 +Version: 9.13.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 <m...@suse.de> %endif +Group: %{pygroup} Source: %{name}.tar.gz -Source1: %{name}-boot-packages -Source2: %{name}-rpmlintrc +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 @@ -187,19 +103,19 @@ %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(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 @@ -213,10 +129,10 @@ %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 @@ -266,19 +182,19 @@ %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(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 @@ -319,6 +235,7 @@ %package -n kiwi-tools Summary: KIWI - Collection of Boot Helper Tools +License: GPL-3.0+ Group: %{sysgroup} %description -n kiwi-tools @@ -331,13 +248,14 @@ %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 @@ -347,7 +265,6 @@ %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 @@ -364,26 +281,28 @@ 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 @@ -391,7 +310,6 @@ %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 @@ -399,6 +317,8 @@ 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 @@ -407,16 +327,15 @@ %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 @@ -424,6 +343,8 @@ 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 @@ -435,7 +356,6 @@ %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 @@ -443,9 +363,9 @@ BuildRequires: dracut %endif Requires: dialog +Requires: xfsprogs Requires: e2fsprogs Requires: util-linux -Requires: xfsprogs %if 0%{?debian} || 0%{?ubuntu} Requires: dmsetup %else @@ -457,6 +377,8 @@ %else Requires: cdrkit-cdrtools-compat %endif +License: GPL-3.0+ +Group: %{sysgroup} %description -n dracut-kiwi-live This package contains the kiwi-live dracut module which is used @@ -464,64 +386,25 @@ %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 for booting vmx images built with KIWI and configured to use an overlay root filesystem -%if 0%{?suse_version} -%package -n kiwi-boot-requires -Summary: KIWI - buildservice package requirements for boot images -Group: %{sysgroup} -Provides: kiwi-boot:netboot -Provides: kiwi-boot:oemboot -Provides: kiwi-filesystem:btrfs -Provides: kiwi-filesystem:ext3 -Provides: kiwi-filesystem:ext4 -Provides: kiwi-filesystem:squashfs -Provides: kiwi-filesystem:xfs -Provides: kiwi-image:docker -Provides: kiwi-image:iso -Provides: kiwi-image:oem -Provides: kiwi-image:pxe -Provides: kiwi-image:tbz -Provides: kiwi-image:vmx -Requires: e2fsprogs -Requires: skopeo -Requires: umoci -Requires: xfsprogs -%if 0%{?fedora} || 0%{?rhel} || 0%{?debian} || 0%{?ubuntu} -Requires: btrfs-progs -%else -Requires: btrfsprogs -%endif -%if 0%{?fedora} || 0%{?suse_version} -Requires: python3-kiwi = %{version} -%else -Requires: python2-kiwi = %{version} -%endif -Requires: %(echo `cat %{S:1}|grep %{_target_cpu}:%{distro}:|cut -f3- -d:`) - -%description -n kiwi-boot-requires -Meta package for the buildservice to pull in all required packages in -order to have them in the buildservice created repositories to allow -kiwi to build the boot image. This package must never be published -nor installed by anybody else except for the buildservice, it is part -of the kiwi - buildservice integration exclusively -%endif - %package -n kiwi-man-pages Summary: KIWI - manual pages +License: GPL-3.0+ Group: %{sysgroup} %description -n kiwi-man-pages @@ -583,8 +466,6 @@ %if 0%{?fedora} || 0%{?suse_version} %fdupes %{buildroot}/srv/tftpboot -%fdupes %{buildroot}/%{python3_sitelib}/kiwi/boot -%fdupes %{buildroot}/%{python2_sitelib}/kiwi/boot %endif %post -n python2-kiwi @@ -713,9 +594,4 @@ %endif %endif -%if 0%{?suse_version} -%files -n kiwi-boot-requires -%defattr(-, root, root) -%endif - %changelog ++++++ python-kiwi-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.HshMWC/_old 2018-02-21 14:10:28.164354617 +0100 +++ /var/tmp/diff_new_pack.HshMWC/_new 2018-02-21 14:10:28.164354617 +0100 @@ -12,12 +12,18 @@ # don't blame on auto generated code addFilter("non-executable-script .*/xml_parse.py.*") +# don't blame on dracut scripts +addFilter("non-executable-script .*/dracut/modules.d.*") + # don't check uid for tftpboot addFilter("non-standard-uid .*") # don't check for buildroot usage, kiwi's Makefile uses the same var name addFilter("rpm-buildroot-usage .*") +# don't check position-independent-executable +addFilter("position-independent-executable-suggested .*") + # don't check for file duplicates addFilter("files-duplicate .*") addFilter("cross-directory-hard-link .*") ++++++ python-kiwi.tar.gz ++++++ ++++ 18799 lines of diff (skipped)
