[PATCH] copr fix for missing macros.dist on EL-5 (%dist, %el5, and %rhel)

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

 



Hi,

I recently setup a copr for git builds from rawhide for older releases¹.  I ran
into an issue with the epel-5 builds due to missing dist-related macros.  With
some help from Rex and Dennis in #fedora-admin, I was able to determine that
the problem was the method copr uses to adjust the mock chroot_setup_cmd.

The upstream copr code replaces the chroot_setup_cmd with 'install
@buildsys-macros' (and any additional packages the user configures in the
chroot config).  On all dists except EL-5 this is fine, as they already use the
buildsys-build group.  On EL-5, that fails to pull in the buildsys-macros
package.  The stock mock config for epel-5 chroot_setup_cmd is 'install
buildsys-build buildsys-macros' which ensures that the dist-related macros are
present (%dist, %el5, and %rhel).

The result is that spec files which work in Koji and Mock fail (or at least
don't work as intended) in copr.  This was filed in bugzilla abouta year ago,
but I'm not sure that the exact nature of the bug was clear to everyone in that
discussion².  Before I found that bugzilla entry, I'd already filed a pull
request with a potential fix upstream³.

The following patch replaces @buildsys-build with buildsys-build
buildsys-macros in the epel-5 mock configs.  I don't have access to the systems
to test this and I don't know the copr setup well, so while the idea for the
patch is simple, the implementation could certainly use some review. :)

Hopefully this is a reasonable improvement to make.  There's probably not a lot
of users building for EL-5 in copr, but since EL-5 support doesn't end for
nearly a year, being able to rebuild packages from Fedora which use the
standard dist-related macros would be handy for anyone who is still supporting
some EL-5 systems.

¹ https://copr.fedorainfracloud.org/coprs/tmz/git/
² https://bugzilla.redhat.com/1198013
³ https://github.com/fedora-copr/copr/pull/3

Todd Zullinger (1):
  copr: fix chroot_setup_cmd in epel-5 configs

 .../copr/backend/files/provision/provision_builder_tasks.yml  | 11 +++++++++++
 1 file changed, 11 insertions(+)

-- 
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