pool/python-kiwi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert to previous kiwi version - boo#1122799

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-kiwi?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2019-01-24 14:18:36 +00:00 committed by Git OBS Bridge
parent b5a06f6609
commit ef5914f516
3 changed files with 31 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

282
python-kiwi.changes
View File

@ -1,286 +1,6 @@
-------------------------------------------------------------------
Mon Jan 7 11:17:52 CET 2019 - ms@suse.de
- Bump version: 9.17.6 → 9.17.7
-------------------------------------------------------------------
Mon Jan 7 10:48:09 CET 2019 - ms@suse.de
- Fix use of SysConfig objects
objects of that class did not provide a get method but
overload the bracket [] operator. Using the get() method
failed. This Fixes #910
-------------------------------------------------------------------
Sat Jan 5 19:52:42 CET 2019 - ms@suse.de
- Use chkstat to verify and fix file permissions
Call chkstat in system mode which reads /etc/sysconfig/security
to determine the configured security level and applies the
appropriate permission definitions from the /etc/permissions*
files. It's possible to provide those files as overlay files
in the image description to apply a certain permission setup
when needed. Otherwise the default setup as provided on the
package level applies. It's required that the image root system
has chkstat installed. If not present KIWI skips this step
and continuous with a warning. This Fixes #895
-------------------------------------------------------------------
Fri Dec 21 17:22:57 CET 2018 - dcassany@suse.de
- Allow setting the protocol for exposed ports
With this commit it is possible to set tcp or upd (e.g. "80/tcp") for
exposed container ports. If no protocol is provided OCI defaults are
applied.
Fixes #906
-------------------------------------------------------------------
Wed Dec 19 18:01:17 CET 2018 - toms@suse.de
- Use cls in @classmethods instead of self
For consistency reasons.
-------------------------------------------------------------------
Wed Dec 19 09:13:48 CET 2018 - ms@suse.de
- Bump version: 9.17.5 → 9.17.6
-------------------------------------------------------------------
Tue Dec 18 20:03:33 CET 2018 - ms@suse.de
- Allow setctsid to be part of custom boot images
-------------------------------------------------------------------
Tue Dec 18 14:33:09 CET 2018 - dcassany@suse.de
- Fix disk size calculation for VMX
Disk size calculation must take into account the empty volumes that
are to be mounted in a directory that does not exist in the root tree
otherwise there is KeyError. The result of
storate/setup._calculate_volume_mbytes must be a dict including all
defined volumes.
Fixes #904
-------------------------------------------------------------------
Wed Dec 12 12:19:50 CET 2018 - ms@suse.de
- Bump version: 9.17.4 → 9.17.5
-------------------------------------------------------------------
Wed Dec 12 11:06:20 CET 2018 - ms@suse.de
- Make sure manual pages are part of pypi archive
As consequence of the change in the travis setup to make
use of the native 'pages' and 'pypi' providers from travis the
environment for the sdist target has changed. Within the
doc_travis tox env no manual pages was build. In combination
with the 'pypi' provider setup in .travis.yml which uses
skip_cleanup: true, this caused the pypi archive to miss
any manual pages which lead to a runtime error on install
via pip.
-------------------------------------------------------------------
Tue Dec 11 08:18:26 CET 2018 - ms@suse.de
- Bump version: 9.17.3 → 9.17.4
-------------------------------------------------------------------
Mon Dec 10 12:34:53 CET 2018 - ms@suse.de
- Don't trust the vmlinux symlink to be present
-------------------------------------------------------------------
Mon Dec 10 11:15:02 CET 2018 - ms@suse.de
- Refactor kernel version lookup
Check the presence of the gzip compressed kernel binary
and use it. If not present use the arbitrary kernel image
format with the known limitations.
-------------------------------------------------------------------
Mon Dec 10 09:46:06 CET 2018 - ms@suse.de
- More clarity on kernel version lookup
Lookup of the kernel version is done by directly reading the
kernel image via a small tool named kversion. The scope of the
tool is limited and does not work for e.g kernel images which
contains its own decompressor code. For the special cases we
defined exceptions, one was zImage. The recently added exception
for vmlinuz seemed too intrusive to me and was also not well
documented. This patch tries to clarify and get us back to
explicit and easy to read coding. Fixes #899
-------------------------------------------------------------------
Tue Dec 4 17:22:25 CET 2018 - ro@suse.de
- testing: fix issues marked by shellcheck
-------------------------------------------------------------------
Thu Nov 29 17:58:48 CET 2018 - ro@suse.de
- kernel.py: also try vmlinux-version.gz in case of image-version to
get the version number
-------------------------------------------------------------------
Tue Nov 27 17:09:52 CET 2018 - dcassany@suse.de
- Add Ubuntu bionic build tests
-------------------------------------------------------------------
Tue Nov 27 15:17:49 CET 2018 - dcassany@suse.de
- Another round of OCI tools refactoring
In order to provide buildah support some of the logic about
temporary directories for OCI images creation needs to be moved
to the dedicated OCI tool class.
While umoci can operate in any directory and this is passed as an
argument, this is not the case for buildah. In buildah workflow
the storage path of work-in-progress images/containers is not
customizable neither the mountpoint of the container rootfs.
-------------------------------------------------------------------
Mon Nov 26 15:36:54 CET 2018 - ms@suse.de
- Bump version: 9.17.2 → 9.17.3
-------------------------------------------------------------------
Mon Nov 26 14:37:42 CET 2018 - ms@suse.de
- Update documentation for rd.live.cowfile.mbsize
-------------------------------------------------------------------
Mon Nov 26 10:07:44 CET 2018 - ms@suse.de
- Use cow file on persistent grub live loop boot
When using tools like live-grub-stick the live iso as generated
by kiwi will be copied as file on the target device and a grub
loopback setup is created there to boot the live system from file.
In such a case the persistent write setup which tries to create
an extra write partition on the target fails in almost all cases
because the target has no free and unpartitioned space available.
Therefore in case of such a loopback mounted system we create a
cow file(live_system.cow) instead of a partition to setup
persistent writing. The cow file will be created in the same
directory the live iso image file was read from grub
This Fixes #860
-------------------------------------------------------------------
Fri Nov 23 14:15:38 CET 2018 - ms@suse.de
- Bump version: 9.17.1 → 9.17.2
-------------------------------------------------------------------
Fri Nov 23 11:29:40 CET 2018 - dcassany@suse.de
- Create a custom `setup.py clean` command
The default `setup.py clean` command does not clean `dist` and
`*.egg-info` folders. This commit makes sure those are cleaned and
also ands a `setup.py clean` command in the `clean` Makefile target
-------------------------------------------------------------------
Fri Nov 23 11:11:53 CET 2018 - ms@suse.de
- Better exception handling in oem installer
If an error condition applies in the kiwi dump dracut code
the reaction was to stop the process with a dracut die() call.
If the option 'rd.debug' was set on boot, this lead to a debugging
shell which is good, but in a standard process this lead to a
lock of the machine which is an unfortunate situation. This
patch changes the behavior to always print the error message
as a dialog message box on the primary console and reboot
the system after keypress or timeout. In case of the debug
switch configured the system die()'s as before.
This Fixes #884
-------------------------------------------------------------------
Mon Nov 19 11:19:36 CET 2018 - dcassany@suse.de
- Add parted dependency for dracut-kiwi-live package
dracut-kiwi-live requires `partprobe` tool and this is provided by
parted package. Persistent overlay setup fails if parted is not
installed in the image.
-------------------------------------------------------------------
Thu Nov 15 09:40:46 CET 2018 - ms@suse.de
- Added unit test for syslinux lookup paths
-------------------------------------------------------------------
Thu Nov 15 08:50:29 CET 2018 - dcassany@suse.de
- Include the isolinux ubuntu paths
This commit adds the ubuntu installation paths the places to look
for isolinux binaries.
-------------------------------------------------------------------
Tue Nov 13 17:06:30 CET 2018 - dcassany@suse.de
- Fix spec to better support Debian and Ubuntu builds
This commit fixes the spec to properly build for Debian and Ubuntu.
More specific:
* update-alternatives path has been adapted
* python3-kiwi are now enabled for Debian 9 and Ubuntu 18.04
-------------------------------------------------------------------
Mon Nov 12 11:37:35 CET 2018 - ms@suse.de
- Make gfxboot a recommended package
gfxboot is needed on the host for certain boot graphics
operations. It's used if the boot theme provides a gfxboot.cfg
In this case the tool is also required. The setup of the
boot themes is differently implemented in each of the
distributions we support. In addition on suse distributions
gfxboot is no longer in the core system. Given that we are
not able to find a common base on requirement of the package
we changed gfxboot from a required to a recommended package
and deleted the requirement on debian based distros
-------------------------------------------------------------------
Fri Nov 9 15:54:31 CET 2018 - dcassany@suse.de
- Adding OEM and ISO image types for Fedora tests
-------------------------------------------------------------------
Fri Nov 9 14:53:54 CET 2018 - seife+dev@b1-systems.com
- kiwi-dump-image: improve dialog usage
Dialog's "--radiolist" feature requires to navigate to the item,
press "space" to select the item and then "enter" to execute.
With "--menu", it is enough to just navigate to the item and press
"enter" to execute, which is much more intuitive for most users.
-------------------------------------------------------------------
Fri Nov 9 13:28:14 CET 2018 - dcassany@suse.de
- Add support for --no-history umoci's flag
Using this flag kiwi appends only a single history entry for OCI
containers.
-------------------------------------------------------------------
Fri Nov 9 11:23:16 CET 2018 - ms@suse.de
- Bump version: 9.17.0 → 9.17.1
-------------------------------------------------------------------

