[PATCH] copr: fix chroot_setup_cmd in epel-5 configs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



When copr creates mock config files, it uses the @buildsys-build group
as the install target in chroot_setup_cmd.  This is not correct for EL-5
and prevents common macros.dist from being installed.  The result is
that %{dist}, %{el5}, and %{rhel} are not defined for epel-5 chroots in
copr which differs from local mock and koji.

The issue was filed against copr in bugzilla¹ and a github pull request²
is now also filed to resolve this in a future copr release.

¹ https://bugzilla.redhat.com/1198013
² https://github.com/fedora-copr/copr/pull/3
---
 .../copr/backend/files/provision/provision_builder_tasks.yml  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml
index 3ef42cc..00628cc 100644
--- a/roles/copr/backend/files/provision/provision_builder_tasks.yml
+++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml
@@ -66,6 +66,17 @@
   -  /etc/mock/fedora-23-i386.cfg
   -  /etc/mock/fedora-23-x86_64.cfg
 
+# Fix chroot_setup_cmd in epel-5 configs
+# https://bugzilla.redhat.com/1198013
+- name: "patch epel-5 mock.cfg"
+  replace: >
+        dest={{ item }}
+        regexp='(.*chroot_setup_cmd.*) @buildsys-build(.*)'
+        replace='\1 buildsys-build buildsys-macros\2'
+  with_items:
+  - /etc/mock/epel-5-i386.cfg
+  - /etc/mock/epel-5-ppc.cfg
+  - /etc/mock/epel-5-x86_64.cfg
 
 # ansible doesn't support simultaneously usage of async and with_* options
 # it's not even planned for implementation, see https://github.com/ansible/ansible/issues/5841
-- 
2.8.1
_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
http://lists.fedoraproject.org/admin/lists/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx




[Index of Archives]     [Fedora Development]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Yosemite News]     [KDE Users]

  Powered by Linux