diff --git a/python-kiwi-boot-packages b/python-kiwi-boot-packages
index 26adaa1..6cdc4ce 100644
--- a/python-kiwi-boot-packages
+++ b/python-kiwi-boot-packages
@@ -40,9 +40,9 @@ armv7hl:suse-SLES15:bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2
armv7l:suse-SLES15: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 kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz
i586:suse-SLES15:adaptec-firmware bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo 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
i686:suse-SLES15:adaptec-firmware bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo 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
-ppc:suse-SLES15: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: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: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
+ppc:suse-SLES15: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 sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz
+ppc64:suse-SLES15: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 sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz
+ppc64le:suse-SLES15: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 sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz
s390:suse-SLES15: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: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 bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hwinfo 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 shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz
diff --git a/python-kiwi.changes b/python-kiwi.changes
index ec24859..56dae9c 100644
--- a/python-kiwi.changes
+++ b/python-kiwi.changes
@@ -1,6 +1,210 @@
+-------------------------------------------------------------------
+Mon Jan 8 11:37:20 CET 2018 - ms@suse.de
+
+- Bump version: 9.11.29 → 9.11.30
+
+-------------------------------------------------------------------
+Mon Jan 8 11:35:25 CET 2018 - ms@suse.de
+
+- Deleted syslinux from ppc/oemboot/suse-SLES15
+
+ syslinux is not provided for ppc. This Fixes bsc#1073310
+
+-------------------------------------------------------------------
+Fri Dec 29 00:12:19 CET 2017 - martin.mohring@5eecosystems.com
+
+ [boot] fix double quote in grub menu which makes kernel updates for CentOS / RHEL / Fedora break grub.cfg
+
+-------------------------------------------------------------------
+Tue Dec 19 17:53:28 CET 2017 - dcassany@suse.com
+
+- Omit kiwi-repart dracut module in oemboot initrd
+
+ KIWI's oemboot initrd with initrd_system="dracut" together with
+ installiso="true" requires to have dracut-kiwi-oem-repart package
+ installed in the system, thus it ends up also being included in the
+ recreated dracut initrd after booting the oemboot initrd from the
+ installation iso. This kiwi-repart module causes a boot failure in that
+ case since no .profile file is present, moreover, it has no sense to
+ run it at that stage, since the disk is already reparted by the
+ oemboot code.
+
+ This commit allows installiso="true" and initrd_system="dracut" to
+ play well together.
+
+-------------------------------------------------------------------
+Fri Dec 15 10:32:26 CET 2017 - dcassany@suse.com
+
+- Improve locale pattern in schema
+
+ Now the locale pattern in the schema also supports POSIX. Note
+ that POSIX will be only accepted if listed in the first place of the comma
+ separated list.
+
+ This commit fixes #570
+
+-------------------------------------------------------------------
+Thu Dec 14 16:45:20 CET 2017 - ms@suse.de
+
+- Bump version: 9.11.28 → 9.11.29
+
+-------------------------------------------------------------------
+Wed Dec 13 09:53:21 CET 2017 - ms@suse.de
+
+- Allow to choose dracut live module
+
+ There is the standard dracut dmsquash-live module based on
+ the device mapper technology and the kiwi-live module based
+ on the overlayfs technology. The setup of the live iso structure
+ in kiwi is compatible to both modules. Thus it makes sense
+ to allow to choose the technology via the flags attribute
+
+
+
+ Please note both modules supports a different set of live
+ features. This Fixes #568
+
+-------------------------------------------------------------------
+Tue Dec 12 11:52:30 CET 2017 - ms@suse.de
+
+- Bump version: 9.11.27 → 9.11.28
+
+-------------------------------------------------------------------
+Thu Dec 7 15:21:23 CET 2017 - ms@suse.de
+
+- Fixed ec2 and azure test builds
+
+ cryptconfig is no longer provided
+
+-------------------------------------------------------------------
+Wed Dec 6 16:26:21 CET 2017 - ms@suse.de
+
+- Bump version: 9.11.26 → 9.11.27
+
+-------------------------------------------------------------------
+Wed Dec 6 16:25:12 CET 2017 - ms@suse.de
+
+- Apply target permissions only if target dir exists
+
+-------------------------------------------------------------------
+Wed Dec 6 16:03:57 CET 2017 - ms@suse.de
+
+- Bump version: 9.11.25 → 9.11.26
+
+-------------------------------------------------------------------
+Wed Dec 6 15:59:14 CET 2017 - ms@suse.de
+
+- Fixed use of stat result in os.chmod
+
+ oct method returns a string representation which was mistakenly
+ used in a subsequent os.chmod call. This Fixes #564
+
+-------------------------------------------------------------------
+Wed Dec 6 12:51:06 CET 2017 - ms@suse.de
+
+- Fixed tox doc target
+
+ Correctly include schema pictures after travis-sphinx build
+
+-------------------------------------------------------------------
+Wed Dec 6 12:08:00 CET 2017 - ms@suse.de
+
+- Bump version: 9.11.24 → 9.11.25
+
+-------------------------------------------------------------------
+Tue Dec 5 14:52:56 CET 2017 - ms@suse.de
+
+- Update failsafe kernel option list
+
+ Delete obsolete parameters and make sure a failsafe boot
+ does boot into runlevel 3. This Fixes #554
+
+-------------------------------------------------------------------
+Tue Dec 5 14:26:06 CET 2017 - ms@suse.de
+
+- Apply xslt validation on boot images
+
+-------------------------------------------------------------------
+Tue Dec 5 10:59:29 CET 2017 - MichalMarek1@eaton.com
+
+- Do not match comments and PIs in XSLT templates
+
+ I wanted to add a simple vim modeline to my XML description:
+
+
+
+ This made kiwi consume insane amounts of memory during the XSLT
+ transform step. While this may be a bug in my version of lxml, we do not
+ transform comments on processing instructions in the conversion
+ templates, so the easiest solution is not to match them.
+
+ Signed-off-by: Michal Marek
+
+-------------------------------------------------------------------
+Mon Dec 4 17:17:35 CET 2017 - ms@suse.de
+
+- Make sure toplevel target dir keeps permissions
+
+ When syncing data via rsync we make sure the toplevel target
+ directory the data gets synced to does not change it's origin
+ permissions. This Fixes #557
+
+-------------------------------------------------------------------
+Mon Dec 4 12:33:29 CET 2017 - ms@suse.de
+
+- Rebuild schema documentation
+
+-------------------------------------------------------------------
+Mon Dec 4 11:55:43 CET 2017 - ms@suse.de
+
+- Fixed dependencies for dracut-kiwi-lib
+
+ Adapt package names for gdisk/gptfdisk and btrfs-progs/btrfsprogs
+ Install and require fdasd only on s390 architecture
+ Delete fbiterm requirement since the project seems unmaintained
+ and the use of the framebuffer terminal is an option in the code
+ but not mandatory. This Fixes #559
+
+-------------------------------------------------------------------
+Fri Dec 1 15:56:37 CET 2017 - adrian@suse.de
+
+- add missing deps for docker builds.
+
+ Moving kiwi-image:* provides to -requires package
+
+-------------------------------------------------------------------
+Wed Nov 29 17:37:10 CET 2017 - ms@suse.de
+
+- Update text per review
+
+-------------------------------------------------------------------
+Wed Nov 29 17:30:24 CET 2017 - ms@suse.de
+
+- Fix and cleanup tox setup
+
+ Along with the cleanup of the tox setup also the workaround
+ using an older version of the py module has been fixed
+
+-------------------------------------------------------------------
+Wed Nov 29 16:22:29 CET 2017 - ms@suse.de
+
+- Fixed travis-sphinx call syntax
+
+-------------------------------------------------------------------
+Wed Nov 29 12:21:29 CET 2017 - ms@suse.de
+
+- Update dropped feature list
+
+ Legacy kiwi's oem recovery feature will not be ported
+ due to technologes like ReaR, snapper, btrfs and due
+ to the container, cloud and public cloud orientation of
+ OS images
+
-------------------------------------------------------------------
Thu Nov 23 11:07:05 CET 2017 - ms@suse.de
-
+
- Bump version: 9.11.23 → 9.11.24
-------------------------------------------------------------------
diff --git a/python-kiwi.spec b/python-kiwi.spec
index e2a54cf..6611115 100644
--- a/python-kiwi.spec
+++ b/python-kiwi.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-kiwi
#
-# Copyright (c) 2017 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
@@ -93,7 +93,7 @@
%endif
Name: python-kiwi
-Version: 9.11.24
+Version: 9.11.30
Release: 0
Provides: kiwi-schema = 6.6
Url: https://github.com/SUSE/kiwi
@@ -128,12 +128,6 @@ 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: kiwi-image:docker
-Provides: kiwi-image:iso
-Provides: kiwi-image:oem
-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
@@ -206,12 +200,6 @@ 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:docker
-Provides: kiwi-image:iso
-Provides: kiwi-image:oem
-Provides: kiwi-image:pxe
-Provides: kiwi-image:tbz
-Provides: kiwi-image:vmx
Recommends: jing
Requires: python3-PyYAML
Requires: python3-docopt
@@ -311,19 +299,26 @@ Summary: KIWI - Dracut kiwi Library
Group: System/Management
BuildRequires: dracut
Requires: bc
-Requires: btrfsprogs
-Requires: coreutils
Requires: cryptsetup
+%if 0%{?fedora} || 0%{?rhel}
+Requires: btrfs-progs
+Requires: gdisk
+%else
+Requires: btrfsprogs
+Requires: gptfdisk
+%endif
+Requires: coreutils
Requires: dialog
Requires: e2fsprogs
-Requires: fbiterm
-Requires: gptfdisk
Requires: grep
Requires: lvm2
Requires: mdadm
Requires: parted
Requires: util-linux
Requires: xfsprogs
+%ifarch s390 s390x
+Requires: s390-tools
+%endif
%description -n dracut-kiwi-lib
This package contains a collection of methods to provide a library
@@ -383,7 +378,15 @@ 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}
Requires: btrfs-progs
diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz
index ca49e78..ecaaabb 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:6dbfdea1abec4714977b1affe8d674c48edaf62ef8d95d446946476a96d8300c
-size 2294901
+oid sha256:75f36a7fc8de4a38a6bb292867ceb9054c0487cc2f141ba1335aee27c46348b8
+size 2311765