75
python-kiwi.spec
View File

@ -20,32 +20,25 @@
# If they aren't provided by a system installed macro, define them
%{!?_defaultdocdir: %global _defaultdocdir %{_datadir}/doc}
%{!?__python2: %global __python2 /usr/bin/python2}
%{!?__python3: %global __python3 /usr/bin/python3}
# Expanded form required for debbuild's simpler engine
%if %{undefined python2_sitelib}
%global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
%endif
%if %{undefined python3_sitelib}
%global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
%endif
%if 0%{?debian} || 0%{?ubuntu}
%global is_deb 1
%global pygroup python
%global sysgroup admin
%global develsuffix dev
%global update_alternatives %{_bindir}/update-alternatives
%else
%global pygroup Development/Languages/Python
%global sysgroup System/Management
%global develsuffix devel
%global update_alternatives %{_sbindir}/update-alternatives
%endif
Name: python-kiwi
Version: 9.17.7
Version: 9.17.1
Provides: kiwi-schema = 6.6
Release: 0
Url: https://github.com/SUSE/kiwi
@ -61,8 +54,6 @@ Source1: %{name}-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?fedora} || 0%{?suse_version}
BuildRequires: python3-devel
%endif
%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
BuildRequires: python3-setuptools
BuildRequires: fdupes
%endif
@ -113,7 +104,7 @@ Requires(postun): update-alternatives
Requires: grub2-x86_64-efi
%endif
%ifarch %{ix86} x86_64
Recommends: gfxboot
Requires: gfxboot
%endif
Requires: qemu-tools
Requires: squashfs
@ -142,6 +133,9 @@ Requires: debootstrap
Requires: qemu-utils
Requires: squashfs-tools
Requires: gdisk
%ifarch %{ix86} x86_64
Requires: gfxboot
%endif
%endif
Requires: dosfstools
Requires: e2fsprogs
@ -170,17 +164,13 @@ 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} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
%if 0%{?fedora} || 0%{?suse_version}
# python3-kiwi
%package -n python3-kiwi
Summary: KIWI - Appliance Builder Next Generation
Group: Development/Languages/Python
Recommends: jing
%if 0%{?ubuntu} || 0%{?debian}
Requires: python3-yaml
%else
Requires: python3-PyYAML
%endif
Requires: python3-docopt
Requires: python3-future
Requires: python3-lxml
@ -197,7 +187,7 @@ Requires(postun): update-alternatives
Requires: grub2-x86_64-efi
%endif
%ifarch %{ix86} x86_64
Recommends: gfxboot
Requires: gfxboot
%endif
Requires: qemu-tools
Requires: squashfs
@ -223,12 +213,6 @@ Provides: kiwi-packagemanager:dnf
Requires: zypper
Provides: kiwi-packagemanager:zypper
%endif
%if 0%{?debian} || 0%{?ubuntu}
Requires: debootstrap
Requires: qemu-utils
Requires: squashfs-tools
Requires: gdisk
%endif
Requires: dosfstools
Requires: e2fsprogs
Requires: xorriso
@ -295,19 +279,14 @@ BuildRequires: dracut
%endif
Requires: bc
Requires: cryptsetup
%if 0%{?fedora} || 0%{?rhel} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
%if 0%{?fedora} || 0%{?rhel}
Requires: btrfs-progs
Requires: gdisk
Requires: dracut-network
%else
%if 0%{?debian} || 0%{?ubuntu}
Requires: btrfs-tools
Requires: gdisk
%else
Requires: btrfsprogs
Requires: gptfdisk
%endif
%endif
Requires: coreutils
Requires: e2fsprogs
Requires: grep
@ -322,6 +301,9 @@ Requires: curl
%if 0%{?debian} || 0%{?ubuntu}
Requires: xz-utils
Requires: dmsetup
Requires: btrfs-tools
Requires: gdisk
Requires: dracut-network
%else
Requires: xz
Requires: device-mapper
@ -406,7 +388,6 @@ Requires: device-mapper
%endif
Requires: dracut
Requires: xorriso
Requires: parted
License: GPL-3.0-or-later
Group: %{sysgroup}
@ -451,7 +432,7 @@ sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py
# Build Python 2 version
python2 setup.py build --cflags="${RPM_OPT_FLAGS}"
%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
%if 0%{?fedora} || 0%{?suse_version}
# Build Python 3 version
python3 setup.py build --cflags="${RPM_OPT_FLAGS}"
%endif
@ -460,7 +441,7 @@ python3 setup.py build --cflags="${RPM_OPT_FLAGS}"
# Install Python 2 version
python2 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--install-layout=deb}
%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
%if 0%{?fedora} || 0%{?suse_version}
# Install Python 3 version
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--install-layout=deb}
%endif
@ -503,38 +484,38 @@ done
%endif
%post -n python2-kiwi
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--install %_bindir/kiwi kiwi %_bindir/kiwi-ng-2 10
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--install %_bindir/kiwi-ng kiwi-ng %_bindir/kiwi-ng-2 10
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--install %_bindir/kiwicompat kiwicompat %_bindir/kiwicompat-2 10
%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
%if 0%{?fedora} || 0%{?suse_version}
%post -n python3-kiwi
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--install %_bindir/kiwi kiwi %_bindir/kiwi-ng-3 10
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--install %_bindir/kiwi-ng kiwi-ng %_bindir/kiwi-ng-3 10
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--install %_bindir/kiwicompat kiwicompat %_bindir/kiwicompat-3 10
%endif
%preun -n python2-kiwi
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--remove kiwi %_bindir/kiwi
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--remove kiwi %_bindir/kiwi-ng
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--remove kiwicompat %_bindir/kiwicompat
%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
%if 0%{?fedora} || 0%{?suse_version}
%preun -n python3-kiwi
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--remove kiwi %_bindir/kiwi
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--remove kiwi %_bindir/kiwi-ng
%{update_alternatives} \
%{_sbindir}/update-alternatives \
--remove kiwicompat %_bindir/kiwicompat
%endif
@ -566,7 +547,7 @@ fi
%{python2_sitelib}/*
%config %_sysconfdir/bash_completion.d/kiwi-ng-2*.sh
%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
%if 0%{?fedora} || 0%{?suse_version}
%files -n python3-kiwi
%defattr(-,root,root,-)
%{_bindir}/kiwi-ng-3*

4
python-kiwi.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47e0dcc86d274c6016e0e0728655b08557e6b8f96bd240f7433cb4f73c8b2983
size 1186069
oid sha256:3ceebf249d84c3e3f551998f9102dd577a2f7b70e06da9ecd41f98bc8a5c9472
size 1270656