From cc2c83a84d17b0cc99e151f7f5d21b6038a8710f Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Fri, 16 Feb 2024 13:01:17 +0100 Subject: [PATCH] rpmbuild: don't set bootstrap_image_ready for rawhide Fix #3140 --- rpmbuild/mock-custom-build.cfg.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpmbuild/mock-custom-build.cfg.j2 b/rpmbuild/mock-custom-build.cfg.j2 index 248df7d0a..511d897c9 100644 --- a/rpmbuild/mock-custom-build.cfg.j2 +++ b/rpmbuild/mock-custom-build.cfg.j2 @@ -2,9 +2,12 @@ include('/etc/mock/{{ chroot }}.cfg') config_opts['rpmbuild_networking'] = True config_opts['use_host_resolv'] = True +{# See https://github.com/fedora-copr/copr/issues/3140 #} +{%- if not chroot.startswith(("fedora-rawhide-", "fedora-40-")) %} # We don't do 'dnf builddep' for the custom method, so we don't need to install # python3-dnf-plugins core or dnf5-plugins at all. config_opts["bootstrap_image_ready"] = True +{% endif %} # Don't mixup caches with the normal mock build. config_opts["root"] = "copr-custom-" + config_opts["root"]