- Bump version: 9.10.0 → 9.10.1

- Add LVM overhead for lvm based images LVM itself requires metadata stored in the metadata block kiwi did not take a size value for this data into account - Use dmsetup to cleanup device maps Instead of the broken kpartx -d we use dmsetup remove directly on the maps kiwi has created - Evaluate file strip before kernel strip Information from the optional <strip type="delete"> section was handled as part of the suseStripInitrd method which is called after suseStripKernel. However if a request to delete a driver file is part of the above mentioned strip section the checks for the driver dependency and also for potential superfluous firmware is not applied. Thus the evaluation of the <strip type="delete"> section happens earlier in the suseStripKernel method. Fixes #442 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=46
2017-07-25 12:14:06 +00:00 · 2017-07-25 12:14:06 +00:00 · 22835834a7
commit 22835834a7
parent 43771258c3
3 changed files with 218 additions and 34 deletions
--- a/python-kiwi.changes
+++ b/python-kiwi.changes
@ -1,8 +1,122 @@
+-------------------------------------------------------------------
+Tue Jul 25 12:16:05 CEST 2017 - ms@suse.de
+
+- Bump version: 9.10.0 → 9.10.1
+  
+-------------------------------------------------------------------
+Tue Jul 25 11:34:01 CEST 2017 - ms@suse.de
+  
+- Add LVM overhead for lvm based images
+  
+  LVM itself requires metadata stored in the metadata block
+  kiwi did not take a size value for this data into account
+  
+-------------------------------------------------------------------
+Tue Jul 25 11:32:28 CEST 2017 - ms@suse.de
+  
+- Use dmsetup to cleanup device maps
+  
+  Instead of the broken kpartx -d we use dmsetup remove
+  directly on the maps kiwi has created
+  
+-------------------------------------------------------------------
+Mon Jul 24 17:29:51 CEST 2017 - ms@suse.de
+  
+- Evaluate file strip before kernel strip
+  
+  Information from the optional <strip type="delete"> section
+  was handled as part of the suseStripInitrd method which is
+  called after suseStripKernel. However if a request to delete
+  a driver file is part of the above mentioned strip section
+  the checks for the driver dependency and also for potential
+  superfluous firmware is not applied. Thus the evaluation of
+  the <strip type="delete"> section happens earlier in the
+  suseStripKernel method. Fixes #442
+  
+-------------------------------------------------------------------
+Mon Jul 24 16:36:19 CEST 2017 - ms@suse.de
+  
+- Added ec2 integration test build to obs status
+  
+-------------------------------------------------------------------
+Mon Jul 24 16:30:34 CEST 2017 - ms@suse.de
+  
+- Added Xen setup runtime validation
+  
+  Added check_xen_uniquely_setup_as_server_or_guest runtime
+  check to check for a unique dom0 or domU guest setup
+  Fixes #429
+  
+-------------------------------------------------------------------
+Mon Jul 24 12:33:08 CEST 2017 - ms@suse.de
+  
+- Rebuild schema documentation
+  
+-------------------------------------------------------------------
+Mon Jul 24 12:05:02 CEST 2017 - ms@suse.de
+  
+- Make vmdisk optional for the machine setup
+  
+  The guest machine information might not require information about
+  the disk. Issue #429
+  
+-------------------------------------------------------------------
+Fri Jul 21 14:25:35 CEST 2017 - Jellyfrog@users.noreply.github.com
+  
+- Fix some spelling
+  
+-------------------------------------------------------------------
+Fri Jul 21 14:19:03 CEST 2017 - Jellyfrog@users.noreply.github.com
+  
+- Fix some spelling
+  
+-------------------------------------------------------------------
+Fri Jul 21 10:04:45 CEST 2017 - ms@suse.de
+  
+- Use the same option type (long form) for clarity
+  
+-------------------------------------------------------------------
+Thu Jul 20 16:21:59 CEST 2017 - ms@suse.de
+  
+- Use kernel compatible XZ options for kiwi initrd
+  
+  The kernel requires specific XZ options for the initrd
+  in order to read the compressed data. This values should
+  not be configurable by the user and are set to the same
+  options as used by dracut now. Fixes #435
+  
+-------------------------------------------------------------------
+Thu Jul 20 16:20:08 CEST 2017 - ms@suse.de
+  
+- Change default XZ compression options
+  
+  Use all cpu cores by default. Fixes #433
+  
+-------------------------------------------------------------------
+Thu Jul 20 15:34:09 CEST 2017 - ms@suse.de
+  
+- Update spec file provides for schema version
+  
 -------------------------------------------------------------------
 Thu Jul 20 14:34:23 CEST 2017 - ms@suse.de
-
+  
 - Bump version: 9.9.5 → 9.10.0
  
