forked from pool/python-kiwi
- Bump version: 9.23.4 → 9.23.5
- Update contributing link in README - Bump version: 9.23.3 → 9.23.4 - Fixes the rpmdb bootstrap management for DNF on SUSE This commit makes sure that the compatibility symlink for /var/lib/rpm is created when the host rpmdb path is set to something different. This fixes a mismatch on bootstrapping SUSE using DNF. Fixes #1669 - Bump version: 9.23.2 → 9.23.3 - Modify lsblk flags for a consistent output across distros This commit modifies the lsblk flags to make use of the list format instead of raw output. `--list` flag seams to keep the geometry order and produces a consistent output in several distros. - Bump version: 9.23.1 → 9.23.2 - Update kiwi-systemdeps-image-validation Make python anymarkup to be only recommended. The package does not exist on all distributions, e.g suse does not provide it and for kiwi it's an optional plugin - Fixed missing provides tag When building WSL images the image type is set to appx. Therefore obs is looking for what provides kiwi-image:appx This provides tag was missing OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=191
This commit is contained in:
Marcus Schaefer
Git OBS Bridge
parent
f873c205ea
commit
597c30d043
4
PKGBUILD
4
PKGBUILD
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay')
|
pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay')
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
pkgver=9.22.1
|
pkgver=9.23.5
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
pkgdesc="KIWI - Appliance Builder Next Generation"
|
pkgdesc="KIWI - Appliance Builder Next Generation"
|
||||||
url="https://github.com/SUSE/kiwi/tarball/master"
|
url="https://github.com/SUSE/kiwi/tarball/master"
|
||||||
@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep)
|
|||||||
provides=(kiwi-ng kiwi)
|
provides=(kiwi-ng kiwi)
|
||||||
source=("${pkgname}.tar.gz")
|
source=("${pkgname}.tar.gz")
|
||||||
changelog="${pkgname}.changes"
|
changelog="${pkgname}.changes"
|
||||||
md5sums=('d4b1b56e307ddb1f3488e4cbfa730659')
|
md5sums=('ac880ff43e02de2a5d217d21668238bb')
|
||||||
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|||||||
@ -1,3 +1,346 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 15 09:26:09 CET 2021 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.23.4 → 9.23.5
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 12 17:31:13 CET 2021 - Jesus Bermudez Velazquez <jesus.bv@suse.com>
|
||||||
|
|
||||||
|
- Update contributing link in README
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jan 11 09:48:00 CET 2021 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.23.3 → 9.23.4
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 23 16:59:52 CET 2020 - David Cassany <dcassany@suse.com>
|
||||||
|
|
||||||
|
- Fixes the rpmdb bootstrap management for DNF on SUSE
|
||||||
|
|
||||||
|
This commit makes sure that the compatibility symlink for
|
||||||
|
/var/lib/rpm is created when the host rpmdb path is set to something
|
||||||
|
different. This fixes a mismatch on bootstrapping SUSE using DNF.
|
||||||
|
|
||||||
|
Fixes #1669
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 22 11:26:18 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.23.2 → 9.23.3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 21 15:17:30 CET 2020 - David Cassany <dcassany@suse.com>
|
||||||
|
|
||||||
|
- Modify lsblk flags for a consistent output across distros
|
||||||
|
|
||||||
|
This commit modifies the lsblk flags to make use of the list format
|
||||||
|
instead of raw output. `--list` flag seams to keep the geometry order
|
||||||
|
and produces a consistent output in several distros.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 18 15:10:19 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.23.1 → 9.23.2
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 18 13:00:07 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Update kiwi-systemdeps-image-validation
|
||||||
|
|
||||||
|
Make python anymarkup to be only recommended. The package
|
||||||
|
does not exist on all distributions, e.g suse does not
|
||||||
|
provide it and for kiwi it's an optional plugin
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 18 12:56:16 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Fixed missing provides tag
|
||||||
|
|
||||||
|
When building WSL images the image type is set to appx.
|
||||||
|
Therefore obs is looking for what provides kiwi-image:appx
|
||||||
|
This provides tag was missing
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 18 12:47:35 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Don't install obsolete requires packages
|
||||||
|
|
||||||
|
The derived docker build test installs obsolete kiwi requires
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 17 21:51:17 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.23.0 → 9.23.1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 17 18:09:11 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Update spec file
|
||||||
|
|
||||||
|
Complete and cleanup spec for drop in replacement of new
|
||||||
|
systemdeps sub-packages
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 17 17:28:49 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.22.4 → 9.23.0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 17 16:49:09 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Set min version python requirement
|
||||||
|
|
||||||
|
The use of new features like type hinting and annotations
|
||||||
|
requires a python version >= 3.6
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 17 12:29:50 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.22.3 → 9.22.4
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 17 11:30:49 CET 2020 - David Cassany <dcassany@suse.com>
|
||||||
|
|
||||||
|
- Use the generic Dict type
|
||||||
|
|
||||||
|
This commit makes use of the Dict type in the container factory classes
|
||||||
|
so these type hints aligned with the other dict related type hints in
|
||||||
|
KIWI code. This commit improves the refactor done in 99be52ba.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 17 10:44:24 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Update preferences documentation
|
||||||
|
|
||||||
|
The last commit added the optional arch attribute to the
|
||||||
|
preferences section but the documentation did not expose
|
||||||
|
this information. This is related to Issue #1640
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 16 17:57:52 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Fixed no-self-use issue from codacy report
|
||||||
|
|
||||||
|
The Logger.progress method is actually a static method
|
||||||
|
and should be used as such
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 16 17:42:33 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Added strong typing for the following API methods
|
||||||
|
|
||||||
|
* logger
|
||||||
|
* logger_color_formatter
|
||||||
|
* logger_filter
|
||||||
|
* xml_description
|
||||||
|
* xml_state
|
||||||
|
* markup/any
|
||||||
|
* markup/base
|
||||||
|
* markup/xml
|
||||||
|
|
||||||
|
This references Issue #1644
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 16 14:00:24 CET 2020 - David Cassany <dcassany@suse.com>
|
||||||
|
|
||||||
|
- Add 'arch' attribute to preferences
|
||||||
|
|
||||||
|
This commits adds the attribute 'arch' to preferences. It works
|
||||||
|
as any other 'arch' attribute within the schema. Preferences defined
|
||||||
|
with architectures that do not match the host are ignored. If no 'arch'
|
||||||
|
is provided it matches all any host architecture.
|
||||||
|
|
||||||
|
Fixes #1640
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 16 12:14:20 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Fixed color json output
|
||||||
|
|
||||||
|
kiwi supports output of yaml/json markup in color mode using
|
||||||
|
pjson. The writing of this data required to be encoded prior
|
||||||
|
output.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 15 15:54:17 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Fix vagrant documentation
|
||||||
|
|
||||||
|
The previous pull request adding a baseVagrantSetup method
|
||||||
|
and documentation broke the build of the docs due to invalid
|
||||||
|
indentation. The test pipeline has failed but the PR was
|
||||||
|
merged so this followup commit is needed to fix the docs
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 15 15:37:54 CET 2020 - David Cassany <dcassany@suse.com>
|
||||||
|
|
||||||
|
- Refactor iso_tools factory class
|
||||||
|
|
||||||
|
This commit refactors the IsoTools class and turns it into a
|
||||||
|
proper factory class and also includes type hints to facilitate
|
||||||
|
it's use from an API POV. Related to #1498
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 15 12:38:33 CET 2020 - David Cassany <dcassany@suse.com>
|
||||||
|
|
||||||
|
- Refactor container factory classes
|
||||||
|
|
||||||
|
This commit refactors the container related classes to turn them into
|
||||||
|
proper factory classes and also includes type hints to facilitate
|
||||||
|
it's use from an API POV. Related to #1498
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 15 11:31:45 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Delete traces of travis integration
|
||||||
|
|
||||||
|
Rename and clarify code that was still using the name travis.
|
||||||
|
Delete all references to the travis CI system from kiwi
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 15 10:27:25 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.22.2 → 9.22.3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 15 10:25:35 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Fixed SUSE doc update in gitlab pipeline
|
||||||
|
|
||||||
|
There is a dependency set to build_suse_doc in the push_suse_doc
|
||||||
|
target. But the build_suse_doc target has set except "master"
|
||||||
|
when the push_suse_doc has set only "master". Obviously this
|
||||||
|
doesn't fit together
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 15 10:11:52 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Bump version: 9.22.1 → 9.22.2
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 18:51:30 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Fixed source rpm check in gitlab
|
||||||
|
|
||||||
|
Fedora30 is EOL, thus there is no provider for
|
||||||
|
mock/fedora-30-x86_64.cfg anymore
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 18:45:15 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Delete travis setup
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 18:44:13 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Added gitlab pipeline to deploy kiwi documentation
|
||||||
|
|
||||||
|
Use a github token and a bit of script code to deploy
|
||||||
|
the kiwi online documentation to the gh-pages branch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 16:52:43 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Move CI system to gitlab
|
||||||
|
|
||||||
|
Travis made questionable changes to their open statement
|
||||||
|
and I'm not following this anymore.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 11 15:26:38 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Added check_swap_name_used_with_lvm runtime check
|
||||||
|
|
||||||
|
The optional oem-swapname is only effective if used together
|
||||||
|
with the LVM volume manager. A name for the swap space can
|
||||||
|
only be set if it is created as a LVM volume. In any other
|
||||||
|
case the name does not apply to the system. This condition
|
||||||
|
should be checked to avoid useless settings in the image
|
||||||
|
description.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 11 13:13:03 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Allow to customize swap volume name
|
||||||
|
|
||||||
|
Added a new element <oem-swapname> below the <oemconfig>
|
||||||
|
section which allows to specify a name for the swap volume
|
||||||
|
in case the LVM volume manager is used. The default if
|
||||||
|
not specified continuous to stay at: LVSwap. This
|
||||||
|
Fixes #1638
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 11 10:49:03 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Fixed base setup links
|
||||||
|
|
||||||
|
Do not create a link /var/run pointing to /run. This is unexpected
|
||||||
|
and looks like a left over from kiwi legacy which supported older
|
||||||
|
distributions who might have needed this. This Fixes #1643
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 09 13:45:22 CET 2020 - Dan Čermák <dcermak@suse.com>
|
||||||
|
|
||||||
|
- [doc] Clarify that suse* functions are also for openSUSE
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 09 12:44:29 CET 2020 - Dan Čermák <dcermak@suse.com>
|
||||||
|
|
||||||
|
- Add baseVagrantSetup helper function
|
||||||
|
|
||||||
|
This function is used to setup a vagrant box, so that each vagrant box creator
|
||||||
|
needn't implement it themselves.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 09 12:41:15 CET 2020 - Dan Čermák <dcermak@suse.com>
|
||||||
|
|
||||||
|
- Use DEBUG=0 by default in function Debug
|
||||||
|
|
||||||
|
This avoids script failures when invoked with `set -u`.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 09 09:28:50 CET 2020 - David Cassany <dcassany@suse.com>
|
||||||
|
|
||||||
|
- Make debootstrap repository explicit
|
||||||
|
|
||||||
|
This commit introduces the use_for_debootstrap attribute for
|
||||||
|
repositories of type apt-deb. This is a boolean attribute to specify
|
||||||
|
the repository that will be used for bootstrapping in apt-deb based
|
||||||
|
images. Only one can be selected and if none is specified KIWI just
|
||||||
|
makes use of the last one in the list.
|
||||||
|
|
||||||
|
Fixes #1593
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 08 15:24:18 CET 2020 - Neal Gompa <ngompa13@gmail.com>
|
||||||
|
|
||||||
|
- Refactor packaging to split out system dependencies into subpackages
|
||||||
|
|
||||||
|
The eventual goal is to eliminate the requirement to use magic in
|
||||||
|
build systems (e.g, OBS) to compose the necessary dependencies for
|
||||||
|
image builds, while making it easier for local users to discover
|
||||||
|
what they need to build appliances.
|
||||||
|
|
||||||
|
Fixes #1503
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 08 14:34:45 CET 2020 - Neal Gompa <ngompa13@gmail.com>
|
||||||
|
|
||||||
|
- Drop useless chkconfig dependency
|
||||||
|
|
||||||
|
We originally had chkconfig as a dependency because alternatives(8)
|
||||||
|
is part of chkconfig in RH/Fedora systems. Since we don't use that
|
||||||
|
anymore, we don't need this dependency.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 08 14:31:18 CET 2020 - Neal Gompa <ngompa13@gmail.com>
|
||||||
|
|
||||||
|
- Require gnupg on Debian/Ubuntu
|
||||||
|
|
||||||
|
Without this, it's not possible to do GPG verification of Debian/Ubuntu
|
||||||
|
repositories.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Dec 08 12:37:47 CET 2020 - Marcus Schäfer <ms@suse.de>
|
Tue Dec 08 12:37:47 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
@ -15,6 +358,13 @@ Tue Dec 08 12:21:11 CET 2020 - Marcus Schäfer <ms@suse.de>
|
|||||||
contains text. This commit fixes the validation to make use
|
contains text. This commit fixes the validation to make use
|
||||||
of the bool() method provided for these type of variables
|
of the bool() method provided for these type of variables
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 04 12:58:06 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
- Added SLE15 s390 FBA integration test
|
||||||
|
|
||||||
|
Build image for FBA disk
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 03 15:37:30 CET 2020 - Marcus Schäfer <ms@suse.de>
|
Thu Dec 03 15:37:30 CET 2020 - Marcus Schäfer <ms@suse.de>
|
||||||
|
|
||||||
|
|||||||
313
python-kiwi.spec
313
python-kiwi.spec
@ -43,8 +43,8 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: python-kiwi
|
Name: python-kiwi
|
||||||
Version: 9.22.1
|
Version: 9.23.5
|
||||||
Provides: kiwi-schema = 7.2
|
Provides: kiwi-schema = 7.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Url: https://github.com/OSInside/kiwi
|
Url: https://github.com/OSInside/kiwi
|
||||||
Summary: KIWI - Appliance Builder Next Generation
|
Summary: KIWI - Appliance Builder Next Generation
|
||||||
@ -58,7 +58,7 @@ Source: %{name}.tar.gz
|
|||||||
Source1: %{name}-rpmlintrc
|
Source1: %{name}-rpmlintrc
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: python%{python3_pkgversion}-%{develsuffix}
|
BuildRequires: python%{python3_pkgversion}-%{develsuffix} >= 3.6
|
||||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
%if 0%{?fedora} || 0%{?suse_version}
|
%if 0%{?fedora} || 0%{?suse_version}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -69,65 +69,24 @@ BuildRequires: shadow
|
|||||||
%if 0%{?debian} || 0%{?ubuntu}
|
%if 0%{?debian} || 0%{?ubuntu}
|
||||||
BuildRequires: passwd
|
BuildRequires: passwd
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
|
||||||
BuildRequires: chkconfig
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The KIWI Image System provides an operating system image builder
|
The KIWI Image System provides an operating system image builder
|
||||||
for Linux supported hardware platforms as well as for virtualization
|
for Linux supported hardware platforms as well as for virtualization
|
||||||
and cloud systems like Xen, KVM, VMware, EC2 and more.
|
and cloud systems like Xen, KVM, VMware, EC2 and more.
|
||||||
|
|
||||||
# python3-kiwi
|
%package -n kiwi-systemdeps-core
|
||||||
%package -n python%{python3_pkgversion}-kiwi
|
Summary: KIWI - Core host system dependencies
|
||||||
Summary: KIWI - Appliance Builder Next Generation
|
Group: %{sysgroup}
|
||||||
Group: Development/Languages/Python
|
Provides: kiwi-image-tbz-requires = %{version}-%{release}
|
||||||
Obsoletes: python2-kiwi
|
Obsoletes: kiwi-image-tbz-requires < %{version}-%{release}
|
||||||
Conflicts: python2-kiwi
|
%if "%{_vendor}" != "debbuild"
|
||||||
Conflicts: kiwi-man-pages < %{version}
|
Provides: kiwi-image:tbz
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu}
|
|
||||||
Recommends: jing
|
|
||||||
%endif
|
|
||||||
%if 0%{?ubuntu} || 0%{?debian}
|
|
||||||
Requires: python%{python3_pkgversion}-yaml
|
|
||||||
%else
|
|
||||||
Requires: python%{python3_pkgversion}-PyYAML
|
|
||||||
%endif
|
|
||||||
Requires: python%{python3_pkgversion}-docopt
|
|
||||||
Requires: python%{python3_pkgversion}-lxml
|
|
||||||
Requires: python%{python3_pkgversion}-requests
|
|
||||||
Requires: python%{python3_pkgversion}-setuptools
|
|
||||||
%if (0%{?suse_version} && 0%{?suse_version} < 1550)
|
|
||||||
Requires: python%{python3_pkgversion}-xattr
|
|
||||||
%else
|
|
||||||
Requires: python%{python3_pkgversion}-pyxattr
|
|
||||||
%endif
|
%endif
|
||||||
# tools used by kiwi
|
# tools used by kiwi
|
||||||
%if 0%{?suse_version}
|
|
||||||
%ifarch x86_64
|
|
||||||
Requires: grub2-x86_64-efi
|
|
||||||
%endif
|
|
||||||
%ifarch %{ix86} x86_64
|
|
||||||
Recommends: gfxboot
|
|
||||||
%endif
|
|
||||||
Requires: qemu-tools
|
|
||||||
Requires: squashfs
|
|
||||||
Requires: gptfdisk
|
|
||||||
%endif
|
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
|
||||||
%ifarch x86_64
|
|
||||||
Requires: grub2-efi-x64
|
|
||||||
%endif
|
|
||||||
Requires: chkconfig
|
|
||||||
Requires(post): chkconfig
|
|
||||||
Requires(postun): chkconfig
|
|
||||||
Requires: qemu-img
|
|
||||||
Requires: squashfs-tools
|
|
||||||
Requires: gdisk
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||||
Recommends: gnupg2
|
Recommends: gnupg2
|
||||||
%endif
|
%endif
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# If it's available, let's pull it in
|
# If it's available, let's pull it in
|
||||||
Recommends: dnf
|
Recommends: dnf
|
||||||
@ -148,22 +107,79 @@ Provides: kiwi-packagemanager:zypper
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?debian} || 0%{?ubuntu}
|
%if 0%{?debian} || 0%{?ubuntu}
|
||||||
Requires: debootstrap
|
Requires: debootstrap
|
||||||
Requires: qemu-utils
|
Requires: gnupg
|
||||||
Requires: squashfs-tools
|
|
||||||
Requires: gdisk
|
|
||||||
Recommends: gnupg
|
|
||||||
%endif
|
%endif
|
||||||
Requires: dosfstools
|
|
||||||
Requires: e2fsprogs
|
|
||||||
Requires: xorriso
|
|
||||||
Requires: grub2
|
|
||||||
Requires: kiwi-tools
|
Requires: kiwi-tools
|
||||||
Requires: lvm2
|
|
||||||
Requires: mtools
|
Requires: mtools
|
||||||
Requires: parted
|
|
||||||
Requires: kpartx
|
|
||||||
Requires: rsync
|
Requires: rsync
|
||||||
Requires: tar >= 1.2.7
|
Requires: tar >= 1.2.7
|
||||||
|
|
||||||
|
%description -n kiwi-systemdeps-core
|
||||||
|
This metapackage installs the necessary system dependencies
|
||||||
|
to run KIWI.
|
||||||
|
|
||||||
|
%package -n kiwi-systemdeps-containers
|
||||||
|
Summary: KIWI - host requirements for container images
|
||||||
|
Group: %{sysgroup}
|
||||||
|
Provides: kiwi-image-docker-requires = %{version}-%{release}
|
||||||
|
Obsoletes: kiwi-image-docker-requires < %{version}-%{release}
|
||||||
|
Provides: kiwi-image-wsl-requires = %{version}-%{release}
|
||||||
|
Obsoletes: kiwi-image-wsl-requires < %{version}-%{release}
|
||||||
|
%if "%{_vendor}" != "debbuild"
|
||||||
|
Provides: kiwi-image:docker
|
||||||
|
Provides: kiwi-image:appx
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
Requires: umoci
|
||||||
|
Requires: fb-util-for-appx
|
||||||
|
%else
|
||||||
|
Requires: buildah
|
||||||
|
%endif
|
||||||
|
Requires: skopeo
|
||||||
|
|
||||||
|
%description -n kiwi-systemdeps-containers
|
||||||
|
Host setup helper to pull in all packages required/useful on
|
||||||
|
the build host to build container images e.g docker, wsl
|
||||||
|
|
||||||
|
%package -n kiwi-systemdeps-iso-media
|
||||||
|
Summary: KIWI - host requirements for live and install iso images
|
||||||
|
Group: %{sysgroup}
|
||||||
|
Provides: kiwi-image-iso-requires = %{version}-%{release}
|
||||||
|
Obsoletes: kiwi-image-iso-requires < %{version}-%{release}
|
||||||
|
%if "%{_vendor}" != "debbuild"
|
||||||
|
Provides: kiwi-image:iso
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
Requires: checkmedia
|
||||||
|
%endif
|
||||||
|
Requires: xorriso
|
||||||
|
%ifarch %{ix86} x86_64
|
||||||
|
Requires: syslinux
|
||||||
|
%endif
|
||||||
|
Requires: kiwi-systemdeps-core = %{version}-%{release}
|
||||||
|
Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
|
||||||
|
Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
|
||||||
|
|
||||||
|
%description -n kiwi-systemdeps-iso-media
|
||||||
|
Host setup helper to pull in all packages required/useful on
|
||||||
|
the build host to build live and install iso images.
|
||||||
|
|
||||||
|
%package -n kiwi-systemdeps-bootloaders
|
||||||
|
Summary: KIWI - host requirements for configuring bootloaders
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
%ifarch x86_64
|
||||||
|
Requires: grub2-x86_64-efi
|
||||||
|
%endif
|
||||||
|
%ifarch %{ix86} x86_64
|
||||||
|
Recommends: gfxboot
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
|
%ifarch x86_64
|
||||||
|
Requires: grub2-efi-x64
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
Requires: grub2
|
||||||
%ifarch %arm aarch64
|
%ifarch %arm aarch64
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Requires: uboot-tools
|
Requires: uboot-tools
|
||||||
@ -175,9 +191,158 @@ Requires: u-boot-tools
|
|||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
Requires: s390-tools
|
Requires: s390-tools
|
||||||
%endif
|
%endif
|
||||||
|
Requires: kiwi-systemdeps-core = %{version}-%{release}
|
||||||
|
|
||||||
|
%description -n kiwi-systemdeps-bootloaders
|
||||||
|
Host setup helper to pull in all packages required/useful on
|
||||||
|
the build host for configuring bootloaders on images.
|
||||||
|
|
||||||
|
%package -n kiwi-systemdeps-filesystems
|
||||||
|
Summary: KIWI - host requirements for filesystems
|
||||||
|
Group: %{sysgroup}
|
||||||
|
Provides: kiwi-image-pxe-requires = %{version}-%{release}
|
||||||
|
Obsoletes: kiwi-image-pxe-requires < %{version}-%{release}
|
||||||
|
Provides: kiwi-filesystem-requires = %{version}-%{release}
|
||||||
|
Obsoletes: kiwi-filesystem-requires < %{version}-%{release}
|
||||||
|
%if "%{_vendor}" != "debbuild"
|
||||||
|
Provides: kiwi-image:pxe
|
||||||
|
Provides: kiwi-image:kis
|
||||||
|
%if ! 0%{?el8}
|
||||||
|
Provides: kiwi-filesystem:btrfs
|
||||||
|
%endif
|
||||||
|
Provides: kiwi-filesystem:ext3
|
||||||
|
Provides: kiwi-filesystem:ext4
|
||||||
|
Provides: kiwi-filesystem:squashfs
|
||||||
|
Provides: kiwi-filesystem:xfs
|
||||||
|
%endif
|
||||||
|
Requires: dosfstools
|
||||||
|
Requires: e2fsprogs
|
||||||
|
Requires: xfsprogs
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
Requires: btrfsprogs
|
||||||
|
%else
|
||||||
|
%if ! 0%{?el8}
|
||||||
|
Requires: btrfs-progs
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
Requires: gptfdisk
|
||||||
|
Requires: squashfs
|
||||||
|
%else
|
||||||
|
Requires: gdisk
|
||||||
|
Requires: squashfs-tools
|
||||||
|
%endif
|
||||||
|
Requires: lvm2
|
||||||
|
Requires: parted
|
||||||
|
Requires: kpartx
|
||||||
|
Requires: kiwi-systemdeps-core = %{version}-%{release}
|
||||||
|
|
||||||
|
%description -n kiwi-systemdeps-filesystems
|
||||||
|
Host setup helper to pull in all packages required/useful on
|
||||||
|
the build host to build filesystem images
|
||||||
|
|
||||||
|
%package -n kiwi-systemdeps-disk-images
|
||||||
|
Summary: KIWI - host requirements for disk images
|
||||||
|
Group: %{sysgroup}
|
||||||
|
Provides: kiwi-image-oem-requires = %{version}-%{release}
|
||||||
|
Obsoletes: kiwi-image-oem-requires < %{version}-%{release}
|
||||||
|
Provides: kiwi-image-vmx-requires = %{version}-%{release}
|
||||||
|
Obsoletes: kiwi-image-vmx-requires < %{version}-%{release}
|
||||||
|
%if "%{_vendor}" != "debbuild"
|
||||||
|
Provides: kiwi-image:oem
|
||||||
|
Provides: kiwi-image:vmx
|
||||||
|
%endif
|
||||||
|
%if "%{_vendor}" == "debbuild"
|
||||||
|
Requires: qemu-utils
|
||||||
|
%else
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
Requires: qemu-tools
|
||||||
|
%else
|
||||||
|
Requires: qemu-img
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
|
||||||
|
Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
|
||||||
|
|
||||||
|
%description -n kiwi-systemdeps-disk-images
|
||||||
|
Host setup helper to pull in all packages required/useful on
|
||||||
|
the build host to build disk images
|
||||||
|
|
||||||
|
%package -n kiwi-systemdeps-image-validation
|
||||||
|
Summary: KIWI - host requirements for handling image descriptions better
|
||||||
|
Group: %{sysgroup}
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu}
|
||||||
|
Recommends: jing
|
||||||
|
%endif
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version}
|
||||||
|
Requires: python%{python3_pkgversion}-solv
|
||||||
|
%endif
|
||||||
|
%if ! (0%{?rhel} && 0%{?rhel} < 8)
|
||||||
|
Recommends: python%{python3_pkgversion}-anymarkup
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description -n kiwi-systemdeps-image-validation
|
||||||
|
Host setup helper to pull in all packages required/useful on
|
||||||
|
the build host to handling image descriptions better. This also
|
||||||
|
includes reading of image descriptions for different markup
|
||||||
|
languages
|
||||||
|
|
||||||
|
%package -n kiwi-systemdeps
|
||||||
|
Summary: KIWI - Host system dependencies
|
||||||
|
Group: %{sysgroup}
|
||||||
|
Requires: kiwi-systemdeps-core = %{version}-%{release}
|
||||||
|
Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
|
||||||
|
# None of the container build tools are available in Debian/Ubuntu
|
||||||
|
Requires: kiwi-systemdeps-containers = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
|
||||||
|
Requires: kiwi-systemdeps-disk-images = %{version}-%{release}
|
||||||
|
Requires: kiwi-systemdeps-iso-media = %{version}-%{release}
|
||||||
|
%if 0%{?fedora} || 0%{?suse_version}
|
||||||
|
Requires: kiwi-systemdeps-image-validation = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description -n kiwi-systemdeps
|
||||||
|
Host setup helper to pull in all packages required/useful to
|
||||||
|
leverage all functionality in KIWI.
|
||||||
|
|
||||||
|
# python3-kiwi
|
||||||
|
%package -n python%{python3_pkgversion}-kiwi
|
||||||
|
Summary: KIWI - Appliance Builder Next Generation
|
||||||
|
Group: %{pygroup}
|
||||||
|
Obsoletes: python2-kiwi
|
||||||
|
Conflicts: python2-kiwi
|
||||||
|
Conflicts: kiwi-man-pages < %{version}
|
||||||
|
Requires: python%{python3_pkgversion} >= 3.6
|
||||||
|
%if 0%{?ubuntu} || 0%{?debian}
|
||||||
|
Requires: python%{python3_pkgversion}-yaml
|
||||||
|
%else
|
||||||
|
Requires: python%{python3_pkgversion}-PyYAML
|
||||||
|
%endif
|
||||||
|
Requires: python%{python3_pkgversion}-docopt
|
||||||
|
Requires: python%{python3_pkgversion}-lxml
|
||||||
|
Requires: python%{python3_pkgversion}-requests
|
||||||
|
Requires: python%{python3_pkgversion}-setuptools
|
||||||
|
%if (0%{?suse_version} && 0%{?suse_version} < 1550)
|
||||||
|
Requires: python%{python3_pkgversion}-xattr
|
||||||
|
%else
|
||||||
|
Requires: python%{python3_pkgversion}-pyxattr
|
||||||
|
%endif
|
||||||
%if ! (0%{?rhel} && 0%{?rhel} < 8)
|
%if ! (0%{?rhel} && 0%{?rhel} < 8)
|
||||||
Recommends: kiwi-man-pages
|
Recommends: kiwi-man-pages
|
||||||
%endif
|
%endif
|
||||||
|
%if "%{_vendor}" == "debbuild"
|
||||||
|
# Avoid issues with not being able to use magic Provides
|
||||||
|
Requires: kiwi-systemdeps = %{version}-%{release}
|
||||||
|
%else
|
||||||
|
# Only require core dependencies, and allow OBS to pull the rest through magic Provides
|
||||||
|
Requires: kiwi-systemdeps-core = %{version}-%{release}
|
||||||
|
%if ! 0%{?el7}
|
||||||
|
# Retain default expectation for local installations
|
||||||
|
Recommends: kiwi-systemdeps = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n python%{python3_pkgversion}-kiwi
|
%description -n python%{python3_pkgversion}-kiwi
|
||||||
Python 3 library of the KIWI Image System. Provides an operating system
|
Python 3 library of the KIWI Image System. Provides an operating system
|
||||||
@ -434,6 +599,30 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%files -n kiwi-systemdeps-core
|
||||||
|
# Empty metapackage
|
||||||
|
|
||||||
|
%files -n kiwi-systemdeps-bootloaders
|
||||||
|
# Empty metapackage
|
||||||
|
|
||||||
|
%files -n kiwi-systemdeps-containers
|
||||||
|
# Empty metapackage
|
||||||
|
|
||||||
|
%files -n kiwi-systemdeps-iso-media
|
||||||
|
# Empty metapackage
|
||||||
|
|
||||||
|
%files -n kiwi-systemdeps-filesystems
|
||||||
|
# Empty metapackage
|
||||||
|
|
||||||
|
%files -n kiwi-systemdeps-disk-images
|
||||||
|
# Empty metapackage
|
||||||
|
|
||||||
|
%files -n kiwi-systemdeps-image-validation
|
||||||
|
# Empty metapackage
|
||||||
|
|
||||||
|
%files -n kiwi-systemdeps
|
||||||
|
# Empty metapackage
|
||||||
|
|
||||||
%files -n python%{python3_pkgversion}-kiwi
|
%files -n python%{python3_pkgversion}-kiwi
|
||||||
%dir %{_defaultdocdir}/python-kiwi
|
%dir %{_defaultdocdir}/python-kiwi
|
||||||
%{_bindir}/kiwi
|
%{_bindir}/kiwi
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:d9311a8077054c734b3b4d309d3b36845daee297478cfd127c662d5703a2a2f2
|
oid sha256:b758dff31ae996e06c6345f76ee4d2588e31e59e23928e6e4ab6267ffb2ceeba
|
||||||
size 1736072
|
size 1753044
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user