Skip to content

Commit

Permalink
Add option to allow chroot specs for COPR builds
Browse files Browse the repository at this point in the history
Add a CHROOTS variable to the agent/rpm/Makefile and an option
to the `copr-cli build' command in rpm.mk, to allow
the specification of chroots to include or exclude in a build.

The default setting for the b0.69 branch excludes all RHEL9 builds:
the 0.69 agent does not work on RHEL9 because of an `scp -r' bug.
  • Loading branch information
ndokos authored and portante committed Feb 9, 2022
1 parent 5cce3c3 commit 1bae994
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions agent/rpm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
# 7. Optionally generate a local RPM.
# 8. Clean up the temp directory

# Do not use the RHEL9 chroots - v0.69 does not work on RHEL9
CHROOTS = --exclude-chroot centos-stream-9-aarch64 \
--exclude-chroot centos-stream-9-x86_64 \
--exclude-chroot epel-9-aarch64 \
--exclude-chroot epel-9-x86_64


CWD = $(shell pwd)

# adjust as necessary
Expand Down
2 changes: 1 addition & 1 deletion agent/rpm/rpm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ copr-interim \
copr-index \
copr-inotify \
copr-dashboard: $(RPMSRPM)/$(prog)-$(version)-$(seqno)$(sha1).src.rpm
copr-cli build $(_copr_user)/$(subst copr,pbench,$@) $(RPMSRPM)/$(prog)-$(VERSION)-$(seqno)g$(sha1).src.rpm
copr-cli build ${CHROOTS} $(_copr_user)/$(subst copr,pbench,$@) $(RPMSRPM)/$(prog)-$(VERSION)-$(seqno)g$(sha1).src.rpm

veryclean:: clean rpm-clean

0 comments on commit 1bae994

Please sign in to comment.