diff --git a/python-kiwi.changes b/python-kiwi.changes index f37612f..327e812 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,8 +1,62 @@ +------------------------------------------------------------------- +Thu Mar 16 09:45:14 CET 2017 - ms@suse.com + +- Bump version: 9.3.3 → 9.4.0 + +------------------------------------------------------------------- +Wed Mar 15 17:27:38 CET 2017 - ms@suse.com + +- Allow https location as repository source + +------------------------------------------------------------------- +Wed Mar 15 09:47:35 CET 2017 - dcassany@suse.com + +- Refactor RootImport to keep images with a default name + + RootImport has been refactored so the image is kept with a known + name that can be obtained with the Defaults class. + +------------------------------------------------------------------- +Tue Mar 14 16:14:52 CET 2017 - ms@suse.com + +- Added SLE13 distribution matcher + +------------------------------------------------------------------- +Tue Mar 14 16:14:17 CET 2017 - ms@suse.com + +- Update distribution matcher in spec file + +------------------------------------------------------------------- +Tue Mar 14 10:22:59 CET 2017 - ms@suse.com + +- Refactor ContainerBuilder + + Use Checksum instance to run a checksum match + Check for existence of base image at earliest opportunity + when constructing a ContainerBuilder + +------------------------------------------------------------------- +Tue Mar 14 10:22:06 CET 2017 - ms@suse.com + +- Added checksum matcher method to Checksum class + +------------------------------------------------------------------- +Tue Mar 14 10:20:44 CET 2017 - ms@suse.com + +- Delete unused code + + Also fixed corresponding unit test + ------------------------------------------------------------------- Mon Mar 13 16:37:21 CET 2017 - ms@suse.com - + - Make sure LICENSE and README got installed +------------------------------------------------------------------- +Mon Mar 13 15:45:32 CET 2017 - ms@suse.com + +- Handle derived image as Uri instance + ------------------------------------------------------------------- Mon Mar 13 14:33:47 CET 2017 - ms@suse.com @@ -30,6 +84,17 @@ Thu Mar 9 17:21:54 CET 2017 - ms@suse.com Build package for both python2 and python3 +------------------------------------------------------------------- +Thu Mar 9 13:46:05 CET 2017 - dcassany@suse.com + +- Refactored RootImport and included checksum validation + + First, commit refactors RootImport in order to also copy + the imported image after sychronizing the import. + + Second, it includes a checksum of the copied image which is + validated in later steps. + ------------------------------------------------------------------- Wed Mar 8 17:24:18 CET 2017 - ms@suse.com @@ -55,6 +120,15 @@ Wed Mar 8 12:33:13 CET 2017 - ms@suse.com The wrong project url was referenced +------------------------------------------------------------------- +Wed Mar 8 09:32:02 CET 2017 - dcassany@suse.com + +- Support for layered docker images + + This commit includes support for building layered docker. A new + layer is added on top of the base image referenced by `derived_from` + attribute. + ------------------------------------------------------------------- Tue Mar 7 17:40:07 CET 2017 - ms@suse.com diff --git a/python-kiwi.spec b/python-kiwi.spec index 8f52e18..90dca6f 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) 2017 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,35 +11,49 @@ # 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 -# + + %{!?python2_sitelib:%global python2_sitelib %{python_sitelib}} # 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}"`) -# redefine for the SLES case if no sles_version exists +%endif + # SLE12: %if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %define distro suse-SLES12 %endif -# Leap 42.1: -%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} + +# SLE13: +%if 0%{?sle_version} == 130000 && !0%{?is_opensuse} +%define distro suse-SLES13 +%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%{?suse_version} == 1316 && 0%{?is_opensuse} +%if 0%{?leap_version} == 420200 %define distro suse-leap42.2 %endif + +# Leap 42.3: +%if 0%{?leap_version} == 420300 +%define distro suse-leap42.3 +%endif + # Tumbleweed: # Current Tumbleweed version, moving target %if 0%{?suse_version} == 1330 %define distro suse-tumbleweed %endif -%endif # SLES with sles_version macro %if 0%{?sles_version} @@ -52,11 +66,10 @@ %define distro rhel-07.0 %endif - Name: python-kiwi -Version: 9.3.3 -Provides: kiwi-schema = 6.5 +Version: 9.4.0 Release: 0 +Provides: kiwi-schema = 6.5 Url: https://github.com/SUSE/kiwi Summary: KIWI - Appliance Builder Next Generation License: GPL-3.0+ @@ -65,13 +78,13 @@ Source: %{name}.tar.gz Source1: %{name}-boot-packages Source2: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-setuptools -BuildRequires: fdupes -BuildRequires: update-alternatives +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: shadow +BuildRequires: update-alternatives %description The KIWI Image System provides an operating system image builder @@ -82,47 +95,47 @@ and cloud systems like Xen, KVM, VMware, EC2 and more. %package -n python2-kiwi Summary: KIWI - Appliance Builder Next Generation Group: Development/Languages/Python -Provides: python-kiwi = %{version}-%{release} -Provides: kiwi-image:tbz Provides: kiwi-image:docker Provides: kiwi-image:iso -Provides: kiwi-image:vmx -Provides: kiwi-image:pxe Provides: kiwi-image:oem -Requires: update-alternatives +Provides: kiwi-image:pxe +Provides: kiwi-image:tbz +Provides: kiwi-image:vmx +Provides: python-kiwi = %{version}-%{release} Requires: python-docopt -Requires: python-setuptools -Requires: python-lxml -Requires: python-xattr -Requires: python-six Requires: python-future +Requires: python-lxml +Requires: python-setuptools +Requires: python-six +Requires: python-xattr +Requires: update-alternatives Requires(post): update-alternatives Requires(postun): update-alternatives # tools used by kiwi %if 0%{?suse_version} -Requires: zypper Requires: squashfs +Requires: zypper Provides: kiwi-packagemanager:zypper %endif %if 0%{?rhel_version} || 0%{?centos_version} -Requires: yum Requires: squashfs-tools +Requires: yum Provides: kiwi-packagemanager:yum %endif -Requires: genisoimage -Requires: kiwi-tools -Requires: kiwi-man-pages -Requires: rsync -Requires: tar >= 1.2.7 -Requires: gptfdisk -Requires: qemu-tools Requires: dosfstools Requires: e2fsprogs -Requires: lvm2 -Requires: parted -Requires: multipath-tools +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 @@ -142,46 +155,46 @@ virtualization and cloud systems like Xen, KVM, VMware, EC2 and more. %package -n python3-kiwi Summary: KIWI - Appliance Builder Next Generation Group: Development/Languages/Python -Provides: kiwi-image:tbz Provides: kiwi-image:docker Provides: kiwi-image:iso -Provides: kiwi-image:vmx -Provides: kiwi-image:pxe Provides: kiwi-image:oem -Requires: update-alternatives +Provides: kiwi-image:pxe +Provides: kiwi-image:tbz +Provides: kiwi-image:vmx Requires: python3-docopt -Requires: python3-setuptools -Requires: python3-lxml -Requires: python3-xattr -Requires: python3-six Requires: python3-future +Requires: python3-lxml +Requires: python3-setuptools +Requires: python3-six +Requires: python3-xattr +Requires: update-alternatives Requires(post): update-alternatives Requires(postun): update-alternatives # tools used by kiwi %if 0%{?suse_version} -Requires: zypper Requires: squashfs +Requires: zypper Provides: kiwi-packagemanager:zypper %endif %if 0%{?rhel_version} || 0%{?centos_version} -Requires: yum Requires: squashfs-tools +Requires: yum Provides: kiwi-packagemanager:yum %endif -Requires: genisoimage -Requires: kiwi-tools -Requires: kiwi-man-pages -Requires: rsync -Requires: tar >= 1.2.7 -Requires: gptfdisk -Requires: qemu-tools Requires: dosfstools Requires: e2fsprogs -Requires: lvm2 -Requires: parted -Requires: multipath-tools +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 @@ -199,7 +212,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: System/Management %description -n kiwi-tools @@ -211,9 +223,8 @@ outside of the scope of kiwi appliance building. %ifarch %ix86 x86_64 %package -n kiwi-pxeboot Summary: KIWI - PXE boot structure -Requires: syslinux -License: GPL-3.0+ Group: System/Management +Requires: syslinux %description -n kiwi-pxeboot This package contains the basic PXE directory structure which is @@ -222,22 +233,21 @@ needed to serve kiwi built images via PXE. %package -n kiwi-boot-requires Summary: KIWI - buildservice package requirements for boot images +Group: System/Management Provides: kiwi-boot:isoboot -Provides: kiwi-boot:vmxboot Provides: kiwi-boot:netboot Provides: kiwi-boot:oemboot +Provides: kiwi-boot:vmxboot Provides: kiwi-filesystem:btrfs -Provides: kiwi-filesystem:xfs Provides: kiwi-filesystem:ext3 Provides: kiwi-filesystem:ext4 Provides: kiwi-filesystem:squashfs +Provides: kiwi-filesystem:xfs Requires: btrfsprogs Requires: e2fsprogs -Requires: xfsprogs Requires: python3-kiwi = %{version} +Requires: xfsprogs Requires: %(echo `cat %{S:1}|grep %{_target_cpu}:%{distro}:|cut -f3- -d:`) -License: GPL-3.0+ -Group: System/Management %description -n kiwi-boot-requires Meta package for the buildservice to pull in all required packages in @@ -248,7 +258,6 @@ of the kiwi - buildservice integration exclusively %package -n kiwi-man-pages Summary: KIWI - manual pages -License: GPL-3.0+ Group: System/Management %description -n kiwi-man-pages diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 8e9566b..06e6f5f 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:db6943ed51a0bc699ba489da136cddcaaddafe10537d756cdba2f9e84c68363e -size 2930187 +oid sha256:86579ae025d9737857ad13fb5dec550f439a91b783b52d53ba4ba6ef572d7ec7 +size 2954211