+-------------------------------------------------------------------
+Thu Jul 20 14:27:57 CEST 2017 - martin.mohring@5eecosystems.com
+  
+- fixed: fdupes is also available on Fedora
+  
+-------------------------------------------------------------------
+Thu Jul 20 13:16:27 CEST 2017 - martin.mohring@5eecosystems.com
+  
+- changed: simplify diff to orig spec file template
+  
+-------------------------------------------------------------------
+Thu Jul 20 13:01:03 CEST 2017 - martin.mohring@5eecosystems.com
+  
+- added: support for Fedora 25 / 26, fixed support for CentOS 7 in the spec file
+  
 -------------------------------------------------------------------
 Thu Jul 20 10:39:46 CEST 2017 - dcassany@suse.com
  
--- a/python-kiwi.spec
+++ b/python-kiwi.spec
@ -62,14 +62,20 @@

 # RHEL // CentOS
 # use the rhel templates for CentOS, too
-%if 0%{?rhel_version} == 700 || 0%{?centos_version} == 700
+%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
+
 Name:           python-kiwi
-Version:        9.10.0
+Version:        9.10.1
 Release:        0
-Provides:       kiwi-schema = 6.5
+Provides:       kiwi-schema = 6.6
 Url:            https://github.com/SUSE/kiwi
 Summary:        KIWI - Appliance Builder Next Generation
 License:        GPL-3.0+
@ -78,13 +84,20 @@ Source:         %{name}.tar.gz
 Source1:        %{name}-boot-packages
 Source2:        %{name}-rpmlintrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:  fdupes
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+%endif
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools
+%if 0%{?suse_version}
 BuildRequires:  shadow
 BuildRequires:  update-alternatives
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:  chkconfig
+%endif

 %description
 The KIWI Image System provides an operating system image builder
@ -102,7 +115,9 @@ Provides:       kiwi-image:pxe
 Provides:       kiwi-image:tbz
 Provides:       kiwi-image:vmx
 Provides:       python-kiwi = %{version}-%{release}
+%if 0%{?fedora} || 0%{?suse_version}
 Recommends:     jing
+%endif
 Requires:       python-PyYAML
 Requires:       python-docopt
 Requires:       python-future
@ -111,40 +126,52 @@ Requires:       python-requests
 Requires:       python-setuptools
 Requires:       python-six
 Requires:       python-xattr
+# tools used by kiwi
+%if 0%{?suse_version}
 Requires:       update-alternatives
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-# tools used by kiwi
-%if 0%{?suse_version}
-Requires:       squashfs
-Requires:       zypper
-Provides:       kiwi-packagemanager:zypper
+%ifarch x86_64
+Requires:       grub2-x86_64-efi
 %endif
-%if 0%{?rhel_version} || 0%{?centos_version}
+Requires:       gptfdisk
+Requires:       multipath-tools
+Requires:       qemu-tools
+Requires:       squashfs
+%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:       yum
 Provides:       kiwi-packagemanager:yum
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Requires:       dnf
+Provides:       kiwi-packagemanager:dnf
+%endif
+%endif
+%if 0%{?fedora} >= 26 || 0%{?suse_version}
+Requires:       zypper
+Provides:       kiwi-packagemanager:zypper
 %endif
 Requires:       dosfstools
 Requires:       e2fsprogs
 Requires:       genisoimage
-Requires:       gptfdisk
 Requires:       grub2
 Requires:       kiwi-man-pages
 Requires:       kiwi-tools
 Requires:       lvm2
 Requires:       mtools
-Requires:       multipath-tools
 Requires:       parted
-Requires:       qemu-tools
 Requires:       rsync
 Requires:       tar >= 1.2.7
 %ifarch %arm aarch64
 Requires:       u-boot-tools
 %endif
-%ifarch x86_64
-Requires:       grub2-x86_64-efi
-%endif
 %ifarch s390 s390x
 Requires:       s390-tools
 %endif
@ -154,6 +181,7 @@ Python 2 library of the KIWI Image System. Provides an operating system
 image builder for Linux supported hardware platforms as well as for
 virtualization and cloud systems like Xen, KVM, VMware, EC2 and more.

+%if 0%{?fedora} || 0%{?suse_version}
 # python3-kiwi
 %package -n python3-kiwi
 Summary:        KIWI - Appliance Builder Next Generation
@ -173,40 +201,54 @@ Requires:       python3-requests
 Requires:       python3-setuptools
 Requires:       python3-six
 Requires:       python3-xattr
+# tools used by kiwi
+%if 0%{?suse_version}
 Requires:       update-alternatives
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-# tools used by kiwi
-%if 0%{?suse_version}
-Requires:       squashfs
-Requires:       zypper
-Provides:       kiwi-packagemanager:zypper
+%ifarch x86_64
+Requires:       grub2-x86_64-efi
 %endif
-%if 0%{?rhel_version} || 0%{?centos_version}
+Requires:       gptfdisk
+Requires:       multipath-tools
+Requires:       qemu-tools
+Requires:       squashfs
+%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
+%endif
+%if 0%{?rhel} < 8
 Requires:       yum
 Provides:       kiwi-packagemanager:yum
 %endif
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Requires:       dnf
+Provides:       kiwi-packagemanager:dnf
+%endif
+%if 0%{?fedora} >= 26 || 0%{?suse_version}
+Requires:       zypper
+Provides:       kiwi-packagemanager:zypper
+%endif
 Requires:       dosfstools
 Requires:       e2fsprogs
 Requires:       genisoimage
