From 14ee3a45918ace5fd912ae0099df423dfe7f176e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= Date: Mon, 10 Apr 2017 15:56:02 +0200 Subject: [PATCH] Don't manage buildroot packages manually --- module_build_service/builder/CoprModuleBuilder.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/module_build_service/builder/CoprModuleBuilder.py b/module_build_service/builder/CoprModuleBuilder.py index 11ed0f74..e12d1670 100644 --- a/module_build_service/builder/CoprModuleBuilder.py +++ b/module_build_service/builder/CoprModuleBuilder.py @@ -54,13 +54,6 @@ class CoprModuleBuilder(GenericBuilder): backend = "copr" _build_lock = threading.Lock() - buildroot_packages = [ - "unzip", "tar", "cpio", "gawk", "xz", "sed", - "findutils", "util-linux", "bash", "info", "gcc", - "grep", "redhat-rpm-config", "shadow-utils", "rpm-build", - "rpm", "coreutils", "fedora-modular-release", "diffutils", - "make", "patch", "shadow-utils", - ] @module_build_service.utils.validate_koji_tag('tag_name') def __init__(self, owner, module, config, tag_name, components): @@ -75,6 +68,7 @@ class CoprModuleBuilder(GenericBuilder): self.chroot = "custom-1-x86_64" self.__prep = False + @classmethod def _get_client(cls, config): return CoprClient.create_from_file_config(config.copr_config) @@ -89,7 +83,11 @@ class CoprModuleBuilder(GenericBuilder): """ self.copr = self._get_copr_safe() self._create_module_safe() - self._update_chroot(packages=self.buildroot_packages) + + # @FIXME Not able to use gcc-c++ in chroot (RhBug: 1440889) + packages = groups["build"] - {"gcc-c++"} + self._update_chroot(packages=list(packages)) + if self.copr and self.copr.projectname and self.copr.username: self.__prep = True log.info("%r buildroot sucessfully connected." % self)