From 6e5234c3c3f6a3c3f6d59162224006f07a951f75a9896e46579ab16caeb24dd0 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Thu, 24 Aug 2017 10:47:24 +0000 Subject: [PATCH] =?UTF-8?q?-=20Bump=20version:=209.10.5=20=E2=86=92=209.10?= =?UTF-8?q?.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Added boot descriptions for SLE15 on ppc - Added boot descriptions for SLE15 on s390 - Bump version: 9.10.4 → 9.10.5 - Added handling of formatoptions attribute Custom disk format options passed in the formatoptions attribute were not handled. In addition options with a value passed to qemu were handled in the wrong way. This commit addresses both problems and Fixes #463 - s/sles/openSUSE/ - copy SLE15 files for Leap 15 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=50 --- python-kiwi-boot-packages | 26 ++++++++++++++---- python-kiwi.changes | 57 ++++++++++++++++++++++++++++++++++++++- python-kiwi.spec | 26 +++++++++++++++--- python-kiwi.tar.gz | 4 +-- 4 files changed, 102 insertions(+), 11 deletions(-) diff --git a/python-kiwi-boot-packages b/python-kiwi-boot-packages index 59b66ea..5f8e8e4 100644 --- a/python-kiwi-boot-packages +++ b/python-kiwi-boot-packages @@ -56,12 +56,28 @@ armv7hl:suse-SLES15:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox armv7l:suse-SLES15:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz i586:suse-SLES15:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cdrkit-cdrtools-compat checkmedia cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime gfxboot glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hdparm hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-desktop kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm memtest86+ nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc qemu-tools rpm rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz i686:suse-SLES15:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cdrkit-cdrtools-compat checkmedia cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime gfxboot glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hdparm hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-desktop kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm memtest86+ nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc qemu-tools rpm rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz -ppc:suse-SLES15:no_boot_descriptions_for_suse-SLES15_on_ppc_available -ppc64:suse-SLES15:no_boot_descriptions_for_suse-SLES15_on_ppc64_available -ppc64le:suse-SLES15:no_boot_descriptions_for_suse-SLES15_on_ppc64le_available -s390:suse-SLES15:no_boot_descriptions_for_suse-SLES15_on_s390_available -s390x:suse-SLES15:no_boot_descriptions_for_suse-SLES15_on_s390x_available +ppc:suse-SLES15:atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +ppc64:suse-SLES15:atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +ppc64le:suse-SLES15:atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +s390:suse-SLES15:atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale grub2 grub2-s390x-emu hwinfo iproute2 iputils kbd kernel-default kexec-tools kiwi-tools kpartx lvm2 make mdadm module-init-tools multipath-tools net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync s390-tools squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +s390x:suse-SLES15:atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale grub2 grub2-s390x-emu hwinfo iproute2 iputils kbd kernel-default kexec-tools kiwi-tools kpartx lvm2 make mdadm module-init-tools multipath-tools net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync s390-tools squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz x86_64:suse-SLES15:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cdrkit-cdrtools-compat checkmedia cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime gfxboot glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hdparm hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-desktop kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm memtest86+ nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc qemu-tools rpm rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +aarch64:suse-leap15.0:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2-arm64-efi hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +arm:suse-leap15.0:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +armv5el:suse-leap15.0:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +armv5tel:suse-leap15.0:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +armv6hl:suse-leap15.0:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +armv6l:suse-leap15.0:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +armv7hl:suse-leap15.0:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +armv7l:suse-leap15.0:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +i586:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cdrkit-cdrtools-compat checkmedia cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime gfxboot glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hdparm hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-desktop kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm memtest86+ nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc qemu-tools rpm rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +i686:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cdrkit-cdrtools-compat checkmedia cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime gfxboot glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hdparm hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-desktop kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm memtest86+ nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc qemu-tools rpm rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +ppc:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_ppc_available +ppc64:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_ppc64_available +ppc64le:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_ppc64le_available +s390:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_s390_available +s390x:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_s390x_available +x86_64:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cdrkit-cdrtools-compat checkmedia cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime gfxboot glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hdparm hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-desktop kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm memtest86+ nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc qemu-tools rpm rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz aarch64:suse-leap42.1:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2-arm64-efi hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz arm:suse-leap42.1:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz armv5el:suse-leap42.1:atftp bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz diff --git a/python-kiwi.changes b/python-kiwi.changes index 8524159..3a58261 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,6 +1,61 @@ +------------------------------------------------------------------- +Tue Aug 22 10:03:25 CEST 2017 - ms@suse.de + +- Bump version: 9.10.5 → 9.10.6 + +------------------------------------------------------------------- +Mon Aug 21 10:56:05 CEST 2017 - ms@suse.de + +- Added boot descriptions for SLE15 on ppc + +------------------------------------------------------------------- +Mon Aug 21 10:55:46 CEST 2017 - ms@suse.de + +- Added boot descriptions for SLE15 on s390 + +------------------------------------------------------------------- +Mon Aug 21 10:23:25 CEST 2017 - ms@suse.de + +- Bump version: 9.10.4 → 9.10.5 + +------------------------------------------------------------------- +Fri Aug 11 15:46:40 CEST 2017 - ms@suse.de + +- Added handling of formatoptions attribute + + Custom disk format options passed in the formatoptions + attribute were not handled. In addition options with a + value passed to qemu were handled in the wrong way. + This commit addresses both problems and Fixes #463 + +------------------------------------------------------------------- +Fri Aug 11 15:15:25 CEST 2017 - ludwig.nussel@suse.de + +- s/sles/openSUSE/ + +------------------------------------------------------------------- +Fri Aug 11 15:12:35 CEST 2017 - ludwig.nussel@suse.de + +- copy SLE15 files for Leap 15 + +------------------------------------------------------------------- +Fri Aug 11 15:01:16 CEST 2017 - ludwig.nussel@suse.de + +- add Leap 15 macros + +------------------------------------------------------------------- +Fri Aug 11 15:01:09 CEST 2017 - ludwig.nussel@suse.de + +- leap_version is deprecated. use sle_version+is_openuse instead + +------------------------------------------------------------------- +Thu Aug 10 17:18:59 CEST 2017 - ms@suse.de + +- Added azure integration test build to obs status + ------------------------------------------------------------------- Wed Aug 9 23:14:44 CEST 2017 - ms@suse.de - + - Bump version: 9.10.3 → 9.10.4 ------------------------------------------------------------------- diff --git a/python-kiwi.spec b/python-kiwi.spec index a844f97..d687f62 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -40,15 +40,35 @@ %endif # Leap 42.2: -%if 0%{?leap_version} == 420200 +%if 0%{?is_opensuse} && 0%{?sle_version} == 120200 %define distro suse-leap42.2 %endif # Leap 42.3: -%if 0%{?leap_version} == 420300 +%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 @@ -73,7 +93,7 @@ %endif Name: python-kiwi -Version: 9.10.4 +Version: 9.10.6 Release: 0 Provides: kiwi-schema = 6.6 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 70cafa2..e7e31b1 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:9b2b65548a0e72d04d1b45470a19a0d4ee63462b26af3ea0058d8592fec29f59 -size 3358510 +oid sha256:71d001400ccea07189b25862395b08214b6fb409498930122e668562222d714f +size 4085889