The package rpms/imagefactory-plugins.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/imagefactory-plugins.git/commit/?....
Change:
-ExcludeArch: i386 ppc64
Thanks.
Full change:
============
commit daa8ef506e972e3f0e02fa182a5165ef8ff30f6c
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed Mar 4 20:49:32 2020 +0000
fix for RHBZ#1793927
diff --git a/container-github-pr434.patch b/container-github-pr434.patch
new file mode 100644
index 0000000..23ad385
--- /dev/null
+++ b/container-github-pr434.patch
@@ -0,0 +1,57 @@
+From 12156b34856828e63f0278b38c807842d489aa78 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka(a)redhat.com>
+Date: Tue, 25 Feb 2020 14:26:01 +0100
+Subject: [PATCH] plugin docker: Fix arch string used for container metadata to
+ be compliant with the standard Fixes: RHBZ#1793927
+
+---
+ Docker/Docker.py | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/Docker/Docker.py b/Docker/Docker.py
+index 16d928d..d31c527 100644
+--- a/Docker/Docker.py
++++ b/Docker/Docker.py
+@@ -40,6 +40,15 @@ class Docker(object):
+ "gzip": "gzip -c %s > %s",
+ "bzip2": "bzip2 -c %s > %s" }
+
++ # In image metadata, Go arch is used to identify the architecture
++ #
https://docs.docker.com/registry/spec/manifest-v2-2/
++ goarchs = { "x86_64": "amd64",
++ "aarch64": "arm64",
++ "armv7hl": "armhfp",
++ "riscv64": "riscv64",
++ "ppc64le": "ppc64le",
++ "s390x": "s390x"}
++
+ # The templates below allow us to generate base images without a running docker
locally
+
+ # imcleod(a)redhat.com - 26-Aug-2014
+@@ -385,7 +394,7 @@ def _run_guestmount(g):
+ if set_arch_label:
+ if label == 'null':
+ label = dict()
+- label["architecture"] = tdlobj.arch
++ label["architecture"] = goarchs[tdlobj.arch]
+
+ rdict = { repository: { tag: docker_image_id } }
+
+@@ -394,16 +403,11 @@ def _run_guestmount(g):
+ raise Exception("No docker JSON template available for specified
docker version (%s)" % (dockerversion))
+ docker_json_template=self.docker_templates_dict[dockerversion]
+
+- arch = tdlobj.arch
+- if arch == "x86_64":
+- arch = "amd64"
+- elif arch == "armv7hl":
+- arch = "armhfp"
+ tdict = { }
+ tdict['commentstring'] = parameters.get('comment',
'Created by Image Factory')
+ tdict['os'] = parameters.get('os', 'linux')
+ tdict['createdtime'] =
datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ')
+- tdict['arch'] = arch
++ tdict['arch'] = goarchs[tdlobj.arch]
+ tdict['idstring'] = docker_image_id
+ tdict['cmd'] = cmd
+ tdict['env'] = env
diff --git a/imagefactory-plugins.spec b/imagefactory-plugins.spec
index 7d31833..b1094a0 100644
--- a/imagefactory-plugins.spec
+++ b/imagefactory-plugins.spec
@@ -32,19 +32,18 @@ fi \
exit 0
-Summary: Default plugins for the Image Factory system image generation tool
Name: imagefactory-plugins
Version: 1.1.15
-Release: 3%{?dist}
-Source0:
https://github.com/redhat-imaging/imagefactory/archive/imagefactory-%{ver...
-Patch0: imagefactory-1.1.14-utf8-config-id.patch
+Release: 4%{?dist}
+Summary: Default plugins for the Image Factory system image generation tool
License: ASL 2.0
-Group: Applications/System
URL:
https://github.com/redhat-imaging/imagefactory
+
+Source0:
https://github.com/redhat-imaging/imagefactory/archive/imagefactory-%{ver...
+Patch0: imagefactory-1.1.14-utf8-config-id.patch
+Patch1: container-github-pr434.patch
+
BuildArch: noarch
-%if 0%{?rhel} == 6
-ExcludeArch: i386 ppc64
-%endif
BuildRequires: python3
BuildRequires: python3-setuptools
BuildRequires: python3-rpm-macros
@@ -65,7 +64,6 @@
https://github.com/redhat-imaging/imagefactory for more information.
%package ovfcommon
Summary: common utilities to manipulate ovf-related objects
-License: ASL 2.0
Requires: oz >= 0.7.0
Requires: imagefactory-plugins
@@ -75,7 +73,6 @@ plugins.
%package OVA
Summary: Cloud plugin for generating OVA archives
-License: ASL 2.0
Requires: oz >= 0.7.0
Requires: imagefactory-plugins
Requires: imagefactory-plugins-ovfcommon
@@ -87,7 +84,6 @@ archive from.
%package IndirectionCloud
Summary: Cloud plugin for allowing images to modify other images
-License: ASL 2.0
Requires: oz >= 0.12.0
Requires: imagefactory-plugins
Requires: imagefactory-plugin-api = 1.0
@@ -101,7 +97,6 @@ arbitrary host OS and package selection for the actual media creation
tools.
%package TinMan
Summary: OS plugin for Fedora
-License: ASL 2.0
Requires: oz >= 0.12.0
Requires: imagefactory-plugins
Requires: imagefactory-plugin-api = 1.0
@@ -112,7 +107,6 @@ An OS plugin to support Fedora OSes
%if 0%{include_openstack}
%package OpenStack
Summary: Cloud plugin for OpenStack running on KVM
-License: ASL 2.0
Requires: python3-glanceclient
Requires: imagefactory-plugins
Requires: imagefactory-plugin-api = 1.0
@@ -122,7 +116,6 @@ A Cloud plugin to support OpenStack running on top of KVM.
%package Rackspace
Summary: Cloud plugin for Rackspace
-License: ASL 2.0
Requires: python-novaclient
Requires: python-pyrax
Requires: imagefactory-plugins
@@ -143,7 +136,6 @@ can be used to do "snapshot" style builds.
%if 0%{include_nova_image_builder}
%package Nova
Summary: OS plugin that allows imagefactory to use Nova instances to build base images.
-License: ASL 2.0
Requires: python3-novaclient
Requires: oz >= 0.12.0
Requires: imagefactory-plugins
@@ -156,7 +148,6 @@ An alternative to the TinMan plugin for creating base images using an
OpenStack
%if 0%{?build_mock}
%package MockOS
Summary: Mock OS plugin
-License: ASL 2.0
Requires: imagefactory-plugins
Requires: imagefactory-plugin-api = 1.0
@@ -168,7 +159,6 @@ For testing use only.
%package MockCloud
Summary: Mock Cloud plugin
-License: ASL 2.0
Requires: imagefactory-plugins
Requires: imagefactory-plugin-api = 1.0
@@ -182,7 +172,6 @@ For testing use only.
%package RHEVM
Summary: RHEVM Cloud plugin
-License: ASL 2.0
Requires: imagefactory-plugins
Requires: imagefactory-plugins-ovfcommon
#Make optional for now to allow core coversion features to work
@@ -195,7 +184,6 @@ A plugin for RHEVM "clouds"
%package vSphere
Summary: vSphere Cloud plugin
-License: ASL 2.0
Requires: imagefactory-plugins
#This has been made conditional in the plugin - will need to be replaced
#Requires: python-psphere
@@ -208,7 +196,6 @@ A plugin for vSphere "clouds"
%package Docker
Summary: Cloud plugin for Docker
-License: ASL 2.0
Requires: tar
%description Docker
@@ -216,7 +203,6 @@ A Cloud plugin to support Docker
%package HyperV
Summary: Cloud plugin for HyperV
-License: ASL 2.0
Requires: qemu-img
%description HyperV
@@ -224,7 +210,6 @@ A Cloud plugin to support HyperV
%package GCE
Summary: Cloud plugin for GCE
-License: ASL 2.0
Requires: qemu-img
Requires: tar
@@ -238,6 +223,7 @@ rm -rf *
mv ../imagefactory_plugins/* .
rmdir ../imagefactory_plugins/
%patch0 -p1
+%patch1 -p1
%build
%py3_build
@@ -342,7 +328,7 @@ rm -rf %{buildroot}%{python3_sitelib}/imagefactory_plugins/EC2
%auto_register_macro_postun GCE
%files
-%doc COPYING
+%license COPYING
%dir %{python3_sitelib}/imagefactory_plugins
%{python3_sitelib}/imagefactory_plugins/__init__.py*
%{python3_sitelib}/imagefactory_plugins/__pycache__/*.py*
@@ -415,6 +401,9 @@ rm -rf %{buildroot}%{python3_sitelib}/imagefactory_plugins/EC2
%{python3_sitelib}/imagefactory_plugins/GCE/*
%changelog
+* Wed Mar 04 2020 Peter Robinson <pbrobinson(a)fedoraproject.org> - 1.1.15-4
+- fix for RHBZ#1793927
+
* Fri Feb 07 2020 Kevin Fenzi <kevin(a)scrye.com> - 1.1.15-3
- Drop EC2 plugin as it uses euca2ools which is python2 and no longer in Fedora. Fixes
bug #1762327