From dfc5b01c9cee4c95ca3384945dc33393bcc0e009 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Jan 19 2022 14:26:32 +0000
Subject: fix packaging


---

diff --git a/docs/source/plugins.rst b/docs/source/plugins.rst
index 79d3fe0..839678b 100644
--- a/docs/source/plugins.rst
+++ b/docs/source/plugins.rst
@@ -258,8 +258,8 @@ most simple configuration will look like:
 
 .. code-block:: shell
 
-   $ koji add-group kiwi-build-tag kiwi
-   $ koji add-group-pkg kiwi-build-tag kiwi kiwi-cli kiwi-systemdeps
+   $ koji add-group kiwi-build-tag kiwi-build
+   $ koji add-group-pkg kiwi-build-tag kiwi-build kiwi-cli kiwi-systemdeps
 
 Another thing we need to ensure is that we're building in chroot and not in
 container.
diff --git a/plugins/Makefile b/plugins/Makefile
index 6ea1d2a..caf0706 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1,11 +1,12 @@
+PYVER_MAJOR := $(shell $(PYTHON) -c 'import sys; print(".".join(sys.version.split(".")[:1]))')
 PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)
 
 CLIPLUGINDIR = $(PKGDIR)/koji_cli_plugins
 HUBPLUGINDIR = /usr/lib/koji-hub-plugins
 BUILDERPLUGINDIR = /usr/lib/koji-builder-plugins
-CLIFILES = $(wildcard cli/*.py)
-HUBFILES = $(wildcard hub/*.py)
-BUILDERFILES = $(wildcard builder/*.py)
+CLIFILES_ALL = $(wildcard cli/*.py)
+HUBFILES_ALL = $(wildcard hub/*.py)
+BUILDERFILES_ALL = $(wildcard builder/*.py)
 CLICONFDIR = /etc/koji/plugins
 HUBCONFDIR = /etc/koji-hub/plugins
 BUILDERCONFDIR = /etc/kojid/plugins
@@ -13,6 +14,16 @@ CLICONFFILES = $(wildcard cli/*.conf)
 HUBCONFFILES = $(wildcard hub/*.conf)
 BUILDERCONFFILES = $(wildcard builder/*.conf)
 
+ifeq ($(PYVER_MAJOR),2)
+	HUBFILES=$(filter-out hub/kiwi.py,$(HUBFILES_ALL))
+	BUILDERFILES=$(filter-out builder/kiwi.py,$(BUILDERFILES_ALL))
+	CLIFILES=$(filter-out cli/kiwi.py,$(CLIFILES_ALL))
+else
+	HUBFILES=$(HUBFILES_ALL)
+	BUILDERFILES=$(BUILDERFILES_ALL)
+	CLIFILES=$(CLIFILES_ALL)
+endif
+	
 _default:
 	@echo "nothing to make.  try make install"
 
diff --git a/plugins/builder/kiwi.py b/plugins/builder/kiwi.py
index 277f08a..cac54ee 100644
--- a/plugins/builder/kiwi.py
+++ b/plugins/builder/kiwi.py
@@ -303,7 +303,7 @@ class KiwiCreateImageTask(BaseBuildTask):
                           arch=arch,
                           task_id=self.id,
                           repo_id=repo_info['id'],
-                          install_group='kiwi',
+                          install_group='kiwi-build',
                           setup_dns=True,
                           bind_opts={'dirs': {'/dev': '/dev', }})
         broot.workdir = self.workdir
@@ -404,10 +404,7 @@ class KiwiCreateImageTask(BaseBuildTask):
         if os.path.exists(root_log_path):
             self.uploadFile(root_log_path, remoteName="image-root.log")
 
-        for ftype in ('disk_image', 'disk_format_image', 'installation_image'):
-            fdata = result_files.get(ftype)
-            if not fdata:
-                continue
+        for ftype, fdata in result_files.items():
             # hack to use correct paths derived from results
             filename = os.path.basename(fdata['filename'])
             (name, ext) = os.path.splitext(filename)