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=f9d7755d26c0a....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit f9d7755d26c0a67c9a33d9c6df008bf0219fda7e
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Thu Jul 4 08:18:06 2019 -0400
Upgrade to 9.17.41 (RH#1713612)
- Switch to requiring grub2 tools and modules instead of grub2-efi
- Do not require grub2 on s390x
diff --git a/.gitignore b/.gitignore
index a1f2f86..803c4fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/kiwi-9.17.27.tar.gz
/kiwi-9.17.34.tar.gz
/kiwi-9.17.38.tar.gz
+/kiwi-9.17.41.tar.gz
diff --git a/kiwi.spec b/kiwi.spec
index e0c81c3..6fa7add 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,7 +11,7 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
Name: kiwi
-Version: 9.17.38
+Version: 9.17.41
Release: 1%{?dist}
URL:
http://suse.github.io/kiwi/
Summary: Flexible operating system image builder
@@ -72,7 +72,6 @@ Requires: dosfstools
Requires: e2fsprogs
Requires: xorriso
Requires: gdisk
-Requires: grub2
Requires: %{name}-tools = %{version}-%{release}
Requires: lvm2
Requires: mtools
@@ -100,8 +99,24 @@ Requires: buildah
%ifarch %{arm} aarch64
Requires: uboot-tools
%endif
+%ifnarch s390 s390x
+# grub isn't available on s390(x) systems
+Requires: grub2-tools
+Requires: grub2-tools-extra
+Requires: grub2-tools-minimal
+%endif
+%ifarch x86_64 aarch64
+Requires: grub2-tools-efi
+%endif
%ifarch x86_64
-Requires: grub2-efi
+Requires: grub2-efi-x64-modules
+Requires: grub2-efi-ia32-modules
+%endif
+%ifarch %{ix86} x86_64
+Requires: grub2-pc-modules
+%endif
+%ifarch aarch64
+Requires: grub2-efi-aa64-modules
%endif
%ifarch s390 s390x
Requires: s390utils
@@ -327,6 +342,12 @@ done
# Empty metapackage
%changelog
+* Thu Jul 04 2019 Neal Gompa <ngompa13(a)gmail.com> - 9.17.41-1
+- Upgrade to 9.17.41 (RH#1713612)
+- Switch to requiring grub2 tools and modules instead of grub2-efi
+- Do not require grub2 on s390x
+- Drop spec cruft for pre Fedora 29
+
* Mon Apr 22 2019 Neal Gompa <ngompa13(a)gmail.com> - 9.17.38-1
- Upgrade to 9.17.38 (RH#1698619)
diff --git a/sources b/sources
index 297ef74..c1a487c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.17.38.tar.gz) =
49c3537c5de8b61675fc492ba2cd1b14e5425ba3f2c7896868ecc1b71e0fc1f35ea2368f92d686609f0c7c1eac6aa46145a13974cde9cc347976c12cb4481e42
+SHA512 (kiwi-9.17.41.tar.gz) =
8175942f2e361e14d8151a79d18c0deb32f0c6105afad22beb73013f846644245159c5e63ccb08dd09d4bc02e4567ac3b63544db3cc34701f4ce3a11da5525c3
commit 38bafa8897b13b657cae8296150ac22ff45be4a7
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Thu Jul 4 04:58:08 2019 -0400
Remove unused Python 2 module build condition
diff --git a/kiwi.spec b/kiwi.spec
index 55c7a58..e0c81c3 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -1,10 +1,3 @@
-# Default to Python 2 being removed for Fedora 29+
-%if 0%{?fedora} < 29
-%bcond_without python2
-%else
-%bcond_with python2
-%endif
-
# Enable Python dependency generation
%{?python_enable_dependency_generator}
@@ -39,10 +32,6 @@ BuildRequires: dracut
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: make
-%if %{with python2}
-BuildRequires: python2-devel
-BuildRequires: python2-setuptools
-%endif
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: shadow-utils
@@ -117,30 +106,13 @@ Requires: grub2-efi
%ifarch s390 s390x
Requires: s390utils
%endif
-%if ! %{with python2}
+# Python 2 module is no longer available
Obsoletes: python2-%{name} < %{version}-%{release}
-%endif
%description systemdeps
This metapackage installs the necessary system dependencies
to run KIWI.
-%if %{with python2}
-%package -n python2-%{name}
-Summary: KIWI - Python 2 implementation
-Requires: %{name}-systemdeps = %{version}-%{release}
-Requires: python2-setuptools
-# Conflict with flumotion that was pre kiwi-gtk package rename
-Conflicts: flumotion < 0.11.0.1-9
-BuildArch: noarch
-%{?python_provide:%python_provide python2-%{name}}
-
-%description -n python2-%{name}
-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.
-%endif
-
%package -n python3-%{name}
Summary: KIWI - Python 3 implementation
Requires: kiwi-systemdeps = %{version}-%{release}
@@ -274,15 +246,9 @@ sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py
# Because there are some compiled stuff
%set_build_flags
-%if %{with python2}
-%py2_build
-%endif
%py3_build
%install
-%if %{with python2}
-%py2_install
-%endif
%py3_install
# Install dracut modules (yes, the slash is needed!)
@@ -311,14 +277,6 @@ done
%fdupes %{buildroot}%{_sharedstatedir}/tftpboot
%endif
-%if %{with python2}
-%files -n python2-%{name}
-%license LICENSE
-%{_bindir}/kiwi-ng-2*
-%{_bindir}/kiwicompat-2*
-%{python2_sitelib}/kiwi*/
-%endif
-
%files -n python3-%{name}
%license LICENSE
%{_bindir}/kiwi-ng-3*