-Requires:       gptfdisk
 Requires:       grub2
 Requires:       kiwi-man-pages
 Requires:       kiwi-tools
 Requires:       lvm2
 Requires:       mtools
-Requires:       multipath-tools
 Requires:       parted
-Requires:       qemu-tools
 Requires:       rsync
 Requires:       tar >= 1.2.7
 %ifarch %arm aarch64
 Requires:       u-boot-tools
 %endif
-%ifarch x86_64
-Requires:       grub2-x86_64-efi
-%endif
 %ifarch s390 s390x
 Requires:       s390-tools
 %endif
@ -216,6 +258,8 @@ Python 3 library of the KIWI Image System. Provides an operating system
 image builder for Linux supported hardware platforms as well as for
 virtualization and cloud systems like Xen, KVM, VMware, EC2 and more.

+%endif
+
 %package -n kiwi-tools
 Summary:        KIWI - Collection of Boot Helper Tools
 Group:          System/Management
@ -254,10 +298,18 @@ Provides:       kiwi-filesystem:ext3
 Provides:       kiwi-filesystem:ext4
 Provides:       kiwi-filesystem:squashfs
 Provides:       kiwi-filesystem:xfs
-Requires:       btrfsprogs
 Requires:       e2fsprogs
-Requires:       python3-kiwi = %{version}
 Requires:       xfsprogs
+%if 0%{?fedora} || 0%{?rhel}
+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
@ -281,15 +333,19 @@ Provides manual pages to describe the kiwi commands
 # Build Python 2 version
 python2 setup.py build --cflags="${RPM_OPT_FLAGS}"

+%if 0%{?fedora} || 0%{?suse_version}
 # Build Python 3 version
 python3 setup.py build --cflags="${RPM_OPT_FLAGS}"
+%endif

 %install
 # Install Python 2 version
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+%if 0%{?fedora} || 0%{?suse_version}
 # Install Python 3 version
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%endif

 # init alternatives setup
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
@ -316,9 +372,17 @@ for i in KIWI pxelinux.cfg image upload boot; do \
 done
 %endif

+%if  0%{?fedora} || 0%{?rhel}
+install -m 755 -d %{buildroot}/%{_defaultdocdir}/python-kiwi
+mv %{buildroot}/%{_defaultdocdir}/packages/python-kiwi/* %{buildroot}/%{_defaultdocdir}/python-kiwi
+rm -rf %{buildroot}/%{_defaultdocdir}/packages
+%endif
+
+%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
 %{_sbindir}/update-alternatives \
@ -328,6 +392,7 @@ done
 %{_sbindir}/update-alternatives \
    --install %_bindir/kiwicompat kiwicompat %_bindir/kiwicompat-2 10

+%if 0%{?fedora} || 0%{?suse_version}
 %post -n python3-kiwi
 %{_sbindir}/update-alternatives \
    --install %_bindir/kiwi kiwi %_bindir/kiwi-ng-3 10
@ -335,6 +400,7 @@ done
    --install %_bindir/kiwi-ng kiwi-ng %_bindir/kiwi-ng-3 10
 %{_sbindir}/update-alternatives \
    --install %_bindir/kiwicompat kiwicompat %_bindir/kiwicompat-3 10
+%endif

 %preun -n python2-kiwi
 %{_sbindir}/update-alternatives \
@ -344,6 +410,7 @@ done
 %{_sbindir}/update-alternatives \
    --remove kiwicompat %_bindir/kiwicompat

+%if 0%{?fedora} || 0%{?suse_version}
 %preun -n python3-kiwi
 %{_sbindir}/update-alternatives \
    --remove kiwi %_bindir/kiwi
@ -351,6 +418,7 @@ done
    --remove kiwi %_bindir/kiwi-ng
 %{_sbindir}/update-alternatives \
    --remove kiwicompat %_bindir/kiwicompat
+%endif

 %ifarch %ix86 x86_64
 %pre -n kiwi-pxeboot
@ -378,6 +446,7 @@ fi
 %{python2_sitelib}/*
 %config %_sysconfdir/bash_completion.d/kiwi-ng-2*.sh

+%if 0%{?fedora} || 0%{?suse_version}
 %files -n python3-kiwi
 %defattr(-,root,root,-)
 %{_bindir}/kiwi-ng-3*
@ -390,6 +459,7 @@ fi
 %ghost %_sysconfdir/alternatives/kiwicompat
 %{python3_sitelib}/*
 %config %_sysconfdir/bash_completion.d/kiwi-ng-3*.sh
+%endif

 %files -n kiwi-man-pages
 %defattr(-, root, root)
--- a/python-kiwi.tar.gz
+++ b/python-kiwi.tar.gz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af137f6e27e32f9dc0aae97cada51d5386bacf10fcddc38c831395a202aa0ba5
-size 3465521
+oid sha256:72fe37da4ba82d7763f6c8a7312418209c02f35984a7c92983ee0bdb396e1aeb
+size 3533693