The package rpms/kiwi.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kiwi.git/commit/?id=dd34997474a80....
Change:
+%ifnarch ppc64 %{ix86}
Thanks.
Full change:
============
commit dd34997474a8096267bcb8df4007efad3869c28d
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Mon Mar 8 10:53:49 2021 -0500
Update to 9.23.20 (RH#1904111)
diff --git a/.gitignore b/.gitignore
index 4ee7e6e..6680a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/kiwi-9.21.5.tar.gz
/kiwi-9.21.7.tar.gz
/kiwi-9.21.26.tar.gz
+/kiwi-9.23.20.tar.gz
diff --git a/kiwi.spec b/kiwi.spec
index 6a1a6b8..d28419a 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,8 +11,8 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
Name: kiwi
-Version: 9.21.26
-Release: 3%{?dist}
+Version: 9.23.20
+Release: 1%{?dist}
URL:
http://osinside.github.io/kiwi/
Summary: Flexible operating system image builder
License: GPLv3+
@@ -45,14 +45,11 @@ BuildRequires: python3dist(six)
%description %{desc}
-%package systemdeps
-Summary: Common system dependencies for KIWI
-Provides: kiwi-image:docker
-Provides: kiwi-image:iso
-Provides: kiwi-image:oem
-Provides: kiwi-image:pxe
+%package systemdeps-core
+Summary: KIWI - Core host system dependencies
+Provides: kiwi-image-tbz-requires = %{version}-%{release}
+Obsoletes: kiwi-image-tbz-requires < %{version}-%{release}
Provides: kiwi-image:tbz
-Provides: kiwi-image:vmx
# tools used by kiwi
# For building Fedora, RHEL/CentOS, and Mageia based images
Requires: dnf
@@ -68,19 +65,53 @@ Provides: kiwi-packagemanager:microdnf
Requires: zypper
Provides: kiwi-packagemanager:zypper
%endif
-# Common tool dependencies
-Requires: device-mapper-multipath
-Requires: dosfstools
-Requires: e2fsprogs
-Requires: xorriso
-Requires: gdisk
+%if 0%{?fedora} || 0%{?rhel} >= 8
+# For building Debian/Ubuntu based images
+Recommends: debootstrap
+Recommends: gnupg2
+%endif
+%if 0%{?fedora}
+# For building Arch based images
+Recommends: pacman
+%endif
Requires: %{name}-tools = %{version}-%{release}
-Requires: lvm2
Requires: mtools
-Requires: parted
-Requires: qemu-img
Requires: rsync
-Requires: squashfs-tools
+Requires: tar >= 1.2.7
+# Python 2 module is no longer available
+Obsoletes: python2-%{name} < %{version}-%{release}
+
+%description systemdeps-core
+This metapackage installs the necessary system dependencies
+to run KIWI.
+
+%ifnarch ppc64 %{ix86}
+%package systemdeps-containers
+Summary: KIWI - host requirements for container images
+Provides: kiwi-image:docker
+# No WSL stuff just yet...
+#Provides: kiwi-image:appx
+Provides: kiwi-image-docker-requires = %{version}-%{release}
+Obsoletes: kiwi-image-docker-requires < %{version}-%{release}
+# No WSL stuff just yet...
+#Provides: kiwi-image-wsl-requires = %{version}-%{release}
+#Obsoletes: kiwi-image-wsl-requires < %{version}-%{release}
+Requires: buildah
+Requires: skopeo
+# No WSL stuff just yet...
+#Requires: fb-util-for-appx
+
+%description systemdeps-containers
+Host setup helper to pull in all packages required/useful on
+the build host to build container images e.g docker, wsl
+%endif
+
+%package systemdeps-iso-media
+Summary: KIWI - host requirements for live and install iso images
+Provides: kiwi-image:iso
+Provides: kiwi-image-iso-requires = %{version}-%{release}
+Obsoletes: kiwi-image-iso-requires < %{version}-%{release}
+Requires: xorriso
%ifarch %{ix86} x86_64
# Pull in syslinux when it's x86
%if 0%{?fedora} || 0%{?rhel} >= 8
@@ -88,25 +119,29 @@ Requires: syslinux-nonlinux
%endif
Requires: syslinux
%endif
-Requires: tar >= 1.2.7
-%if 0%{?fedora} || 0%{?rhel} >= 8
-# For building Debian/Ubuntu based images
-Recommends: debootstrap
-Recommends: gnupg2
+%ifarch x86_64
+Requires: grub2-efi-x64-cdboot
+Requires: grub2-efi-ia32-cdboot
%endif
-%if 0%{?fedora}
-# For building Arch based images
-Recommends: pacman
+%ifarch aarch64
+Requires: grub2-efi-aa64-cdboot
%endif
-%if 0%{?fedora} || 0%{?rhel} >= 8
-# For schema validation
-Recommends: jing
+%if 0%{?fedora}
+%ifarch %{arm}
+Requires: grub2-efi-arm-cdboot
%endif
-%ifnarch ppc64 %{ix86}
-# buildah isn't available on ppc64 or x86_32
-Requires: buildah
-Requires: skopeo
%endif
+Requires: qemu-img
+Requires: kiwi-systemdeps-core = %{version}-%{release}
+Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
+Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
+
+%description 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 systemdeps-bootloaders
+Summary: KIWI - host requirements for configuring bootloaders
%ifarch %{arm} aarch64
Requires: uboot-tools
%endif
@@ -120,28 +155,130 @@ Requires: grub2-tools-minimal
Requires: grub2-tools-efi
%endif
%ifarch x86_64
+Requires: grub2-efi-x64
Requires: grub2-efi-x64-modules
+Requires: grub2-efi-ia32
Requires: grub2-efi-ia32-modules
%endif
%ifarch %{ix86} x86_64
+Requires: grub2-pc
Requires: grub2-pc-modules
%endif
%ifarch aarch64
Requires: grub2-efi-aa64-modules
%endif
+%if 0%{?fedora}
+# grub-efi for armv7hl is only available for Fedora
+%ifarch %{arm}
+Requires: grub2-efi-arm
+Requires: grub2-efi-arm-modules
+%endif
+%endif
%ifarch s390 s390x
Requires: s390utils
%endif
-# Python 2 module is no longer available
-Obsoletes: python2-%{name} < %{version}-%{release}
+Requires: kiwi-systemdeps-core = %{version}-%{release}
+
+%description systemdeps-bootloaders
+Host setup helper to pull in all packages required/useful on
+the build host for configuring bootloaders on images.
+
+%package systemdeps-filesystems
+Summary: KIWI - host requirements for filesystems
+Provides: kiwi-image:pxe
+Provides: kiwi-image:kis
+%if ! (0%{?rhel} >= 8)
+Provides: kiwi-filesystem:btrfs
+%endif
+Provides: kiwi-filesystem:ext2
+Provides: kiwi-filesystem:ext3
+Provides: kiwi-filesystem:ext4
+Provides: kiwi-filesystem:squashfs
+Provides: kiwi-filesystem:xfs
+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}
+Requires: dosfstools
+Requires: e2fsprogs
+Requires: xfsprogs
+%if ! (0%{?rhel} >= 8)
+Requires: btrfs-progs
+%endif
+Requires: gdisk
+Requires: squashfs-tools
+Requires: lvm2
+Requires: parted
+Requires: kpartx
+Requires: cryptsetup
+Requires: kiwi-systemdeps-core = %{version}-%{release}
+
+%description systemdeps-filesystems
+Host setup helper to pull in all packages required/useful on
+the build host to build filesystem images
+
+%package systemdeps-disk-images
+Summary: KIWI - host requirements for disk images
+Provides: kiwi-image:oem
+Provides: kiwi-image:vmx
+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}
+Requires: qemu-img
+Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
+Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
+
+%description systemdeps-disk-images
+Host setup helper to pull in all packages required/useful on
+the build host to build disk images
+
+%package systemdeps-image-validation
+Summary: KIWI - host requirements for handling image descriptions better
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Recommends: jing
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Requires: python3-solv
+%endif
+%if ! (0%{?rhel} && 0%{?rhel} < 8)
+Recommends: python3-anymarkup
+%endif
+
+%description 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 systemdeps
+Summary: KIWI - Host system dependencies
+Requires: kiwi-systemdeps-core = %{version}-%{release}
+Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
+%ifnarch ppc64 %{ix86}
+# buildah isn't available on ppc64 or x86_32
+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%{?rhel}
+Requires: kiwi-systemdeps-image-validation = %{version}-%{release}
+%endif
%description systemdeps
-This metapackage installs the necessary system dependencies
-to run KIWI.
+Host setup helper to pull in all packages required/useful to
+leverage all functionality in KIWI.
+
%package -n python3-%{name}
Summary: KIWI - Python 3 implementation
-Requires: kiwi-systemdeps = %{version}-%{release}
+# 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
Requires: python3-setuptools
BuildArch: noarch
%{?python_provide:%python_provide python3-%{name}}
@@ -358,10 +495,36 @@ done
%license LICENSE
%{_prefix}/lib/dracut/modules.d/90kiwi-overlay/
+%files systemdeps-core
+# Empty metapackage
+
+%files systemdeps-bootloaders
+# Empty metapackage
+
+%ifnarch ppc64 %{ix86}
+%files systemdeps-containers
+# Empty metapackage
+%endif
+
+%files systemdeps-iso-media
+# Empty metapackage
+
+%files systemdeps-filesystems
+# Empty metapackage
+
+%files systemdeps-disk-images
+# Empty metapackage
+
+%files systemdeps-image-validation
+# Empty metapackage
+
%files systemdeps
# Empty metapackage
%changelog
+* Mon Mar 08 2021 Neal Gompa <ngompa13(a)gmail.com> - 9.23.20-1
+- Update to 9.23.20 (RH#1904111)
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
9.21.26-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 88c7095..20b972d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.21.26.tar.gz) =
dc5f69295c3c0772dbfa361ff1a98d691659e06c20c00977b4f01749bd6f2c3de8b7f1789f426da64d1f1dafba9a2d34975744cc82e0dc451f54c49a98757428
+SHA512 (kiwi-9.23.20.tar.gz) =
17f30f55194ae926ea9c131ca500cbe776e456013125ba783a1611efbf7aaffa60866cdf3679e33d8d3259f426489a566ba2005c35147a95fe41681aab2a2779
commit f8a8db4fd8086bf8adcdf6bdac1e0c5437e7cf03
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 15:55:20 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/kiwi.spec b/kiwi.spec
index 3235c0e..6a1a6b8 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -12,7 +12,7 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
Name: kiwi
Version: 9.21.26
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://osinside.github.io/kiwi/
Summary: Flexible operating system image builder
License: GPLv3+
@@ -362,6 +362,9 @@ done
# Empty metapackage
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
9.21.26-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Fri Nov 20 2020 Neal Gompa <ngompa13(a)gmail.com> - 9.21.26-2
- Add weak dependency for pacman to enable Arch image builds