- Bump version: 9.13.4 → 9.13.5
- Fixed btrfs search path in earlyboot script If kiwi generates its own efi image for the boot process it does not setup the btrfs relative path setup in the earlyboot script embedded into the generated efi image. This has a bad impact on the file search because the btrfs setup done in kiwi puts root below the @ volume which we then need to specify of the relative lookup is not activated. Fixes bsc#1082155 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=94
This commit is contained in:
Marcus Schaefer
Git OBS Bridge
parent
83cf107db1
commit
ea1744b1d6
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 6 17:01:58 CET 2018 - ms@suse.de
|
||||
|
||||
- Bump version: 9.13.4 → 9.13.5
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 6 16:43:35 CET 2018 - ms@suse.de
|
||||
|
||||
- Fixed btrfs search path in earlyboot script
|
||||
|
||||
If kiwi generates its own efi image for the boot process
|
||||
it does not setup the btrfs relative path setup in the
|
||||
earlyboot script embedded into the generated efi image.
|
||||
This has a bad impact on the file search because the
|
||||
btrfs setup done in kiwi puts root below the @ volume
|
||||
which we then need to specify of the relative lookup
|
||||
is not activated. Fixes bsc#1082155
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 6 15:51:52 CET 2018 - ms@suse.de
|
||||
|
||||
|
||||
@ -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) 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
|
||||
@ -11,13 +11,11 @@
|
||||
# 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:
|
||||
#
|
||||
# https://github.com/SUSE/kiwi/issues
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# If they aren't provided by a system installed macro, define them
|
||||
|
||||
%{!?_defaultdocdir: %global _defaultdocdir %{_datadir}/doc}
|
||||
%{!?__python2: %global __python2 /usr/bin/python2}
|
||||
|
||||
@ -38,24 +36,23 @@
|
||||
%endif
|
||||
|
||||
Name: python-kiwi
|
||||
Version: 9.13.4
|
||||
Provides: kiwi-schema = 6.6
|
||||
Version: 9.13.5
|
||||
Release: 0
|
||||
Provides: kiwi-schema = 6.6
|
||||
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 <ms@suse.de>
|
||||
%endif
|
||||
Group: %{pygroup}
|
||||
Source: %{name}.tar.gz
|
||||
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
|
||||
@ -103,19 +100,19 @@ Requires(postun): update-alternatives
|
||||
%ifarch x86_64
|
||||
Requires: grub2-x86_64-efi
|
||||
%endif
|
||||
Requires: qemu-tools
|
||||
Requires: multipath-tools
|
||||
Requires: squashfs
|
||||
Requires: gptfdisk
|
||||
Requires: multipath-tools
|
||||
Requires: qemu-tools
|
||||
Requires: squashfs
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Requires: chkconfig
|
||||
Requires: chkconfig
|
||||
Requires(post): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires: qemu-img
|
||||
Requires: squashfs-tools
|
||||
Requires: device-mapper-multipath
|
||||
Requires: gdisk
|
||||
Requires: qemu-img
|
||||
Requires: squashfs-tools
|
||||
Requires: yum
|
||||
Provides: kiwi-packagemanager:yum
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
@ -129,10 +126,10 @@ Provides: kiwi-packagemanager:zypper
|
||||
%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
|
||||
@ -186,19 +183,19 @@ Requires(postun): update-alternatives
|
||||
%ifarch x86_64
|
||||
Requires: grub2-x86_64-efi
|
||||
%endif
|
||||
Requires: qemu-tools
|
||||
Requires: multipath-tools
|
||||
Requires: squashfs
|
||||
Requires: gptfdisk
|
||||
Requires: multipath-tools
|
||||
Requires: qemu-tools
|
||||
Requires: squashfs
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Requires: chkconfig
|
||||
Requires: chkconfig
|
||||
Requires(post): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires: qemu-img
|
||||
Requires: squashfs-tools
|
||||
Requires: device-mapper-multipath
|
||||
Requires: gdisk
|
||||
Requires: qemu-img
|
||||
Requires: squashfs-tools
|
||||
%endif
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
Requires: yum
|
||||
@ -243,7 +240,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: %{sysgroup}
|
||||
|
||||
%description -n kiwi-tools
|
||||
@ -256,14 +252,13 @@ outside of the scope of kiwi appliance building.
|
||||
%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
|
||||
@ -273,6 +268,7 @@ needed to serve kiwi built images via PXE.
|
||||
|
||||
%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
|
||||
@ -289,28 +285,26 @@ Requires: btrfsprogs
|
||||
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: xz-utils
|
||||
Requires: dmsetup
|
||||
Requires: xz-utils
|
||||
%else
|
||||
Requires: xz
|
||||
Requires: device-mapper
|
||||
Requires: xz
|
||||
%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
|
||||
@ -318,6 +312,7 @@ for tasks done in other kiwi dracut modules
|
||||
|
||||
%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
|
||||
@ -325,8 +320,6 @@ Summary: KIWI - Dracut module for oem(repart) image type
|
||||
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
|
||||
@ -335,15 +328,16 @@ geometry according to the setup in the kiwi image configuration
|
||||
|
||||
%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
|
||||
@ -351,8 +345,6 @@ Requires: multipath-tools
|
||||
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
|
||||
@ -364,6 +356,7 @@ remote
|
||||
|
||||
%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
|
||||
@ -371,9 +364,9 @@ Summary: KIWI - Dracut module for iso(live) image type
|
||||
BuildRequires: dracut
|
||||
%endif
|
||||
Requires: dialog
|
||||
Requires: xfsprogs
|
||||
Requires: e2fsprogs
|
||||
Requires: util-linux
|
||||
Requires: xfsprogs
|
||||
%if 0%{?debian} || 0%{?ubuntu}
|
||||
Requires: dmsetup
|
||||
%else
|
||||
@ -389,8 +382,6 @@ Requires: genisoimage
|
||||
Requires: cdrkit-cdrtools-compat
|
||||
%endif
|
||||
%endif
|
||||
License: GPL-3.0+
|
||||
Group: %{sysgroup}
|
||||
|
||||
%description -n dracut-kiwi-live
|
||||
This package contains the kiwi-live dracut module which is used
|
||||
@ -398,16 +389,15 @@ for booting iso(live) images built with KIWI
|
||||
|
||||
%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: util-linux
|
||||
Requires: dracut
|
||||
License: GPL-3.0+
|
||||
Group: %{sysgroup}
|
||||
Requires: util-linux
|
||||
|
||||
%description -n dracut-kiwi-overlay
|
||||
This package contains the kiwi-overlay dracut module which is used
|
||||
@ -416,7 +406,6 @@ overlay root filesystem
|
||||
|
||||
%package -n kiwi-man-pages
|
||||
Summary: KIWI - manual pages
|
||||
License: GPL-3.0+
|
||||
Group: %{sysgroup}
|
||||
|
||||
%description -n kiwi-man-pages
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5a7ed57f3f28e75e8642f259573872ed131f2d688d56330025af5403d595477b
|
||||
size 510305
|
||||
oid sha256:dd4740a20869dd0a38a14736c52a1575f8b4ba9634896e957e8ee761e4bcf662
|
||||
size 510977
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user